diff --git a/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java b/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
index 8c2cf3d54c..4b5b52ad5e 100644
--- a/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
+++ b/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
@@ -84,7 +84,7 @@ public class RenderingIcons {
 		for (Field f : cl.getDeclaredFields()) {
 			if (f.getName().startsWith("h_") || f.getName().startsWith("mm_")) {
 				try {
-					icons.put(f.getName().substring(2), f.getInt(null));
+					icons.put(f.getName().substring(f.getName().startsWith("mm_")? 3 : 2), f.getInt(null));
 				} catch (IllegalArgumentException e) {
 					e.printStackTrace();
 				} catch (IllegalAccessException e) {
diff --git a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
index 533220b7fa..6886bf4ca3 100644
--- a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
@@ -181,11 +181,11 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
 				canvas.drawCircle(x, y, r, pointAltUI);
 				canvas.drawCircle(x, y, r, point);
 				String id = null;
-				if(RenderingIcons.containsIcon(o.getSubType())){
-					id = o.getSubType();
-				} else if (RenderingIcons.containsIcon(o.getType().getDefaultTag() + "_" + o.getSubType())) {
+				if (RenderingIcons.containsIcon(o.getType().getDefaultTag() + "_" + o.getSubType())) {
 					id = o.getType().getDefaultTag() + "_" + o.getSubType();
-				}
+				} else if(RenderingIcons.containsIcon(o.getSubType())){
+					id = o.getSubType();
+				} 
 				if(id != null){
 					Bitmap bmp = RenderingIcons.getIcon(view.getContext(), id);
 					if(bmp != null){