diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 430a477cae..31f3609fd4 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -119,8 +119,6 @@ area[vending=parking_tickets]
 
 node[shop],
 area[shop],
-node[amenity=marketplace],
-area[amenity=marketplace],
 node[amenity=veterinary],
 area[amenity=veterinary],
 node[leisure=playground],
@@ -134,8 +132,6 @@ node[tourism=caravan_site],
 area[tourism=caravan_site],
 node[amenity=bicycle_parking],
 area[amenity=bicycle_parking],
-node[amenity=dentist],
-area[amenity=dentist],
 node[leisure=water_park],
 area[leisure=water_park],
 node[amenity=taxi],
@@ -156,8 +152,6 @@ node[amenity=childcare],
 area[amenity=childcare],
 node[amenity=post_office],
 area[amenity=post_office],
-node[amenity=car_sharing],
-area[amenity=car_sharing],
 node[power=station],
 area[power=station],
 node[power=substation],
@@ -261,12 +255,12 @@ node[amenity=bicycle_repair_station],
 area[amenity=bicycle_repair_station],
 node[amenity=car_wash],
 area[amenity=car_wash],
+node[amenity=car_sharing],
+area[amenity=car_sharing],
 node[amenity=car_rental],
 area[amenity=car_rental],
 node|z18-[office],
 area|z18-[office],
-node[amenity=nightclub],
-area[amenity=nightclub],
 node[amenity=fire_station],
 area[amenity=fire_station],
 node[amenity=atm],
@@ -274,7 +268,12 @@ area[amenity=atm],
 node[amenity=bureau_de_change],
 node[shop=pawnbroker],
 area[shop=pawnbroker],
-node[amenity=library]
+node[amenity=library],
+area[amenity=library],
+node[shop=charity],
+area[shop=charity],
+node[shop=second_hand],
+area[shop=second_hand],
 {z-index: 2500;}
 
 node[amenity=fuel],
@@ -295,6 +294,8 @@ node[aerialway=magic_carpet],
 node[aerialway=platter],
 node[aerialway=rope_tow],
 node[railway=level_crossing],
+node[amenity=marketplace],
+area[amenity=marketplace],
 node[shop=supermarket],
 area[shop=supermarket],
 node[shop=car_repair][service=tyres],
@@ -303,6 +304,8 @@ node[shop=caravan],
 area[shop=caravan],
 node[highway=services],
 area[highway=services],
+node[amenity=dentist],
+area[amenity=dentist],
 node[amenity=clinic],
 area[amenity=clinic],
 node[amenity=doctors],
@@ -325,6 +328,8 @@ node[amenity=courthouse],
 area[amenity=courthouse],
 node[amenity=cinema],
 area[amenity=cinema],
+node[amenity=nightclub],
+area[amenity=nightclub],
 node[amenity=police],
 area[amenity=police],
 node[amenity=prison],
@@ -352,10 +357,6 @@ area[tourism=attraction][attraction=animal],
 
 node[amenity=cafe],
 area[amenity=cafe],
-node[shop=charity],
-area[shop=charity],
-node[shop=second_hand],
-area[shop=second_hand],
 node[amenity=theatre],
 area[amenity=theatre]
 {z-index: 2790;}
@@ -374,7 +375,9 @@ area[amenity=bar]
 node[amenity=pub],
 area[amenity=pub],
 node[amenity=biergarten],
-area[amenity=biergarten]
+area[amenity=biergarten],
+node[amenity=ice_cream],
+area[amenity=ice_cream],
 {z-index: 2782;}
 
 node[historic=monument],