diff --git a/addressing.mss b/addressing.mss
index 452e71494c..be35b6f5cc 100644
--- a/addressing.mss
+++ b/addressing.mss
@@ -34,6 +34,7 @@
 
 #building-text {
   [zoom >= 14][way_pixels > 3000],
+  [zoom=15][way_pixels > 750], [zoom=16][way_pixels > 187],
   [zoom >= 17] {
     text-name: "[name]";
     text-size: 11;
diff --git a/admin.mss b/admin.mss
index 6f168e2bf5..23fa3e9493 100644
--- a/admin.mss
+++ b/admin.mss
@@ -178,7 +178,8 @@ overlapping borders correctly.
 }
 
 #nature-reserve-text {
-  [zoom >= 13][way_pixels > 192000] {
+  [zoom >= 13][way_pixels > 192000],
+  [zoom=14][way_pixels > 192000], [zoom=15][way_pixels > 48000], [zoom=16][way_pixels > 12000], [zoom=17][way_pixels > 3000], [zoom=18][way_pixels > 750], [zoom>=19][way_pixels > 187] {
     text-name: "[name]";
     text-face-name: @book-fonts;
     text-fill: green;
@@ -192,7 +193,8 @@ overlapping borders correctly.
 }
 
 #nature-reserve-boundaries {
-  [way_pixels > 100][zoom >= 7] {
+  [way_pixels > 100][zoom >= 7],
+  [zoom=14][way_pixels > 100], [zoom=15][way_pixels > 25], [zoom=16][way_pixels > 6], [zoom>=17][way_pixels > 1] {
     [zoom < 10] {
       ::fill {
         opacity: 0.05;
diff --git a/amenity-points.mss b/amenity-points.mss
index c31792ec9e..5e9c681c7e 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -314,7 +314,7 @@
   [feature = 'amenity_parking'],
   [feature = 'amenity_bicycle_parking'],
   [feature = 'amenity_motorcycle_parking'] {
-    [way_pixels > 900] {
+    [zoom<14][way_pixels > 900], [zoom=14][way_pixels > 900], [zoom=15][way_pixels > 225], [zoom=16][way_pixels > 56], [zoom=17][way_pixels > 14], [zoom=18][way_pixels > 3], [zoom>=19] {
       [feature = 'amenity_parking'] {
         marker-file: url('symbols/parking.svg');
       }
@@ -1132,8 +1132,8 @@
     text-name: "[name]";
     text-fill: #000;
     text-size: @standard-text-size;
-    [way_pixels > 12000] { text-size: 12; }
-    [way_pixels > 48000] { text-size: 15; }
+    [way_pixels > 12000], [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11] { text-size: 12; }
+    [way_pixels > 48000], [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46] { text-size: 15; }
     text-face-name: @oblique-fonts;
     text-halo-radius: 1;
     text-halo-fill: rgba(255,255,255,0.6);
@@ -1215,7 +1215,7 @@
   [feature = 'amenity_bicycle_parking'],
   [feature = 'amenity_motorcycle_parking']
   {
-    [zoom >= 10][way_pixels > 900] {
+    [zoom >= 10][way_pixels > 900], [zoom=14][way_pixels > 900], [zoom=15][way_pixels > 225], [zoom=16][way_pixels > 56], [zoom=17][way_pixels > 14], [zoom=18][way_pixels > 3], [zoom>=19] {
       text-name: "[name]";
       text-size: @standard-text-size;
       text-fill: @transportation-text;
@@ -1357,16 +1357,15 @@
   }
 
   [feature = 'leisure_swimming_pool'][is_building = 'no'] {
-    [zoom >= 14][way_pixels > 3000],
-    [zoom >= 17] {
+    [zoom=14][way_pixels > 3000], [zoom=15][way_pixels > 750], [zoom=16][way_pixels > 187], [zoom>=17] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
-      [way_pixels > 12000] {
+      [way_pixels > 12000], [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11] {
         text-size: @landcover-font-size-big;
         text-wrap-width: @landcover-wrap-width-size-big;
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000], [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46] {
         text-size: @landcover-font-size-bigger;
         text-wrap-width: @landcover-wrap-width-size-bigger;
       }
@@ -1404,15 +1403,15 @@
   [feature = 'boundary_national_park'],
   [feature = 'leisure_nature_reserve'] {
     [zoom >= 8][way_pixels > 3000][is_building = 'no'],
-    [zoom >= 17] {  
+    [zoom >= 17] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
-      [way_pixels > 12000] {
+      [way_pixels > 12000], [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11] {
         text-size: @landcover-font-size-big;
         text-wrap-width: @landcover-wrap-width-size-big;
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000], [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46] {
         text-size: @landcover-font-size-bigger;
         text-wrap-width: @landcover-wrap-width-size-bigger;
       }
@@ -1436,15 +1435,16 @@
 
   [feature = 'military_danger_area'][is_building = 'no'] {
     [zoom >= 9][way_pixels > 3000],
+    [zoom=14][way_pixels > 3000], [zoom=15][way_pixels > 750], [zoom=16][way_pixels > 187],
     [zoom >= 17] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
-      [way_pixels > 12000] {
+      [way_pixels > 12000], [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11] {
         text-size: @landcover-font-size-big;
         text-wrap-width: @landcover-wrap-width-size-big;
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000], [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46] {
         text-size: @landcover-font-size-bigger;
         text-wrap-width: @landcover-wrap-width-size-bigger;
       }
@@ -1458,15 +1458,16 @@
 
   [feature = 'landuse_garages'][is_building = 'no'] {
     [zoom >= 13][way_pixels > 3000],
+    [zoom=14][way_pixels > 3000], [zoom=15][way_pixels > 750], [zoom=16][way_pixels > 187],
     [zoom >= 17] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
-      [way_pixels > 12000] {
+      [way_pixels > 12000], [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11] {
         text-size: @landcover-font-size-big;
         text-wrap-width: @landcover-wrap-width-size-big;
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000], [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46] {
         text-size: @landcover-font-size-bigger;
         text-wrap-width: @landcover-wrap-width-size-bigger;
       }
@@ -1526,18 +1527,22 @@
   [feature = 'leisure_stadium'],
   [feature = 'leisure_track'],
   [feature = 'leisure_pitch'] {
-    [zoom >= 10][way_pixels > 3000][is_building = 'no'],
+    [zoom >= 10][way_pixels > 3000][is_building = 'no'], [is_building = 'no'][zoom=14][way_pixels > 3000], [is_building = 'no'][zoom=15][way_pixels > 750], [is_building = 'no'][zoom=16][way_pixels > 187],
     [zoom >= 17][is_building = 'no'],
-    [zoom >= 10][way_pixels > 3000][feature = 'shop_mall'],
+    [zoom >= 10][way_pixels > 3000][feature = 'shop_mall'], [feature = 'shop_mall'][zoom=14][way_pixels > 3000], [feature = 'shop_mall'][zoom=15][way_pixels > 750], [feature = 'shop_mall'][zoom=16][way_pixels > 187],
     [zoom >= 17][feature = 'shop_mall'] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
-      [way_pixels > 12000] {
+      [way_pixels > 12000],
+      [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11]
+      {
         text-size: @landcover-font-size-big;
         text-wrap-width: @landcover-wrap-width-size-big;
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000],
+      [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46]
+      {
         text-size: @landcover-font-size-bigger;
         text-wrap-width: @landcover-wrap-width-size-bigger;
       }
@@ -1750,15 +1755,16 @@
 
   [feature = 'leisure_marina'][zoom >= 15] {
     [zoom >= 10][way_pixels > 3000],
+    [zoom=14][way_pixels > 3000], [zoom=15][way_pixels > 750], [zoom=16][way_pixels > 187],
     [zoom >= 17] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
-      [way_pixels > 12000] {
+      [way_pixels > 12000], [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11] {
         text-size: @landcover-font-size-big;
         text-wrap-width: @landcover-wrap-width-size-big;
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000], [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46] {
         text-size: @landcover-font-size-bigger;
         text-wrap-width: @landcover-wrap-width-size-bigger;
       }
@@ -1961,15 +1967,16 @@
   [feature = 'power_sub_station'][is_building = 'no'][zoom >= 13],
   [feature = 'power_substation'][is_building = 'no'][zoom >= 13]{
     [way_pixels > 3000],
+    [zoom=14][way_pixels > 3000], [zoom=15][way_pixels > 750], [zoom=16][way_pixels > 187]
     [zoom >= 17] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
-      [way_pixels > 12000] {
+      [way_pixels > 12000], [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11] {
         text-size: @landcover-font-size-big;
         text-wrap-width: @landcover-wrap-width-size-big;
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000], [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46] {
         text-size: @landcover-font-size-bigger;
         text-wrap-width: @landcover-wrap-width-size-bigger;
       }
@@ -1986,15 +1993,16 @@
   [feature = 'natural_bare_rock'],
   [feature = 'natural_sand'] {
     [zoom >= 9][way_pixels > 3000][is_building = 'no'],
+    [zoom=14][way_pixels > 3000][is_building = 'no'], [zoom=15][way_pixels > 750][is_building = 'no'], [zoom=16][way_pixels > 187][is_building = 'no'],
     [zoom >= 17][is_building = 'no'] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
-      [way_pixels > 12000] {
+      [way_pixels > 12000], [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11] {
         text-size: @landcover-font-size-big;
         text-wrap-width: @landcover-wrap-width-size-big;
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000], [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46] {
         text-size: @landcover-font-size-bigger;
         text-wrap-width: @landcover-wrap-width-size-bigger;
       }
@@ -2015,15 +2023,16 @@
 
   [feature = 'aeroway_apron'][is_building = 'no'] {
     [zoom >= 10][way_pixels > 3000],
+    [zoom=14][way_pixels > 3000], [zoom=15][way_pixels > 750], [zoom=16][way_pixels > 187],
     [zoom >= 17] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
-      [way_pixels > 12000] {
+      [way_pixels > 12000], [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11] {
         text-size: @landcover-font-size-big;
         text-wrap-width: @landcover-wrap-width-size-big;
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000], [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46] {
         text-size: @landcover-font-size-bigger;
         text-wrap-width: @landcover-wrap-width-size-bigger;
       }
@@ -2038,15 +2047,16 @@
   [feature = 'highway_services'][is_building = 'no'],
   [feature = 'highway_rest_area'][is_building = 'no'] {
     [zoom >= 10][way_pixels > 3000],
+    [zoom=14][way_pixels > 3000], [zoom=15][way_pixels > 750], [zoom=16][way_pixels > 187],
     [zoom >= 17] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
-      [way_pixels > 12000] {
+      [way_pixels > 12000], [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11] {
         text-size: @landcover-font-size-big;
         text-wrap-width: @landcover-wrap-width-size-big;
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000], [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46] {
         text-size: @landcover-font-size-bigger;
         text-wrap-width: @landcover-wrap-width-size-bigger;
       }
@@ -2061,15 +2071,16 @@
   [feature = 'natural_glacier'][is_building = 'no'] {
     [zoom >= 8][way_pixels > 10000],
     [zoom >= 10][way_pixels > 750],
+    [zoom=14][way_pixels > 750], [zoom=15][way_pixels > 187], [zoom=16][way_pixels > 46],
     [zoom >= 17] {
       text-name: "[name]";
       text-size: @landcover-font-size;
       text-wrap-width: @landcover-wrap-width-size;
-      [way_pixels > 12000] {
+      [way_pixels > 12000], [zoom=14][way_pixels > 12000], [zoom=15][way_pixels > 3000], [zoom=16][way_pixels > 750], [zoom=17][way_pixels > 187], [zoom=18][way_pixels > 46], [zoom>=19][way_pixels > 11] {
         text-size: @landcover-font-size-big;
         text-wrap-width: @landcover-wrap-width-size-big;
       }
-      [way_pixels > 48000] {
+      [way_pixels > 48000], [zoom=14][way_pixels > 48000], [zoom=15][way_pixels > 12000], [zoom=16][way_pixels > 3000], [zoom=17][way_pixels > 750], [zoom=18][way_pixels > 187], [zoom>=19][way_pixels > 46] {
         text-size: @landcover-font-size-bigger;
         text-wrap-width: @landcover-wrap-width-size-bigger;
       }
diff --git a/landcover.mss b/landcover.mss
index d91bd86991..7a357f25db 100644
--- a/landcover.mss
+++ b/landcover.mss
@@ -68,8 +68,8 @@
     [feature = 'wetland_tidalflat'] {
       [zoom >= 9] {
         polygon-fill: @mud;
-        [way_pixels >= 4]  { polygon-gamma: 0.75; }
-        [way_pixels >= 64] { polygon-gamma: 0.3;  }
+        [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+        [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
       }
     }
   }
@@ -78,16 +78,16 @@
     polygon-fill: @water-color;
     line-color: saturate(darken(@water-color, 40%), 30%);
     line-width: 0.5;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'leisure_playground'][zoom >= 13] {
     polygon-fill: @playground;
     line-color: darken(@playground, 60%);
     line-width: 0.3;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'tourism_camp_site'],
@@ -97,8 +97,8 @@
       polygon-fill: @campsite;
       line-color: saturate(darken(@campsite, 60%), 30%);
       line-width: 0.3;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
@@ -107,35 +107,35 @@
     polygon-pattern-file: url('symbols/quarry.png');
     line-width: 0.5;
     line-color: grey;
-    [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-pattern-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-pattern-gamma: 0.3;  }
   }
 
   [feature = 'landuse_vineyard'] {
     [zoom >= 10] {
       polygon-fill: @orchard;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
     [zoom >= 14] {
       polygon-pattern-file: url('symbols/vineyard.png');
       polygon-pattern-alignment: global;
-      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-pattern-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-pattern-gamma: 0.3;  }
     }
   }
 
   [feature = 'landuse_orchard'] {
     [zoom >= 10] {
       polygon-fill: @orchard;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
     [zoom >= 14] {
       polygon-pattern-file: url('symbols/orchard.png');
       polygon-pattern-alignment: global;
-      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-pattern-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-pattern-gamma: 0.3;  }
     }
   }
 
@@ -143,8 +143,8 @@
   [feature = 'amenity_grave_yard'] {
     [zoom >= 10] {
       polygon-fill: @cemetery;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
     [zoom >= 14] {
       [religion = 'jewish'] { polygon-pattern-file: url('symbols/grave_yard_jewish.png'); }
@@ -153,8 +153,8 @@
       [religion = 'jewish'],
       [religion = 'christian'],
       [religion = 'INT-generic'] {
-        [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-        [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+        [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-pattern-gamma: 0.75; }
+        [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-pattern-gamma: 0.3;  }
       }
     }
   }
@@ -186,27 +186,27 @@
         line-width: 0.7;
       }
     }
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'landuse_garages'][zoom >= 13] {
     polygon-fill: @garages;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'military_danger_area'] {
     [zoom >= 9][zoom < 11] {
       polygon-fill: @danger_area;
       polygon-opacity: 0.3;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
     [zoom >= 11] {
       polygon-pattern-file: url('symbols/danger.png');
-      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-pattern-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-pattern-gamma: 0.3;  }
     }
   }
 
@@ -214,29 +214,29 @@
   [feature = 'leisure_recreation_ground'] {
     [zoom >= 10] {
       polygon-fill: @park;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
   [feature = 'leisure_golf_course'][zoom >= 10],
   [feature = 'leisure_miniature_golf'][zoom >= 15] {
     polygon-fill: @golf_course;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'landuse_allotments'] {
     [zoom >= 10][zoom < 14] {
       polygon-fill: @allotments;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
     [zoom >= 14] {
       polygon-pattern-file: url('symbols/allotments.png');
       polygon-pattern-alignment: global;
-      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-pattern-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-pattern-gamma: 0.3;  }
     }
   }
 
@@ -244,8 +244,8 @@
   [feature = 'natural_wood'] {
     [zoom >= 8] {
       polygon-fill: @forest;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
@@ -258,8 +258,8 @@
           line-width: 0.7;
         }
       }
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'landuse_farm'],
@@ -271,8 +271,8 @@
         line-width: .5;
         line-color: @farmland-line;
       }
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
@@ -285,8 +285,8 @@
   [feature = 'leisure_garden'] {
     [zoom >= 10] {
       polygon-fill: @grass;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
@@ -298,8 +298,8 @@
       [name != ''] {
         line-width: 0.7;
       }
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
@@ -312,8 +312,8 @@
         line-width: 0.7;
       }
     }
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'landuse_railway'][zoom >= 10] {
@@ -322,8 +322,8 @@
       line-width: 0.7;
       line-color: @railway-line;
     }
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'power_station'][zoom >= 10],
@@ -341,8 +341,8 @@
         line-width: 0.7;
       }
     }
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'landuse_commercial'][zoom >= 10] {
@@ -354,8 +354,8 @@
         line-width: 0.7;
       }
     }
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'landuse_brownfield'],
@@ -363,19 +363,19 @@
   [feature = 'landuse_construction'] {
     [zoom >= 10] {
       polygon-fill: @construction;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
   [feature = 'natural_bare_rock'][zoom >= 9] {
     polygon-fill: @bare_ground;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     [zoom >= 13] {
       polygon-pattern-file: url('symbols/rock_overlay.png');
-      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-pattern-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-pattern-gamma: 0.3;  }
     }
   }
 
@@ -383,53 +383,53 @@
   [feature = 'natural_shingle'] {
     [zoom >= 9] {
       polygon-fill: @bare_ground;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
       [zoom >= 13] {
         polygon-pattern-file: url('symbols/scree_overlay.png');
-        [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-        [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+        [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-pattern-gamma: 0.75; }
+        [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-pattern-gamma: 0.3;  }
       }
     }
   }
 
   [feature = 'natural_sand'][zoom >= 9] {
     polygon-fill: @sand;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'natural_heath'][zoom >= 10] {
     polygon-fill: @heath;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'natural_scrub'] {
     [zoom >= 10] {
       polygon-fill: @scrub;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
     [zoom >= 14] {
       polygon-pattern-file: url('symbols/scrub.png');
-      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-pattern-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-pattern-gamma: 0.3;  }
     }
   }
  
   [feature = 'wetland_swamp'][zoom >= 8] {
     polygon-fill: @forest;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'wetland_bog'],
   [feature = 'wetland_string_bog'] {
     [zoom >= 10] {
       polygon-fill: @heath;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
@@ -437,8 +437,8 @@
   [feature = 'wetland_marsh'] {
     [zoom >= 10] {
       polygon-fill: @grass;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
@@ -456,8 +456,8 @@
           line-color: brown;
         }
       }
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
@@ -469,37 +469,37 @@
       line-width: 0.3;
       line-color: saturate(darken(@parking, 40%), 20%);
     }
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'aeroway_apron'][zoom >= 10] {
     polygon-fill: @apron;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'aeroway_aerodrome'][zoom >= 10] {
     polygon-fill: @aerodrome;
     line-width: 0.2;
     line-color: saturate(darken(@aerodrome, 40%), 20%);
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'natural_beach'][zoom >= 10],
   [feature = 'natural_shoal'][zoom >= 10] {
     polygon-fill: @beach;
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'highway_services'],
   [feature = 'highway_rest_area'] {
     [zoom >= 10] {
       polygon-fill: @rest_area;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
@@ -511,8 +511,8 @@
   [feature = 'leisure_stadium'] {
     [zoom >= 10] {
       polygon-fill: @stadium;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
+      [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+      [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
     }
   }
 
@@ -522,8 +522,8 @@
       line-width: 0.5;
       line-color: saturate(darken(@track, 40%), 20%);
     }
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 
   [feature = 'leisure_pitch'][zoom >= 10] {
@@ -532,8 +532,8 @@
       line-width: 0.5;
       line-color: saturate(darken(@pitch, 40%), 20%);
     }
-    [way_pixels >= 4]  { polygon-gamma: 0.75; }
-    [way_pixels >= 64] { polygon-gamma: 0.3;  }
+    [way_pixels >= 4], [zoom>=15][way_pixels > 1]   { polygon-gamma: 0.75; }
+    [way_pixels >= 4], [zoom=15][way_pixels > 16], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1]  { polygon-gamma: 0.3;  }
   }
 }
 
@@ -615,7 +615,7 @@
 
 #landuse-overlay {
   [landuse = 'military'] {
-    [zoom >= 7][way_pixels > 900], [zoom >= 8][way_pixels > 100], [zoom >= 10][way_pixels > 75] {
+    [zoom >= 7][way_pixels > 900], [zoom >= 8][way_pixels > 100], [zoom >= 10][way_pixels > 75], [zoom=15][way_pixels > 18], [zoom=16][way_pixels > 4], [zoom>=17][way_pixels > 1] {
       polygon-pattern-file: url('symbols/military_red_hatch.png');
       polygon-pattern-alignment: global;
       line-color: @military;
@@ -673,7 +673,8 @@
     a/line-join: round;
     a/line-cap: round;
     [zoom >= 17],
-    [way_pixels >= 60] {
+    [way_pixels >= 60]
+    [zoom=15][way_pixels > 15], [zoom=16][way_pixels > 3] {
       b/line-width: 4;
       b/line-offset: -2;
       b/line-color: @tourism;
diff --git a/roads.mss b/roads.mss
index 3ca498a3ff..96c08cba96 100644
--- a/roads.mss
+++ b/roads.mss
@@ -2551,7 +2551,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
 
 #bridge-text  {
   [man_made = 'bridge'] {
-    [zoom >= 12][way_pixels > 62.5] {
+    [zoom >= 12][way_pixels > 62.5], [zoom=15][way_pixels > 15], [zoom=16][way_pixels > 3], [zoom>=17][way_pixels > 1] {
       text-name: "[name]";
       text-size: 8;
       text-fill: black;
@@ -2560,17 +2560,17 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
       text-halo-fill: rgba(255,255,255,0.6);
       text-min-distance: 2;
       text-wrap-width: 30;
-      [way_pixels > 250] {
+      [way_pixels > 250], [zoom=15][way_pixels > 62], [zoom=16][way_pixels > 15], [zoom=17][way_pixels > 3], [zoom>=18][way_pixels > 1], {
         text-size: 9;
       }
-      [way_pixels > 1000] {
+      [way_pixels > 1000], [zoom=14][way_pixels > 1000], [zoom=15][way_pixels > 250], [zoom=16][way_pixels > 62], [zoom=17][way_pixels > 15], [zoom=18][way_pixels > 3], [zoom>=19][way_pixels > 1] {
         text-size: 11;
         text-halo-radius: 1.5;
       }
-      [way_pixels > 4000] {
+      [way_pixels > 4000], [zoom=14][way_pixels > 4000], [zoom=15][way_pixels > 1000], [zoom=16][way_pixels > 250], [zoom=17][way_pixels > 62], [zoom=18][way_pixels > 15], [zoom>=19][way_pixels > 3] {
         text-size: 12;
       }
-      [way_pixels > 16000] {
+       [way_pixels > 16000], [zoom=14][way_pixels > 16000], [zoom=15][way_pixels > 4000], [zoom=16][way_pixels > 1000], [zoom=17][way_pixels > 250], [zoom=18][way_pixels > 62], [zoom>=19][way_pixels > 15] {
         text-size: 13;
         text-halo-radius: 2;
       }
@@ -3024,6 +3024,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
 
 #roads-area-text-name {
   [way_pixels > 3000],
+  [zoom=14][way_pixels > 3000], [zoom=15][way_pixels > 750], [zoom=16][way_pixels > 187]
   [zoom >= 17] {
     [zoom >= 15] {
       text-name: "[name]";
diff --git a/water.mss b/water.mss
index e0e83395a2..9f54ec6060 100644
--- a/water.mss
+++ b/water.mss
@@ -285,6 +285,7 @@
   [feature = 'landuse_reservoir'],
   [feature = 'landuse_basin'] {
     [zoom >= 10][way_pixels > 3000],
+    [zoom=14][way_pixels > 3000], [zoom=15][way_pixels > 750], [zoom=16][way_pixels > 187],
     [zoom >= 17] {
       text-name: "[name]";
       text-size: 12;