diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss
index 93694ac0ad..6779e67745 100644
--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@@ -520,10 +520,10 @@ node|z17-[landuse=vineyard],
 /* 5.2 Beach, Glacier, Desert, etc. */
 
 area|z14-[natural=desert],
-area|z15-[leisure=beach_resort],
+area|z16-[leisure=beach_resort],
+node|z16-[leisure=beach_resort],
 area|z15-[natural=beach],
-node|z17-[leisure=beach_resort],
-node|z17-[natural=beach]
+node|z15-[natural=beach],
 {text: name;font-size: 10;text-color: @poi_label;}
 
 /* 6.WATER */
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index f784f822e9..d584511e80 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -652,18 +652,18 @@ node|z15-[leisure=nature_reserve],
 area|z15-[leisure=nature_reserve]
 {icon-image: nparkf-outline-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.9;}
 
-node|z12-[landuse=forest][name],
-area|z12-[landuse=forest][name]
-{text: name;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;}
-node|z13[landuse=forest][name],
-area|z13[landuse=forest][name]
-{icon-image: nparkf-outline-s.svg;text-offset: 1;font-size: 10;icon-min-distance: 12;}
+node|z12-13[landuse=forest][name],
+area|z12-13[landuse=forest][name]
+{icon-image: nparkf-outline-s.svg; icon-min-distance: 12;}
+node|z13-[landuse=forest][name],
+area|z13-[landuse=forest][name]
+{text: name; font-size: 10; text-offset: 1; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; text-halo-radius:0.5;}
 node|z14[landuse=forest][name],
 area|z14[landuse=forest][name]
-{icon-image: nparkf-outline-s.svg;text-offset: 1;font-size: 11;}
+{icon-image: nparkf-outline-s.svg; font-size: 11;}
 node|z15-[landuse=forest][name],
 area|z15-[landuse=forest][name]
-{icon-image: nparkf-outline-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.9;}
+{icon-image: nparkf-outline-m.svg; font-size: 12; text-halo-opacity: 0.9;}
 
 node|z12-[landuse=forest][!name],
 area|z12-[landuse=forest][!name]
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 96fd524649..019ace2c58 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -487,8 +487,8 @@ node|z17-[amenity=arts_centre],
 area|z17-[amenity=arts_centre]
 {icon-image: gallery-m.svg;text-offset: 1;icon-min-distance: 12;}
 
-node|z16-[amenity=theatre],
-area|z16-[amenity=theatre]
+node|z15-[amenity=theatre],
+area|z15-[amenity=theatre],
 {icon-image: theatre-m.svg;icon-min-distance: 10;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z15[tourism=zoo],