diff --git a/DataExtractionOSM/src/net/osmand/render/default.render.xml b/DataExtractionOSM/src/net/osmand/render/default.render.xml
index 9c5ab8a427..5cd2b3c829 100644
--- a/DataExtractionOSM/src/net/osmand/render/default.render.xml
+++ b/DataExtractionOSM/src/net/osmand/render/default.render.xml
@@ -1,13 +1,13 @@
 <renderer name="default" depends="" defaultColor="#f1eee8">
 	<!--
-		Currently available icons : aerodrome, airport, alpinehut, atm, bank, bar, beach, bollard, bus_station, bus_stop_small, bus_stop,
-		cable_car, cafe, camp_site, car_share, caravan_park, cave_entrance, chair_lift, cinema, cliff, cliff2, danger, department_store, embassy,
+		Currently available icons : aerodrome, airport, alpine_hut, atm, bank, bar, beach, bollard, bus_station, bus_stop_small, bus_stop,
+		cable_car, cafe, camp_site, car_sharing, caravan_park, cave_entrance, chair_lift, cinema, cliff, cliff2, danger, department_store, embassy,
 		fast_food, firestation, food_drinkingtap, forest, fuel, gate2, glacier, grave_yard, guest_house, halt, hospital, hostel, hotel,
 		level_crossing, level_crossing2, library, liftgate, lighthouse, lock_gate, marsh, mast, memorial, mini_round, mud, museum, nr, orchard
 		parking, peak, pharmacy, place_of_worship, police, postbox, postoffice power_tower, power_wind, prison, pub, quarry2, recycling,
 		rental_bicycle restaurant, school, scrub, shelter, shop_bakery, shop_butcher, shop_clothes shop_convenience, shop_diy, shop_hairdresser,
 		shop_supermarket, sosphone, spring station_small, station, telephone, theatre, toilets, tower_water, traffic_light transport_ford, tree,
-		tree2, view_point, vineyard, windmill, zoo
+		tree2, viewpoint, vineyard, windmill, zoo
 	-->
 
 	<!-- input exact layer, orderType check tag, value -->
@@ -333,8 +333,9 @@
 
 	<!-- PRIORITY Input to filter : tag, value, zoom [minzoom, maxzoom] -->
 	<point>
-		<filter minzoom="16" icon="transport_ford" tag="highway" value="ford" />
-		<filter minzoom="15" icon="mini_round" tag="highway" value="mini_roundabout" />
+		<filter minzoom="16" icon="highway_ford" tag="highway" value="ford" />
+		<filter minzoom="15" icon="mini_roundabout" tag="highway" value="mini_roundabout" />
+		<filter minzoom="15" icon="helipad" tag="aeroway" value="helipad" />
 		<filter minzoom="17" icon="traffic_light" tag="highway" value="traffic_signals" />
 		<filter minzoom="16" maxzoom="16" icon="bus_stop_small" tag="highway" value="bus_stop" />
 		<filter minzoom="17" icon="bus_stop" tag="highway" value="bus_stop" />
@@ -347,17 +348,20 @@
 		<filter minzoom="14" icon="spring" tag="natural" value="spring" />
 		<filter minzoom="16" maxzoom="16" icon="tree" tag="natural" value="tree" />
 		<filter minzoom="17" icon="tree2" tag="natural" value="tree" />
-		<filter minzoom="16" icon="view_point" tag="historic" value="archaeological_site" />
-		<filter minzoom="16" icon="view_point" tag="historic" value="battlefield" />
-		<filter minzoom="16" icon="view_point" tag="historic" value="castle" />
-		<filter minzoom="16" icon="view_point" tag="historic" value="fort" />
-		<filter minzoom="16" icon="view_point" tag="historic" value="ruins" />
-		<filter minzoom="16" icon="view_point" tag="historic" value="monument" />
-		<filter minzoom="16" icon="view_point" tag="historic" value="boundary_stone" />
+		<filter minzoom="15" icon="volcano" tag="natural" value="volcano" />
+		<filter minzoom="16" icon="playground" tag="leisure" value="playground" />
+		<filter minzoom="15" icon="slipway" tag="leisure" value="slipway" />
+		<filter minzoom="16" icon="viewpoint" tag="historic" value="archaeological_site" />
+		<filter minzoom="16" icon="viewpoint" tag="historic" value="battlefield" />
+		<filter minzoom="16" icon="viewpoint" tag="historic" value="castle" />
+		<filter minzoom="16" icon="viewpoint" tag="historic" value="fort" />
+		<filter minzoom="16" icon="viewpoint" tag="historic" value="ruins" />
+		<filter minzoom="16" icon="viewpoint" tag="historic" value="monument" />
+		<filter minzoom="16" icon="viewpoint" tag="historic" value="boundary_stone" />
 		<filter minzoom="16" icon="memorial" tag="historic" value="memorial" />
-		<filter minzoom="16" icon="view_point" tag="historic" value="wayside_cross" />
-		<filter minzoom="16" icon="view_point" tag="historic" value="wayside_shrine" />
-		<filter minzoom="16" icon="view_point" tag="historic" value="wreck" />
+		<filter minzoom="16" icon="viewpoint" tag="historic" value="wayside_cross" />
+		<filter minzoom="16" icon="viewpoint" tag="historic" value="wayside_shrine" />
+		<filter minzoom="16" icon="viewpoint" tag="historic" value="wreck" />
 		<filter minzoom="15" icon="lock_gate" tag="waterway" value="lock_gate" />
 		<filter minzoom="15" icon="lock_gate" tag="waterway" value="lock" />
 		<filter minzoom="12" maxzoom="12" icon="halt" tag="railway" value="station" />
@@ -369,6 +373,7 @@
 		<filter minzoom="15" icon="station_small" tag="railway" value="tram_stop" />
 		<filter minzoom="14" maxzoom="15" icon="level_crossing" tag="railway" value="level_crossing" />
 		<filter minzoom="16" icon="level_crossing2" tag="railway" value="level_crossing" />
+		<filter minzoom="17" icon="subway_entrance" tag="railway" value="subway_entrance" />
 		<filter minzoom="10" icon="aerodrome" tag="aeroway" value="aerodrome" />
 		<filter minzoom="9" icon="airport" tag="aeroway" value="airport" />
 		<filter minzoom="13" maxzoom="14" icon="halt" tag="aerialway" value="station" />
@@ -376,7 +381,7 @@
 		<filter minzoom="15" icon="power_tower" tag="power" value="tower" />
 		<filter minzoom="15" icon="power_wind" tag="power" value="generator" />
 		<filter minzoom="15" icon="lighthouse" tag="man_made" value="lighthouse" />
-		<filter minzoom="16" icon="tower_water" tag="man_made" value="water_tower" />
+		<filter minzoom="16" icon="water_tower" tag="man_made" value="water_tower" />
 		<filter minzoom="16" icon="windmill" tag="man_made" value="windmill" />
 		<filter minzoom="16" icon="firestation" tag="amenity" value="fire_station" />
 		<filter minzoom="16" icon="restaurant" tag="amenity" value="restaurant" />
@@ -384,17 +389,17 @@
 		<filter minzoom="16" icon="fast_food" tag="amenity" value="fast_food" />
 		<filter minzoom="16" icon="pub" tag="amenity" value="pub" />
 		<filter minzoom="16" icon="bar" tag="amenity" value="bar" />
-		<filter minzoom="16" icon="bar" tag="amenity" value="biergarten" />
-		<filter minzoom="16" icon="food_drinkingtap" tag="amenity" value="drinking_water" />
+		<filter minzoom="16" icon="biergarten" tag="amenity" value="biergarten" />
+		<filter minzoom="16" icon="drinking_water" tag="amenity" value="drinking_water" />
 		<filter minzoom="16" icon="school" tag="amenity" value="school" />
 		<filter minzoom="16" icon="school" tag="amenity" value="college" />
 		<filter minzoom="16" icon="library" tag="amenity" value="library" />
 		<filter minzoom="15" icon="parking" tag="amenity" value="parking" />
 		<filter minzoom="15" icon="parking" tag="amenity" value="bicycle_parking" />
 		<filter minzoom="14" icon="fuel" tag="amenity" value="fuel" />
-		<filter minzoom="17" icon="rental_bicycle" tag="amenity" value="bicycle_rental" />
+		<filter minzoom="17" icon="bicycle_rental" tag="amenity" value="bicycle_rental" />
 		<filter minzoom="15" icon="bus_station" tag="amenity" value="bus_station" />
-		<filter minzoom="16" icon="car_share" tag="amenity" value="car_sharing" />
+		<filter minzoom="16" icon="car_sharing" tag="amenity" value="car_sharing" />
 		<filter minzoom="17" icon="atm" tag="amenity" value="atm" />
 		<filter minzoom="16" icon="bank" tag="amenity" value="bank" />
 		<filter minzoom="16" icon="pharmacy" tag="amenity" value="pharmacy" />
@@ -416,25 +421,30 @@
 		<filter minzoom="17" icon="shop_butcher" tag="shop" value="butcher" />
 		<filter minzoom="16" icon="shop_clothes" tag="shop" value="clothes" />
 		<filter minzoom="16" icon="shop_clothes" tag="shop" value="fashion" />
+		<filter minzoom="17" icon="shop_bicycle" tag="shop" value="bicycle" />
+		<filter minzoom="16" icon="shop_car" tag="shop" value="car" />
+		<filter minzoom="16" icon="shop_car_repair" tag="shop" value="car_repair" />
 		<filter minzoom="17" icon="shop_convenience" tag="shop" value="convenience" />
 		<filter minzoom="16" icon="department_store" tag="shop" value="department_store" />
 		<filter minzoom="17" icon="shop_diy" tag="shop" value="electronics" />
 		<filter minzoom="16" icon="shop_supermarket" tag="shop" value="general" />
+		<filter minzoom="16" icon="florist" tag="shop" value="florist" />
 		<filter minzoom="16" icon="shop_hairdresser" tag="shop" value="hairdresser" />
 		<filter minzoom="16" icon="department_store" tag="shop" value="mall" />
 		<filter minzoom="16" icon="shop_supermarket" tag="shop" value="supermarket" />
-		<filter minzoom="16" icon="sosphone" tag="emergency" value="phone" />
+		<filter minzoom="16" icon="emergency_phone" tag="emergency" value="phone" />
 		<filter minzoom="16" icon="camp_site" tag="tourism" value="camp_site" />
 		<filter minzoom="16" icon="caravan_park" tag="tourism" value="caravan_site" />
-		<filter minzoom="16" icon="camp_site" tag="tourism" value="picnic_site" />
-		<filter minzoom="16" icon="alpinehut" tag="tourism" value="alpine_hut" />
-		<filter minzoom="16" icon="guest_house" tag="tourism" value="chalet" />
+		<filter minzoom="16" icon="picnic_site" tag="tourism" value="picnic_site" />
+		<filter minzoom="16" icon="alpine_hut" tag="tourism" value="alpine_hut" />
+		<filter minzoom="16" icon="chalet" tag="tourism" value="chalet" />
 		<filter minzoom="16" icon="guest_house" tag="tourism" value="guest_house" />
 		<filter minzoom="16" icon="hostel" tag="tourism" value="hostel" />
 		<filter minzoom="16" icon="hotel" tag="tourism" value="hotel" />
-		<filter minzoom="16" icon="hostel" tag="tourism" value="motel" />
+		<filter minzoom="16" icon="motel" tag="tourism" value="motel" />
 		<filter minzoom="16" icon="museum" tag="tourism" value="museum" />
-		<filter minzoom="16" icon="view_point" tag="tourism" value="viewpoint" />
+		<filter minzoom="16" icon="information" tag="tourism" value="information" />
+		<filter minzoom="16" icon="viewpoint" tag="tourism" value="viewpoint" />
 		<filter minzoom="16" icon="geocache_found" tag="geocache" value="found" />
 		<filter minzoom="16" icon="geocache_not_found" tag="geocache" />
 	</point>
diff --git a/OsmAnd/res/drawable/h_alpine_hut.png b/OsmAnd/res/drawable/h_alpine_hut.png
new file mode 100644
index 0000000000..84b09771b2
Binary files /dev/null and b/OsmAnd/res/drawable/h_alpine_hut.png differ
diff --git a/OsmAnd/res/drawable/h_amenity_court.png b/OsmAnd/res/drawable/h_amenity_court.png
new file mode 100644
index 0000000000..eed9852d7f
Binary files /dev/null and b/OsmAnd/res/drawable/h_amenity_court.png differ
diff --git a/OsmAnd/res/drawable/h_bicycle_rental.png b/OsmAnd/res/drawable/h_bicycle_rental.png
new file mode 100644
index 0000000000..4bb10e00aa
Binary files /dev/null and b/OsmAnd/res/drawable/h_bicycle_rental.png differ
diff --git a/OsmAnd/res/drawable/h_biergarten.png b/OsmAnd/res/drawable/h_biergarten.png
new file mode 100644
index 0000000000..241a4de1fa
Binary files /dev/null and b/OsmAnd/res/drawable/h_biergarten.png differ
diff --git a/OsmAnd/res/drawable/h_car_sharing.png b/OsmAnd/res/drawable/h_car_sharing.png
new file mode 100644
index 0000000000..1dcc537f6b
Binary files /dev/null and b/OsmAnd/res/drawable/h_car_sharing.png differ
diff --git a/OsmAnd/res/drawable/h_chalet.png b/OsmAnd/res/drawable/h_chalet.png
new file mode 100644
index 0000000000..db5eb31cd1
Binary files /dev/null and b/OsmAnd/res/drawable/h_chalet.png differ
diff --git a/OsmAnd/res/drawable/h_drinking_water.png b/OsmAnd/res/drawable/h_drinking_water.png
new file mode 100644
index 0000000000..0a4c25a175
Binary files /dev/null and b/OsmAnd/res/drawable/h_drinking_water.png differ
diff --git a/OsmAnd/res/drawable/h_emergency_phone.png b/OsmAnd/res/drawable/h_emergency_phone.png
new file mode 100644
index 0000000000..0e5d0a26c1
Binary files /dev/null and b/OsmAnd/res/drawable/h_emergency_phone.png differ
diff --git a/OsmAnd/res/drawable/h_fire_station.png b/OsmAnd/res/drawable/h_fire_station.png
new file mode 100644
index 0000000000..cf24559226
Binary files /dev/null and b/OsmAnd/res/drawable/h_fire_station.png differ
diff --git a/OsmAnd/res/drawable/h_florist.png b/OsmAnd/res/drawable/h_florist.png
new file mode 100644
index 0000000000..3ed55a5bf9
Binary files /dev/null and b/OsmAnd/res/drawable/h_florist.png differ
diff --git a/OsmAnd/res/drawable/h_helipad.png b/OsmAnd/res/drawable/h_helipad.png
new file mode 100644
index 0000000000..619513ca00
Binary files /dev/null and b/OsmAnd/res/drawable/h_helipad.png differ
diff --git a/OsmAnd/res/drawable/h_highway_ford.png b/OsmAnd/res/drawable/h_highway_ford.png
new file mode 100644
index 0000000000..dc1bfc299c
Binary files /dev/null and b/OsmAnd/res/drawable/h_highway_ford.png differ
diff --git a/OsmAnd/res/drawable/h_information.png b/OsmAnd/res/drawable/h_information.png
new file mode 100644
index 0000000000..65d03dbddd
Binary files /dev/null and b/OsmAnd/res/drawable/h_information.png differ
diff --git a/OsmAnd/res/drawable/h_mini_roundabout.png b/OsmAnd/res/drawable/h_mini_roundabout.png
new file mode 100644
index 0000000000..b9a7d2dfc7
Binary files /dev/null and b/OsmAnd/res/drawable/h_mini_roundabout.png differ
diff --git a/OsmAnd/res/drawable/h_motel.png b/OsmAnd/res/drawable/h_motel.png
new file mode 100644
index 0000000000..56a96e50b7
Binary files /dev/null and b/OsmAnd/res/drawable/h_motel.png differ
diff --git a/OsmAnd/res/drawable/h_picnic_site.png b/OsmAnd/res/drawable/h_picnic_site.png
new file mode 100644
index 0000000000..0eff097bfb
Binary files /dev/null and b/OsmAnd/res/drawable/h_picnic_site.png differ
diff --git a/OsmAnd/res/drawable/h_playground.png b/OsmAnd/res/drawable/h_playground.png
new file mode 100644
index 0000000000..42db81d157
Binary files /dev/null and b/OsmAnd/res/drawable/h_playground.png differ
diff --git a/OsmAnd/res/drawable/h_shop_bicycle.png b/OsmAnd/res/drawable/h_shop_bicycle.png
new file mode 100644
index 0000000000..d0b3680f01
Binary files /dev/null and b/OsmAnd/res/drawable/h_shop_bicycle.png differ
diff --git a/OsmAnd/res/drawable/h_shop_car.png b/OsmAnd/res/drawable/h_shop_car.png
new file mode 100644
index 0000000000..e34715b3f6
Binary files /dev/null and b/OsmAnd/res/drawable/h_shop_car.png differ
diff --git a/OsmAnd/res/drawable/h_shop_car_repair.png b/OsmAnd/res/drawable/h_shop_car_repair.png
new file mode 100644
index 0000000000..9c38777567
Binary files /dev/null and b/OsmAnd/res/drawable/h_shop_car_repair.png differ
diff --git a/OsmAnd/res/drawable/h_slipway.png b/OsmAnd/res/drawable/h_slipway.png
new file mode 100644
index 0000000000..45892de3c9
Binary files /dev/null and b/OsmAnd/res/drawable/h_slipway.png differ
diff --git a/OsmAnd/res/drawable/h_subway_entrance.png b/OsmAnd/res/drawable/h_subway_entrance.png
new file mode 100644
index 0000000000..0902983e7e
Binary files /dev/null and b/OsmAnd/res/drawable/h_subway_entrance.png differ
diff --git a/OsmAnd/res/drawable/h_viewpoint.png b/OsmAnd/res/drawable/h_viewpoint.png
new file mode 100644
index 0000000000..b18660c86a
Binary files /dev/null and b/OsmAnd/res/drawable/h_viewpoint.png differ
diff --git a/OsmAnd/res/drawable/h_volcano.png b/OsmAnd/res/drawable/h_volcano.png
new file mode 100644
index 0000000000..a713ca3a6f
Binary files /dev/null and b/OsmAnd/res/drawable/h_volcano.png differ
diff --git a/OsmAnd/res/drawable/h_water_tower.png b/OsmAnd/res/drawable/h_water_tower.png
new file mode 100644
index 0000000000..5ca78016d7
Binary files /dev/null and b/OsmAnd/res/drawable/h_water_tower.png differ
diff --git a/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java b/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
index 3bc61b5df0..ec146fb21f 100644
--- a/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
+++ b/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
@@ -19,31 +19,36 @@ public class RenderingIcons {
 	private static void initIcons() {
 		icons.put("aerodrome", R.drawable.h_aerodrome); //$NON-NLS-1$
 		icons.put("airport", R.drawable.h_airport); //$NON-NLS-1$
-		icons.put("alpinehut", R.drawable.h_alpinehut); //$NON-NLS-1$
+		icons.put("alpine_hut", R.drawable.h_alpine_hut); //$NON-NLS-1$
+		icons.put("amenity_court", R.drawable.h_amenity_court); //$NON-NLS-1$
 		icons.put("atm", R.drawable.h_atm); //$NON-NLS-1$
 		icons.put("bank", R.drawable.h_bank); //$NON-NLS-1$
 		icons.put("bar", R.drawable.h_bar); //$NON-NLS-1$
 		icons.put("beach", R.drawable.h_beach); //$NON-NLS-1$
+		icons.put("biergarten", R.drawable.h_biergarten); //$NON-NLS-1$
 		icons.put("bollard", R.drawable.h_bollard); //$NON-NLS-1$
+		icons.put("bicycle_rental", R.drawable.h_bicycle_rental); //$NON-NLS-1$
 		icons.put("bus_station", R.drawable.h_bus_station); //$NON-NLS-1$
 		icons.put("bus_stop_small", R.drawable.h_bus_stop_small); //$NON-NLS-1$
 		icons.put("bus_stop", R.drawable.h_bus_stop); //$NON-NLS-1$
 		icons.put("cable_car", R.drawable.h_cable_car); //$NON-NLS-1$
 		icons.put("cafe", R.drawable.h_cafe); //$NON-NLS-1$
 		icons.put("camp_site", R.drawable.h_camp_site); //$NON-NLS-1$
-		icons.put("car_share", R.drawable.h_car_share); //$NON-NLS-1$
+		icons.put("car_sharing", R.drawable.h_car_sharing); //$NON-NLS-1$
 		icons.put("caravan_park", R.drawable.h_caravan_park); //$NON-NLS-1$
 		icons.put("cave_entrance", R.drawable.h_cave_entrance); //$NON-NLS-1$
 		icons.put("chair_lift", R.drawable.h_chair_lift); //$NON-NLS-1$
+		icons.put("chalet", R.drawable.h_chalet); //$NON-NLS-1$
 		icons.put("cinema", R.drawable.h_cinema); //$NON-NLS-1$
 		icons.put("cliff", R.drawable.h_cliff); //$NON-NLS-1$
 		icons.put("cliff2", R.drawable.h_cliff2); //$NON-NLS-1$
 		icons.put("danger", R.drawable.h_danger); //$NON-NLS-1$
 		icons.put("department_store", R.drawable.h_department_store); //$NON-NLS-1$
+		icons.put("drinking_water", R.drawable.h_drinking_water); //$NON-NLS-1$
 		icons.put("embassy", R.drawable.h_embassy); //$NON-NLS-1$
+		icons.put("emergency_phone", R.drawable.h_emergency_phone); //$NON-NLS-1$
 		icons.put("fast_food", R.drawable.h_fast_food); //$NON-NLS-1$
-		icons.put("firestation", R.drawable.h_firestation); //$NON-NLS-1$
-		icons.put("food_drinkingtap", R.drawable.h_food_drinkingtap); //$NON-NLS-1$
+		icons.put("fire_station", R.drawable.h_fire_station); //$NON-NLS-1$
 		icons.put("forest", R.drawable.h_forest); //$NON-NLS-1$
 		icons.put("fuel", R.drawable.h_fuel); //$NON-NLS-1$
 		icons.put("gate2", R.drawable.h_gate2); //$NON-NLS-1$
@@ -53,10 +58,13 @@ public class RenderingIcons {
 		icons.put("glacier", R.drawable.h_glacier); //$NON-NLS-1$
 		icons.put("grave_yard", R.drawable.h_grave_yard); //$NON-NLS-1$
 		icons.put("guest_house", R.drawable.h_guest_house); //$NON-NLS-1$
+		icons.put("florist", R.drawable.h_florist); //$NON-NLS-1$
 		icons.put("halt", R.drawable.h_halt); //$NON-NLS-1$
+		icons.put("helipad", R.drawable.h_helipad); //$NON-NLS-1$
 		icons.put("hospital", R.drawable.h_hospital); //$NON-NLS-1$
 		icons.put("hostel", R.drawable.h_hostel); //$NON-NLS-1$
 		icons.put("hotel", R.drawable.h_hotel); //$NON-NLS-1$
+		icons.put("information", R.drawable.h_information); //$NON-NLS-1$
 		icons.put("level_crossing", R.drawable.h_level_crossing); //$NON-NLS-1$
 		icons.put("level_crossing2", R.drawable.h_level_crossing2); //$NON-NLS-1$
 		icons.put("library", R.drawable.h_library); //$NON-NLS-1$
@@ -66,7 +74,8 @@ public class RenderingIcons {
 		icons.put("marsh", R.drawable.h_marsh); //$NON-NLS-1$
 		icons.put("mast", R.drawable.h_mast); //$NON-NLS-1$
 		icons.put("memorial", R.drawable.h_memorial); //$NON-NLS-1$
-		icons.put("mini_round", R.drawable.h_mini_round); //$NON-NLS-1$
+		icons.put("motel", R.drawable.h_motel); //$NON-NLS-1$
+		icons.put("mini_roundabout", R.drawable.h_mini_roundabout); //$NON-NLS-1$
 		icons.put("mud", R.drawable.h_mud); //$NON-NLS-1$
 		icons.put("museum", R.drawable.h_museum); //$NON-NLS-1$
 		icons.put("nr", R.drawable.h_nr); //$NON-NLS-1$
@@ -74,7 +83,9 @@ public class RenderingIcons {
 		icons.put("parking", R.drawable.h_parking); //$NON-NLS-1$
 		icons.put("peak", R.drawable.h_peak); //$NON-NLS-1$
 		icons.put("pharmacy", R.drawable.h_pharmacy); //$NON-NLS-1$
+		icons.put("picnic_site", R.drawable.h_picnic_site); //$NON-NLS-1$
 		icons.put("place_of_worship", R.drawable.h_place_of_worship); //$NON-NLS-1$
+		icons.put("playground", R.drawable.h_playground); //$NON-NLS-1$
 		icons.put("police", R.drawable.h_police); //$NON-NLS-1$
 		icons.put("postbox", R.drawable.h_postbox); //$NON-NLS-1$
 		icons.put("postoffice", R.drawable.h_postoffice); //$NON-NLS-1$
@@ -84,7 +95,6 @@ public class RenderingIcons {
 		icons.put("pub", R.drawable.h_pub); //$NON-NLS-1$
 		icons.put("quarry2", R.drawable.h_quarry2); //$NON-NLS-1$
 		icons.put("recycling", R.drawable.h_recycling); //$NON-NLS-1$
-		icons.put("rental_bicycle", R.drawable.h_rental_bicycle); //$NON-NLS-1$
 		icons.put("restaurant", R.drawable.h_restaurant); //$NON-NLS-1$
 		icons.put("school", R.drawable.h_school); //$NON-NLS-1$
 		icons.put("scrub", R.drawable.h_scrub); //$NON-NLS-1$
@@ -94,22 +104,27 @@ public class RenderingIcons {
 		icons.put("shop_clothes", R.drawable.h_shop_clothes); //$NON-NLS-1$
 		icons.put("shop_convenience", R.drawable.h_shop_convenience); //$NON-NLS-1$
 		icons.put("shop_diy", R.drawable.h_shop_diy); //$NON-NLS-1$
+		icons.put("shop_bicycle", R.drawable.h_shop_bicycle); //$NON-NLS-1$
+		icons.put("shop_car", R.drawable.h_shop_car); //$NON-NLS-1$
+		icons.put("shop_car_repair", R.drawable.h_shop_car_repair); //$NON-NLS-1$
 		icons.put("shop_hairdresser", R.drawable.h_shop_hairdresser); //$NON-NLS-1$
 		icons.put("shop_supermarket", R.drawable.h_shop_supermarket); //$NON-NLS-1$
-		icons.put("sosphone", R.drawable.h_sosphone); //$NON-NLS-1$
+		icons.put("slipway", R.drawable.h_slipway); //$NON-NLS-1$
 		icons.put("spring", R.drawable.h_spring); //$NON-NLS-1$
 		icons.put("station_small", R.drawable.h_station_small); //$NON-NLS-1$
 		icons.put("station", R.drawable.h_station); //$NON-NLS-1$
+		icons.put("subway_entrance", R.drawable.h_subway_entrance); //$NON-NLS-1$
 		icons.put("telephone", R.drawable.h_telephone); //$NON-NLS-1$
 		icons.put("theatre", R.drawable.h_theatre); //$NON-NLS-1$
 		icons.put("toilets", R.drawable.h_toilets); //$NON-NLS-1$
-		icons.put("tower_water", R.drawable.h_tower_water); //$NON-NLS-1$
 		icons.put("traffic_light", R.drawable.h_traffic_light); //$NON-NLS-1$
-		icons.put("transport_ford", R.drawable.h_transport_ford); //$NON-NLS-1$
+		icons.put("highway_ford", R.drawable.h_highway_ford); //$NON-NLS-1$
 		icons.put("tree", R.drawable.h_tree); //$NON-NLS-1$
 		icons.put("tree2", R.drawable.h_tree2); //$NON-NLS-1$
-		icons.put("view_point", R.drawable.h_view_point); //$NON-NLS-1$
+		icons.put("viewpoint", R.drawable.h_viewpoint); //$NON-NLS-1$
 		icons.put("vineyard", R.drawable.h_vineyard); //$NON-NLS-1$
+		icons.put("volcano", R.drawable.h_volcano); //$NON-NLS-1$
+		icons.put("water_tower", R.drawable.h_water_tower); //$NON-NLS-1$
 		icons.put("windmill", R.drawable.h_windmill); //$NON-NLS-1$
 		icons.put("zoo", R.drawable.h_zoo); //$NON-NLS-1$
 		
diff --git a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
index 42f084c1e5..8352fd910a 100644
--- a/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
@@ -166,8 +166,14 @@ public class POIMapLayer implements OsmandMapLayer, ContextMenuLayer.IContextMen
 				int y = view.getMapYForPoint(o.getLocation().getLatitude());
 				canvas.drawCircle(x, y, r, pointAltUI);
 				canvas.drawCircle(x, y, r, point);
+				String id = null;
 				if(icons.containsKey(o.getSubType())){
-					int resId = icons.get(o.getSubType());
+					id = o.getSubType();
+				} else if (icons.containsKey(o.getType().getDefaultTag() + "_" + o.getSubType())) {
+					id = o.getType().getDefaultTag() + "_" + o.getSubType();
+				}
+				if(id != null){
+					int resId = icons.get(id);
 					Bitmap bmp = getCachedImg(resId);
 					if(bmp != null){
 						canvas.drawBitmap(bmp, x - bmp.getWidth() / 2, y - bmp.getHeight() / 2, paintIcon);