diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index e77a3fd140..db712639b9 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -503,8 +503,7 @@ node|z11-[natural=cave_entrance],
 area|z11-[natural=cave_entrance],
 node|z11-[waterway=waterfall],
 area|z11-[waterway=waterfall],
-node|z13-[natural=peak],
-area|z13-[natural=peak],
+node|z13-[natural=peak][name],
 node|z14-[natural=saddle],
 area|z14-[natural=saddle],
 node|z14-[mountain_pass],
@@ -520,6 +519,10 @@ area|z16-[natural=beach],
 area|z14-[natural=bare_rock],
 {text: name;text-color: @poi_label;text-position: center;text-offset: 1;}
 
+node|z13-[natural=peak][!name],
+{text: none;}
+
+
 node|z12-[boundary=national_park],
 area|z12-[boundary=national_park],
 node|z12-[boundary=protected_area],
@@ -559,24 +562,18 @@ area|z15-[natural=volcano]
 {icon-image: volcano-m.svg;text-offset: 1;font-size: 10;}
 
 node|z12[natural=peak][name],
-area|z12[natural=peak][name]
-{icon-image: peakt-s.svg;icon-min-distance: 10;text-offset: 1;text: name;text-color: @poi_label;text-position: center;}
-node|z12-14[natural=peak][!name],
-node|z12-14[natural=rock][!name],
-area|z12-14[natural=peak][!name],
-area|z12-14[natural=rock][!name]
-{font-size: 0;}
+{icon-image: peakt-s.svg;icon-min-distance: 10;}
 node|z13[natural=peak][name],
-area|z13[natural=peak][name]
-{icon-image: peakt-s.svg;text-offset: 1;font-size: 9;}
+{icon-image: peakt-s.svg;font-size: 9;}
 node|z14[natural=peak][name],
-area|z14[natural=peak][name]
-{icon-image: peakt-s.svg;text-offset: 1;font-size: 10;}
-node|z15-[natural=peak],
+{icon-image: peakt-s.svg;font-size: 10;}
+node|z15-[natural=peak][name],
 node|z15-[natural=rock],
-area|z15-[natural=peak],
-area|z15-[natural=rock]
-{icon-image: peakt-m.svg;text-offset: 1;font-size: 10;}
+area|z15-[natural=rock],
+{icon-image: peakt-m.svg;font-size: 10;}
+
+node|z15-[natural=peak][!name],
+{icon-image: peakt-m.svg;font-size: 10;}
 
 /* ToDo: Make the same as natural=peak when we will have -s,-m icons */
 node|z14-[natural=saddle],
@@ -937,9 +934,9 @@ area|z14-[tourism=attraction],
 area|z14-[place=square],
 node|z14-[tourism=theme_park],
 area|z14-[tourism=theme_park],
-node|z14-[amenity=community_centre],
-area|z14-[amenity=community_centre],
 node|z14-[tourism=viewpoint],
+node|z15-[amenity=community_centre],
+area|z15-[amenity=community_centre],
 node|z15-[historic=memorial],
 area|z15-[historic=memorial],
 node|z15-[historic=battlefield],
@@ -1066,8 +1063,8 @@ node|z17-[amenity=arts_centre],
 area|z17-[amenity=arts_centre]
 {icon-image: gallery-m.svg;text-offset: 1;icon-min-distance: 12;}
 
-node|z14[amenity=theatre],
-area|z14[amenity=theatre]
+node|z14-15[amenity=theatre],
+area|z14-15[amenity=theatre]
 {icon-image: theatre-s.svg;text-offset: 1;icon-min-distance: 8;}
 node|z16-[amenity=theatre],
 area|z16-[amenity=theatre]
@@ -1151,8 +1148,8 @@ node|z17-[tourism=attraction][attraction=animal],
 area|z17-[tourism=attraction][attraction=animal]
 {icon-image: zoo-m.svg;icon-min-distance: 24;}
 
-node|z16-[amenity=community_centre],
-area|z16-[amenity=community_centre],
+node|z15-[amenity=community_centre],
+area|z15-[amenity=community_centre],
 node|z16-[amenity=conference_centre],
 area|z16-[amenity=conference_centre],
 node|z16-[amenity=events_venue],
diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss
index f3bf963001..9cca2e7a9d 100644
--- a/data/styles/clear/include/Roads.mapcss
+++ b/data/styles/clear/include/Roads.mapcss
@@ -789,7 +789,7 @@ line|z15[highway=service],
 line|z15[highway=service][service=busway],
 line|z15[highway=busway],
 {width: 1.2;}
-line|z15-16[highway=service][service=driveway]
+line|z15[highway=service][service=driveway]
 {width: 0;}
 line|z16[highway=service],
 line|z16[highway=service][service=busway],
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 83f73cf049..58e5651359 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -374,8 +374,6 @@ node|z15-[tourism=attraction],
 area|z15-[tourism=attraction],
 node|z15-[tourism=theme_park],
 area|z15-[tourism=theme_park],
-node|z15-[amenity=community_centre],
-area|z15-[amenity=community_centre],
 node|z15-[tourism=viewpoint],
 node|z15-[historic=memorial],
 area|z15-[historic=memorial],
@@ -384,6 +382,8 @@ area|z15-[historic=battlefield],
 node|z15-[tourism=gallery],
 area|z15-[tourism=gallery],
 node|z15-[tourism=artwork],
+node|z16-[amenity=community_centre],
+area|z16-[amenity=community_centre],
 node|z16-[historic=boundary_stone],
 area|z16-[historic=boundary_stone],
 node|z16-[historic=wayside_cross],
diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss
index ca1c1a247a..c6ce907a7c 100644
--- a/data/styles/vehicle/include/Roads.mapcss
+++ b/data/styles/vehicle/include/Roads.mapcss
@@ -801,10 +801,10 @@ line|z18-[highway=unclassified][bridge?]::bridgeblack,
 
 line|z14[highway=service]
 {width: 1;}
+line|z14[highway=service][service=driveway]
+{width: 0;}
 line|z15[highway=service]
 {width: 1.6;}
-line|z15-16[highway=service][service=driveway]
-{width: 0;}
 line|z16[highway=service]
 {width: 3;}
 line|z17[highway=service]