diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 0dac813ca..549e36471 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 7e7030f4e..552c9b042 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -4340,8 +4340,26 @@ cont {
 }
 cont {
   name: "amenity-car_wash"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4359,6 +4377,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4376,6 +4398,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4393,6 +4419,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4669,6 +4699,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4686,6 +4720,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4703,6 +4741,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4719,6 +4761,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4735,6 +4781,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4751,6 +4801,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4768,8 +4822,40 @@ cont {
 }
 cont {
   name: "amenity-childcare"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4786,6 +4872,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4802,6 +4892,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4818,6 +4912,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4902,8 +5000,40 @@ cont {
 }
 cont {
   name: "amenity-clinic"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4921,6 +5051,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4937,6 +5071,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4953,6 +5091,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4970,6 +5112,20 @@ cont {
 }
 cont {
   name: "amenity-college"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -5315,8 +5471,26 @@ cont {
 }
 cont {
   name: "amenity-courthouse"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5333,6 +5507,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5349,6 +5527,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5365,6 +5547,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5449,13 +5635,6 @@ cont {
 }
 cont {
   name: "amenity-doctors"
-  element {
-    scale: 14
-    area {
-      color: 16767702
-      priority: -1770
-    }
-  }
   element {
     scale: 15
     area {
@@ -6160,8 +6339,33 @@ cont {
 }
 cont {
   name: "amenity-fire_station"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6178,6 +6382,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6194,6 +6402,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6477,6 +6689,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6494,6 +6710,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6511,6 +6731,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6527,6 +6751,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6543,6 +6771,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6559,6 +6791,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6855,6 +7091,13 @@ cont {
 }
 cont {
   name: "amenity-hospital"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -7231,6 +7474,20 @@ cont {
 }
 cont {
   name: "amenity-kindergarten"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -7514,8 +7771,19 @@ cont {
 }
 cont {
   name: "amenity-marketplace"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7533,6 +7801,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7550,6 +7822,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7567,6 +7843,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7584,6 +7864,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -9972,6 +10256,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10122,6 +10413,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10272,6 +10570,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10422,6 +10727,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10572,6 +10884,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-mormon"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10722,6 +11041,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10872,6 +11198,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11022,6 +11355,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11172,6 +11512,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11322,6 +11669,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11472,6 +11826,13 @@ cont {
 }
 cont {
   name: "amenity-police"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
     area {
@@ -12070,8 +12431,26 @@ cont {
 }
 cont {
   name: "amenity-recycling-centre"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12079,6 +12458,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12086,6 +12469,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12102,6 +12489,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12378,6 +12769,20 @@ cont {
 }
 cont {
   name: "amenity-school"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -13098,8 +13503,26 @@ cont {
 }
 cont {
   name: "amenity-social_facility"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13116,6 +13539,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13132,6 +13559,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13148,6 +13579,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13744,6 +14179,13 @@ cont {
 }
 cont {
   name: "amenity-university"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -13946,8 +14388,19 @@ cont {
 }
 cont {
   name: "amenity-vehicle_inspection"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13964,6 +14417,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13981,6 +14438,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13998,6 +14459,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14015,6 +14480,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14869,8 +15338,40 @@ cont {
 }
 cont {
   name: "amenity-waste_transfer_station"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14878,6 +15379,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14885,6 +15390,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14901,6 +15410,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -21924,70 +22437,38 @@ cont {
   name: "emergency-mountain_rescue"
   element {
     scale: 12
-    symbol {
-      name: "hospital-m"
-      priority: 3900
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6100
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 13
-    symbol {
-      name: "hospital-m"
-      priority: 3900
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6100
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 14
-    symbol {
-      name: "hospital-m"
-      priority: 3900
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6100
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 15
-    symbol {
-      name: "hospital-m"
-      priority: 3900
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6100
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -22004,6 +22485,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -22020,6 +22505,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -22036,6 +22525,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -22052,6 +22545,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -33966,24 +34463,25 @@ cont {
 cont {
   name: "highway-rest_area"
   element {
-    scale: 14
-    symbol {
-      name: "picnic-m"
-      priority: 3800
-      min_distance: 10
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6200
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34001,6 +34499,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34017,6 +34519,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34033,6 +34539,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34049,6 +34559,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34065,6 +34579,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -36576,40 +37094,24 @@ cont {
   name: "highway-services"
   element {
     scale: 12
-    symbol {
-      name: "car-repair-s"
-      priority: 4250
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5750
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 13
-    symbol {
-      name: "car-repair-s"
-      priority: 4250
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5750
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-s"
       priority: 4250
@@ -36627,6 +37129,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36644,6 +37150,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36660,6 +37170,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36676,6 +37190,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36692,6 +37210,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36708,6 +37230,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -48356,6 +48882,20 @@ cont {
 }
 cont {
   name: "landuse-construction"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -48443,6 +48983,20 @@ cont {
 }
 cont {
   name: "landuse-education"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
   element {
     scale: 15
     area {
@@ -50002,46 +50556,60 @@ cont {
 }
 cont {
   name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 16
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 17
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 18
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 19
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 20
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
 }
@@ -50120,6 +50688,20 @@ cont {
 }
 cont {
   name: "landuse-industrial"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -50207,6 +50789,20 @@ cont {
 }
 cont {
   name: "landuse-industrial-mine"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -50330,6 +50926,20 @@ cont {
 }
 cont {
   name: "landuse-landfill"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
   element {
     scale: 15
     area {
@@ -51012,6 +51622,20 @@ cont {
 }
 cont {
   name: "landuse-quarry"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -51135,6 +51759,20 @@ cont {
 }
 cont {
   name: "landuse-railway"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -52414,8 +53052,19 @@ cont {
 }
 cont {
   name: "leisure-dog_park"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52433,6 +53082,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52450,6 +53103,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52467,6 +53124,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52484,6 +53145,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52656,8 +53321,26 @@ cont {
 }
 cont {
   name: "leisure-fitness_station"
+  element {
+    scale: 15
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52675,6 +53358,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52692,6 +53379,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52709,6 +53400,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -55242,6 +55937,20 @@ cont {
 }
 cont {
   name: "leisure-resort"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
@@ -55475,6 +56184,20 @@ cont {
 }
 cont {
   name: "leisure-sports_centre"
+  element {
+    scale: 13
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
   element {
     scale: 15
     area {
@@ -55649,6 +56372,10 @@ cont {
   name: "leisure-stadium"
   element {
     scale: 13
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -55666,6 +56393,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -56225,8 +56956,33 @@ cont {
 }
 cont {
   name: "leisure-water_park"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -56244,6 +57000,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -56261,6 +57021,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -56278,6 +57042,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -56295,6 +57063,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -58777,8 +59549,33 @@ cont {
 }
 cont {
   name: "man_made-works"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58786,6 +59583,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58802,6 +59603,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58818,6 +59623,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58834,6 +59643,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -66265,8 +67078,26 @@ cont {
 }
 cont {
   name: "office-diplomatic"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66283,6 +67114,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66299,6 +67134,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66315,6 +67154,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -74765,8 +75608,40 @@ cont {
 }
 cont {
   name: "power-generator"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74774,6 +75649,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74781,6 +75660,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74788,6 +75671,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74796,8 +75683,40 @@ cont {
 }
 cont {
   name: "power-generator-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74805,6 +75724,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74812,6 +75735,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74819,6 +75746,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74827,8 +75758,40 @@ cont {
 }
 cont {
   name: "power-generator-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74836,6 +75799,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74843,6 +75810,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74850,6 +75821,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74857,23 +75832,86 @@ cont {
   }
 }
 cont {
-  name: "power-generator-wind"
+  name: "power-generator-solar"
   element {
     scale: 13
-    symbol {
-      name: "dot-m"
-      priority: 120
+    area {
+      color: 15066596
+      priority: -1950
     }
   }
   element {
     scale: 14
-    symbol {
-      name: "dot-m"
-      priority: 120
+    area {
+      color: 15066596
+      priority: -1950
     }
   }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74881,6 +75919,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74888,6 +75930,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74895,6 +75941,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74911,6 +75961,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74927,6 +75981,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -75200,8 +76258,40 @@ cont {
 }
 cont {
   name: "power-plant"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75209,6 +76299,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75216,6 +76310,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75223,6 +76321,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75231,8 +76333,40 @@ cont {
 }
 cont {
   name: "power-plant-coal"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75240,6 +76374,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75247,6 +76385,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75254,6 +76396,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75262,8 +76408,40 @@ cont {
 }
 cont {
   name: "power-plant-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75271,6 +76449,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75278,6 +76460,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75285,6 +76471,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75293,8 +76483,40 @@ cont {
 }
 cont {
   name: "power-plant-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75302,6 +76524,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75309,6 +76535,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75316,6 +76546,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75324,8 +76558,40 @@ cont {
 }
 cont {
   name: "power-plant-solar"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75333,6 +76599,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75340,6 +76610,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75347,6 +76621,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75357,20 +76635,24 @@ cont {
   name: "power-plant-wind"
   element {
     scale: 13
-    symbol {
-      name: "power_plant_wind-m"
-      priority: 230
+    area {
+      color: 15066596
+      priority: -1950
     }
   }
   element {
     scale: 14
-    symbol {
-      name: "power_plant_wind-m"
-      priority: 230
+    area {
+      color: 15066596
+      priority: -1950
     }
   }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75378,6 +76660,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75394,6 +76680,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75410,6 +76700,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75426,6 +76720,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75442,6 +76740,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75571,8 +76873,54 @@ cont {
 }
 cont {
   name: "power-substation"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -75589,6 +76937,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 039563ec0..32a4163ef 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index bd50b0537..b25a6baee 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -4308,8 +4308,23 @@ cont {
 }
 cont {
   name: "amenity-car_wash"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4327,6 +4342,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4344,6 +4362,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4361,6 +4382,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4637,6 +4661,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4654,6 +4681,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4671,6 +4701,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4687,6 +4720,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4703,6 +4739,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4719,6 +4758,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4736,8 +4778,40 @@ cont {
 }
 cont {
   name: "amenity-childcare"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4754,6 +4828,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4770,6 +4848,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4786,6 +4868,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4870,8 +4956,40 @@ cont {
 }
 cont {
   name: "amenity-clinic"
+  element {
+    scale: 13
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4889,6 +5007,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4905,6 +5027,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4921,6 +5047,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4938,6 +5068,20 @@ cont {
 }
 cont {
   name: "amenity-college"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -5283,8 +5427,23 @@ cont {
 }
 cont {
   name: "amenity-courthouse"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5301,6 +5460,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5317,6 +5479,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5333,6 +5498,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5417,13 +5585,6 @@ cont {
 }
 cont {
   name: "amenity-doctors"
-  element {
-    scale: 14
-    area {
-      color: 2496790
-      priority: -1770
-    }
-  }
   element {
     scale: 15
     area {
@@ -6100,8 +6261,29 @@ cont {
 }
 cont {
   name: "amenity-fire_station"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 17
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6118,6 +6300,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6134,6 +6319,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6383,6 +6571,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6400,6 +6591,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6417,6 +6611,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6433,6 +6630,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6449,6 +6649,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6465,6 +6668,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6761,6 +6967,13 @@ cont {
 }
 cont {
   name: "amenity-hospital"
+  element {
+    scale: 13
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -7073,6 +7286,20 @@ cont {
 }
 cont {
   name: "amenity-kindergarten"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -7356,8 +7583,17 @@ cont {
 }
 cont {
   name: "amenity-marketplace"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7375,6 +7611,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7392,6 +7631,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7409,6 +7651,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7426,6 +7671,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -9670,6 +9918,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9813,6 +10067,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9956,6 +10216,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10099,6 +10365,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10242,6 +10514,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-mormon"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10385,6 +10663,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10528,6 +10812,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10671,6 +10961,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10814,6 +11110,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10957,6 +11259,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11100,6 +11408,12 @@ cont {
 }
 cont {
   name: "amenity-police"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
     area {
@@ -11693,8 +12007,23 @@ cont {
 }
 cont {
   name: "amenity-recycling-centre"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11702,6 +12031,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11709,6 +12041,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11725,6 +12060,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12001,6 +12339,20 @@ cont {
 }
 cont {
   name: "amenity-school"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -12465,8 +12817,23 @@ cont {
 }
 cont {
   name: "amenity-social_facility"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12483,6 +12850,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12499,6 +12869,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12515,6 +12888,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13063,6 +13439,13 @@ cont {
 }
 cont {
   name: "amenity-university"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -13265,8 +13648,17 @@ cont {
 }
 cont {
   name: "amenity-vehicle_inspection"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13283,6 +13675,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13300,6 +13695,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13317,6 +13715,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13334,6 +13735,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14172,8 +14576,40 @@ cont {
 }
 cont {
   name: "amenity-waste_transfer_station"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14181,6 +14617,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14188,6 +14628,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14204,6 +14648,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -20564,8 +21012,29 @@ cont {
 }
 cont {
   name: "emergency-mountain_rescue"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20582,6 +21051,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20598,6 +21070,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20614,6 +21089,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20630,6 +21108,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -31523,8 +32004,23 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31542,6 +32038,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31558,6 +32057,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31574,6 +32076,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31590,6 +32095,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31606,6 +32114,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34045,8 +34556,17 @@ cont {
 }
 cont {
   name: "highway-services"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-s"
       priority: 4250
@@ -34064,6 +34584,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34081,6 +34604,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34097,6 +34623,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34113,6 +34642,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34129,6 +34661,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34145,6 +34680,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -45165,6 +45703,20 @@ cont {
 }
 cont {
   name: "landuse-construction"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -45252,6 +45804,20 @@ cont {
 }
 cont {
   name: "landuse-education"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1970
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1970
+    }
+  }
   element {
     scale: 15
     area {
@@ -46811,46 +47377,52 @@ cont {
 }
 cont {
   name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 16
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 17
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 18
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 19
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 20
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
 }
@@ -46929,6 +47501,20 @@ cont {
 }
 cont {
   name: "landuse-industrial"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47016,6 +47602,20 @@ cont {
 }
 cont {
   name: "landuse-industrial-mine"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47139,6 +47739,20 @@ cont {
 }
 cont {
   name: "landuse-landfill"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1780
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1780
+    }
+  }
   element {
     scale: 15
     area {
@@ -47821,6 +48435,20 @@ cont {
 }
 cont {
   name: "landuse-quarry"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47944,6 +48572,20 @@ cont {
 }
 cont {
   name: "landuse-railway"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49223,8 +49865,17 @@ cont {
 }
 cont {
   name: "leisure-dog_park"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49242,6 +49893,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49259,6 +49913,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49276,6 +49933,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49293,6 +49953,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49433,8 +50096,26 @@ cont {
 }
 cont {
   name: "leisure-fitness_station"
+  element {
+    scale: 15
+    area {
+      color: 2763300
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2763300
+      priority: -1920
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49452,6 +50133,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49469,6 +50154,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49486,6 +50175,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -51973,6 +52666,18 @@ cont {
 }
 cont {
   name: "leisure-resort"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
@@ -52200,6 +52905,20 @@ cont {
 }
 cont {
   name: "leisure-sports_centre"
+  element {
+    scale: 13
+    area {
+      color: 2171163
+      priority: -1810
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2171163
+      priority: -1810
+    }
+  }
   element {
     scale: 15
     area {
@@ -52374,6 +53093,10 @@ cont {
   name: "leisure-stadium"
   element {
     scale: 13
+    area {
+      color: 2500128
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -52391,6 +53114,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 2500128
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -52950,8 +53677,29 @@ cont {
 }
 cont {
   name: "leisure-water_park"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52969,6 +53717,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52986,6 +53737,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -53003,6 +53757,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -53020,6 +53777,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -54864,8 +55624,33 @@ cont {
 }
 cont {
   name: "man_made-works"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54873,6 +55658,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54889,6 +55678,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54905,6 +55698,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54921,6 +55718,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -61966,8 +62767,23 @@ cont {
 }
 cont {
   name: "office-diplomatic"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -61984,6 +62800,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -62000,6 +62819,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -62016,6 +62838,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -69792,8 +70617,40 @@ cont {
 }
 cont {
   name: "power-generator"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69801,6 +70658,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69808,6 +70669,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69815,6 +70680,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69823,8 +70692,40 @@ cont {
 }
 cont {
   name: "power-generator-gas"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69832,6 +70733,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69839,6 +70744,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69846,6 +70755,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69854,8 +70767,40 @@ cont {
 }
 cont {
   name: "power-generator-hydro"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69863,6 +70808,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69870,6 +70819,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69877,6 +70830,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69884,9 +70841,86 @@ cont {
   }
 }
 cont {
-  name: "power-generator-wind"
+  name: "power-generator-solar"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69894,6 +70928,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69901,6 +70939,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69908,6 +70950,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69924,6 +70970,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69940,6 +70990,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69994,8 +71048,40 @@ cont {
 }
 cont {
   name: "power-plant"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70003,6 +71089,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70010,6 +71100,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70017,6 +71111,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70025,8 +71123,40 @@ cont {
 }
 cont {
   name: "power-plant-coal"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70034,6 +71164,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70041,6 +71175,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70048,6 +71186,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70056,8 +71198,40 @@ cont {
 }
 cont {
   name: "power-plant-gas"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70065,6 +71239,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70072,6 +71250,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70079,6 +71261,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70087,8 +71273,40 @@ cont {
 }
 cont {
   name: "power-plant-hydro"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70096,6 +71314,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70103,6 +71325,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70110,6 +71336,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70118,8 +71348,40 @@ cont {
 }
 cont {
   name: "power-plant-solar"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70127,6 +71389,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70134,6 +71400,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70141,6 +71411,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70149,8 +71423,26 @@ cont {
 }
 cont {
   name: "power-plant-wind"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70158,6 +71450,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70174,6 +71470,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70190,6 +71490,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70206,6 +71510,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70222,6 +71530,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70306,8 +71618,54 @@ cont {
 }
 cont {
   name: "power-substation"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -70324,6 +71682,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -124181,6 +125543,18 @@ cont {
 }
 cont {
   name: "tourism-camp_site"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 867adbdcd..3d369f0aa 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 5b1ce9f4f..a6d8e5ad4 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -4308,8 +4308,26 @@ cont {
 }
 cont {
   name: "amenity-car_wash"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4327,6 +4345,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4344,6 +4366,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4361,6 +4387,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4637,6 +4667,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4654,6 +4688,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4671,6 +4709,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4687,6 +4729,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4703,6 +4749,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4719,6 +4769,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4736,8 +4790,40 @@ cont {
 }
 cont {
   name: "amenity-childcare"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4754,6 +4840,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4770,6 +4860,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4786,6 +4880,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4870,8 +4968,40 @@ cont {
 }
 cont {
   name: "amenity-clinic"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4889,6 +5019,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4905,6 +5039,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4921,6 +5059,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4938,6 +5080,20 @@ cont {
 }
 cont {
   name: "amenity-college"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -5283,8 +5439,26 @@ cont {
 }
 cont {
   name: "amenity-courthouse"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5301,6 +5475,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5317,6 +5495,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5333,6 +5515,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5417,13 +5603,6 @@ cont {
 }
 cont {
   name: "amenity-doctors"
-  element {
-    scale: 14
-    area {
-      color: 16767702
-      priority: -1770
-    }
-  }
   element {
     scale: 15
     area {
@@ -6100,8 +6279,33 @@ cont {
 }
 cont {
   name: "amenity-fire_station"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6118,6 +6322,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6134,6 +6342,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6383,6 +6595,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6400,6 +6616,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6417,6 +6637,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6433,6 +6657,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6449,6 +6677,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6465,6 +6697,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6761,6 +6997,13 @@ cont {
 }
 cont {
   name: "amenity-hospital"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -7073,6 +7316,20 @@ cont {
 }
 cont {
   name: "amenity-kindergarten"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -7356,8 +7613,19 @@ cont {
 }
 cont {
   name: "amenity-marketplace"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7375,6 +7643,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7392,6 +7664,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7409,6 +7685,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7426,6 +7706,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -9670,6 +9954,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9820,6 +10111,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9970,6 +10268,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10120,6 +10425,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10270,6 +10582,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-mormon"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10420,6 +10739,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10570,6 +10896,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10720,6 +11053,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10870,6 +11210,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11020,6 +11367,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11170,6 +11524,13 @@ cont {
 }
 cont {
   name: "amenity-police"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
     area {
@@ -11768,8 +12129,26 @@ cont {
 }
 cont {
   name: "amenity-recycling-centre"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11777,6 +12156,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11784,6 +12167,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11800,6 +12187,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12076,6 +12467,20 @@ cont {
 }
 cont {
   name: "amenity-school"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -12540,8 +12945,26 @@ cont {
 }
 cont {
   name: "amenity-social_facility"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12558,6 +12981,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12574,6 +13001,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12590,6 +13021,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13138,6 +13573,13 @@ cont {
 }
 cont {
   name: "amenity-university"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -13340,8 +13782,19 @@ cont {
 }
 cont {
   name: "amenity-vehicle_inspection"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13358,6 +13811,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13375,6 +13832,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13392,6 +13853,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13409,6 +13874,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14247,8 +14716,40 @@ cont {
 }
 cont {
   name: "amenity-waste_transfer_station"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14256,6 +14757,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14263,6 +14768,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14279,6 +14788,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -20639,8 +21152,33 @@ cont {
 }
 cont {
   name: "emergency-mountain_rescue"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20657,6 +21195,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20673,6 +21215,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20689,6 +21235,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20705,6 +21255,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -31445,8 +31999,26 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31464,6 +32036,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31480,6 +32056,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31496,6 +32076,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31512,6 +32096,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31528,6 +32116,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33940,8 +34532,19 @@ cont {
 }
 cont {
   name: "highway-services"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-s"
       priority: 4250
@@ -33959,6 +34562,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -33976,6 +34583,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -33992,6 +34603,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34008,6 +34623,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34024,6 +34643,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34040,6 +34663,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -44976,6 +45603,20 @@ cont {
 }
 cont {
   name: "landuse-construction"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -45063,6 +45704,20 @@ cont {
 }
 cont {
   name: "landuse-education"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
   element {
     scale: 15
     area {
@@ -46622,46 +47277,60 @@ cont {
 }
 cont {
   name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 16
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 17
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 18
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 19
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 20
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
 }
@@ -46740,6 +47409,20 @@ cont {
 }
 cont {
   name: "landuse-industrial"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -46827,6 +47510,20 @@ cont {
 }
 cont {
   name: "landuse-industrial-mine"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -46950,6 +47647,20 @@ cont {
 }
 cont {
   name: "landuse-landfill"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
   element {
     scale: 15
     area {
@@ -47632,6 +48343,20 @@ cont {
 }
 cont {
   name: "landuse-quarry"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47755,6 +48480,20 @@ cont {
 }
 cont {
   name: "landuse-railway"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49034,8 +49773,19 @@ cont {
 }
 cont {
   name: "leisure-dog_park"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49053,6 +49803,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49070,6 +49824,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49087,6 +49845,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49104,6 +49866,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49244,8 +50010,26 @@ cont {
 }
 cont {
   name: "leisure-fitness_station"
+  element {
+    scale: 15
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49263,6 +50047,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49280,6 +50068,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49297,6 +50089,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -51784,6 +52580,20 @@ cont {
 }
 cont {
   name: "leisure-resort"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
@@ -52017,6 +52827,20 @@ cont {
 }
 cont {
   name: "leisure-sports_centre"
+  element {
+    scale: 13
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
   element {
     scale: 15
     area {
@@ -52191,6 +53015,10 @@ cont {
   name: "leisure-stadium"
   element {
     scale: 13
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -52208,6 +53036,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -52767,8 +53599,33 @@ cont {
 }
 cont {
   name: "leisure-water_park"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52786,6 +53643,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52803,6 +53664,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52820,6 +53685,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52837,6 +53706,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -54699,8 +55572,33 @@ cont {
 }
 cont {
   name: "man_made-works"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54708,6 +55606,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54724,6 +55626,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54740,6 +55646,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54756,6 +55666,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -61821,8 +62735,26 @@ cont {
 }
 cont {
   name: "office-diplomatic"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -61839,6 +62771,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -61855,6 +62791,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -61871,6 +62811,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -69658,8 +70602,40 @@ cont {
 }
 cont {
   name: "power-generator"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69667,6 +70643,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69674,6 +70654,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69681,6 +70665,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69689,8 +70677,40 @@ cont {
 }
 cont {
   name: "power-generator-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69698,6 +70718,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69705,6 +70729,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69712,6 +70740,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69720,8 +70752,40 @@ cont {
 }
 cont {
   name: "power-generator-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69729,6 +70793,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69736,6 +70804,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69743,6 +70815,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69750,9 +70826,86 @@ cont {
   }
 }
 cont {
-  name: "power-generator-wind"
+  name: "power-generator-solar"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69760,6 +70913,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69767,6 +70924,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69774,6 +70935,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69790,6 +70955,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69806,6 +70975,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69860,8 +71033,40 @@ cont {
 }
 cont {
   name: "power-plant"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69869,6 +71074,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69876,6 +71085,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69883,6 +71096,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69891,8 +71108,40 @@ cont {
 }
 cont {
   name: "power-plant-coal"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69900,6 +71149,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69907,6 +71160,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69914,6 +71171,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69922,8 +71183,40 @@ cont {
 }
 cont {
   name: "power-plant-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69931,6 +71224,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69938,6 +71235,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69945,6 +71246,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69953,8 +71258,40 @@ cont {
 }
 cont {
   name: "power-plant-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69962,6 +71299,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69969,6 +71310,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69976,6 +71321,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69984,8 +71333,40 @@ cont {
 }
 cont {
   name: "power-plant-solar"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69993,6 +71374,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70000,6 +71385,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70007,6 +71396,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70015,8 +71408,26 @@ cont {
 }
 cont {
   name: "power-plant-wind"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70024,6 +71435,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70040,6 +71455,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70056,6 +71475,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70072,6 +71495,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70088,6 +71515,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70172,8 +71603,54 @@ cont {
 }
 cont {
   name: "power-substation"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -70190,6 +71667,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -124047,6 +125528,20 @@ cont {
 }
 cont {
   name: "tourism-camp_site"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 44f785b74..826b054e1 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 639aded0e..a271cc71e 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -4331,8 +4331,23 @@ cont {
 }
 cont {
   name: "amenity-car_wash"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4350,6 +4365,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4367,6 +4385,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4384,6 +4405,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4660,6 +4684,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4677,6 +4704,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4694,6 +4724,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4710,6 +4743,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4726,6 +4762,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4742,6 +4781,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4759,8 +4801,40 @@ cont {
 }
 cont {
   name: "amenity-childcare"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4777,6 +4851,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4793,6 +4871,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4809,6 +4891,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4893,8 +4979,40 @@ cont {
 }
 cont {
   name: "amenity-clinic"
+  element {
+    scale: 13
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4912,6 +5030,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4928,6 +5050,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4944,6 +5070,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4961,6 +5091,20 @@ cont {
 }
 cont {
   name: "amenity-college"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -5306,8 +5450,23 @@ cont {
 }
 cont {
   name: "amenity-courthouse"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5324,6 +5483,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5340,6 +5502,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5356,6 +5521,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5440,13 +5608,6 @@ cont {
 }
 cont {
   name: "amenity-doctors"
-  element {
-    scale: 14
-    area {
-      color: 2496790
-      priority: -1770
-    }
-  }
   element {
     scale: 15
     area {
@@ -6187,8 +6348,29 @@ cont {
 }
 cont {
   name: "amenity-fire_station"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 17
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6205,6 +6387,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6221,6 +6406,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6470,6 +6658,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6487,6 +6678,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6504,6 +6698,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6520,6 +6717,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6536,6 +6736,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6552,6 +6755,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6848,6 +7054,13 @@ cont {
 }
 cont {
   name: "amenity-hospital"
+  element {
+    scale: 13
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -7215,6 +7428,20 @@ cont {
 }
 cont {
   name: "amenity-kindergarten"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -7498,8 +7725,17 @@ cont {
 }
 cont {
   name: "amenity-marketplace"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7517,6 +7753,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7534,6 +7773,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7551,6 +7793,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7568,6 +7813,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -9812,6 +10060,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9955,6 +10209,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10098,6 +10358,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10241,6 +10507,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10384,6 +10656,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-mormon"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10527,6 +10805,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10670,6 +10954,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10813,6 +11103,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10956,6 +11252,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11099,6 +11401,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11242,6 +11550,12 @@ cont {
 }
 cont {
   name: "amenity-police"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
     area {
@@ -11835,8 +12149,23 @@ cont {
 }
 cont {
   name: "amenity-recycling-centre"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11844,6 +12173,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11851,6 +12183,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11867,6 +12202,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12143,6 +12481,20 @@ cont {
 }
 cont {
   name: "amenity-school"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -12850,8 +13202,23 @@ cont {
 }
 cont {
   name: "amenity-social_facility"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12868,6 +13235,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12884,6 +13254,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12900,6 +13273,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13469,6 +13845,13 @@ cont {
 }
 cont {
   name: "amenity-university"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -13671,8 +14054,17 @@ cont {
 }
 cont {
   name: "amenity-vehicle_inspection"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13689,6 +14081,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13706,6 +14101,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13723,6 +14121,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13740,6 +14141,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14578,8 +14982,40 @@ cont {
 }
 cont {
   name: "amenity-waste_transfer_station"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14587,6 +15023,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14594,6 +15034,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14610,6 +15054,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -21320,6 +21768,9 @@ cont {
   }
   element {
     scale: 13
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-s"
       priority: 3900
@@ -21336,6 +21787,9 @@ cont {
   }
   element {
     scale: 14
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21352,6 +21806,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21368,6 +21825,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21384,6 +21844,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21400,6 +21863,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21416,6 +21882,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21432,6 +21901,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -33506,8 +33978,17 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33515,6 +33996,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33532,6 +34016,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33548,6 +34035,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33564,6 +34054,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33580,6 +34073,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33596,6 +34092,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -36107,8 +36606,17 @@ cont {
 }
 cont {
   name: "highway-services"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-s"
       priority: 4250
@@ -36126,6 +36634,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36143,6 +36654,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36159,6 +36673,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36175,6 +36692,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36191,6 +36711,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36207,6 +36730,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -47857,6 +48383,20 @@ cont {
 }
 cont {
   name: "landuse-construction"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47944,6 +48484,20 @@ cont {
 }
 cont {
   name: "landuse-education"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1970
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1970
+    }
+  }
   element {
     scale: 15
     area {
@@ -49595,46 +50149,52 @@ cont {
 }
 cont {
   name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 16
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 17
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 18
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 19
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 20
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
 }
@@ -49713,6 +50273,20 @@ cont {
 }
 cont {
   name: "landuse-industrial"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49800,6 +50374,20 @@ cont {
 }
 cont {
   name: "landuse-industrial-mine"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49923,6 +50511,20 @@ cont {
 }
 cont {
   name: "landuse-landfill"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1780
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1780
+    }
+  }
   element {
     scale: 15
     area {
@@ -50605,6 +51207,20 @@ cont {
 }
 cont {
   name: "landuse-quarry"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -50728,6 +51344,20 @@ cont {
 }
 cont {
   name: "landuse-railway"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -52007,8 +52637,17 @@ cont {
 }
 cont {
   name: "leisure-dog_park"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52026,6 +52665,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52043,6 +52685,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52060,6 +52705,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52077,6 +52725,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52240,8 +52891,26 @@ cont {
 }
 cont {
   name: "leisure-fitness_station"
+  element {
+    scale: 15
+    area {
+      color: 2763300
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2763300
+      priority: -1920
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52259,6 +52928,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52276,6 +52949,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52293,6 +52970,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -54817,6 +55498,18 @@ cont {
 }
 cont {
   name: "leisure-resort"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
@@ -55044,6 +55737,20 @@ cont {
 }
 cont {
   name: "leisure-sports_centre"
+  element {
+    scale: 13
+    area {
+      color: 2171163
+      priority: -1810
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2171163
+      priority: -1810
+    }
+  }
   element {
     scale: 15
     area {
@@ -55218,6 +55925,10 @@ cont {
   name: "leisure-stadium"
   element {
     scale: 13
+    area {
+      color: 2500128
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -55235,6 +55946,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 2500128
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -55794,8 +56509,29 @@ cont {
 }
 cont {
   name: "leisure-water_park"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55813,6 +56549,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55830,6 +56569,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55847,6 +56589,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55864,6 +56609,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -58669,8 +59417,33 @@ cont {
 }
 cont {
   name: "man_made-works"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58678,6 +59451,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58694,6 +59471,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58710,6 +59491,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58726,6 +59511,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -66323,8 +67112,23 @@ cont {
 }
 cont {
   name: "office-diplomatic"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66341,6 +67145,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66357,6 +67164,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66373,6 +67183,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -74847,8 +75660,40 @@ cont {
 }
 cont {
   name: "power-generator"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74856,6 +75701,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74863,6 +75712,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74870,6 +75723,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74878,8 +75735,40 @@ cont {
 }
 cont {
   name: "power-generator-gas"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74887,6 +75776,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74894,6 +75787,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74901,6 +75798,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74909,8 +75810,40 @@ cont {
 }
 cont {
   name: "power-generator-hydro"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74918,6 +75851,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74925,6 +75862,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74932,16 +75873,83 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
     }
   }
 }
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+}
 cont {
   name: "power-generator-wind"
   element {
     scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74949,6 +75957,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74956,6 +75968,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74963,6 +75979,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74979,6 +75999,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74995,6 +76019,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -75011,6 +76039,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -75027,6 +76059,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -75344,8 +76380,40 @@ cont {
 }
 cont {
   name: "power-plant"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75353,6 +76421,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75360,6 +76432,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75367,6 +76443,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75375,8 +76455,40 @@ cont {
 }
 cont {
   name: "power-plant-coal"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75384,6 +76496,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75391,6 +76507,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75398,6 +76518,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75406,8 +76530,40 @@ cont {
 }
 cont {
   name: "power-plant-gas"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75415,6 +76571,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75422,6 +76582,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75429,6 +76593,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75437,8 +76605,40 @@ cont {
 }
 cont {
   name: "power-plant-hydro"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75446,6 +76646,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75453,6 +76657,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75460,6 +76668,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75468,8 +76680,40 @@ cont {
 }
 cont {
   name: "power-plant-solar"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75477,6 +76721,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75484,6 +76732,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75491,6 +76743,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75501,6 +76757,10 @@ cont {
   name: "power-plant-wind"
   element {
     scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75508,6 +76768,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75515,6 +76779,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75522,6 +76790,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75538,6 +76810,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75554,6 +76830,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75570,6 +76850,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75586,6 +76870,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75715,8 +77003,54 @@ cont {
 }
 cont {
   name: "power-substation"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -75733,6 +77067,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -130339,7 +131677,6 @@ cont {
   element {
     scale: 13
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130360,7 +131697,6 @@ cont {
   element {
     scale: 14
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130381,7 +131717,6 @@ cont {
   element {
     scale: 15
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130402,7 +131737,6 @@ cont {
   element {
     scale: 16
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130422,7 +131756,6 @@ cont {
   element {
     scale: 17
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130442,7 +131775,6 @@ cont {
   element {
     scale: 18
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130462,7 +131794,6 @@ cont {
   element {
     scale: 19
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130482,7 +131813,6 @@ cont {
   element {
     scale: 20
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 0807a7984..8f71318e1 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index abb5ffd63..6b9ae9c2b 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -4331,8 +4331,26 @@ cont {
 }
 cont {
   name: "amenity-car_wash"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4350,6 +4368,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4367,6 +4389,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4384,6 +4410,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4660,6 +4690,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4677,6 +4711,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4694,6 +4732,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4710,6 +4752,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4726,6 +4772,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4742,6 +4792,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4759,8 +4813,40 @@ cont {
 }
 cont {
   name: "amenity-childcare"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4777,6 +4863,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4793,6 +4883,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4809,6 +4903,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4893,8 +4991,40 @@ cont {
 }
 cont {
   name: "amenity-clinic"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4912,6 +5042,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4928,6 +5062,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4944,6 +5082,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4961,6 +5103,20 @@ cont {
 }
 cont {
   name: "amenity-college"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -5306,8 +5462,26 @@ cont {
 }
 cont {
   name: "amenity-courthouse"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5324,6 +5498,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5340,6 +5518,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5356,6 +5538,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5440,13 +5626,6 @@ cont {
 }
 cont {
   name: "amenity-doctors"
-  element {
-    scale: 14
-    area {
-      color: 16767702
-      priority: -1770
-    }
-  }
   element {
     scale: 15
     area {
@@ -6187,8 +6366,33 @@ cont {
 }
 cont {
   name: "amenity-fire_station"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6205,6 +6409,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6221,6 +6429,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6470,6 +6682,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6487,6 +6703,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6504,6 +6724,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6520,6 +6744,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6536,6 +6764,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6552,6 +6784,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6848,6 +7084,13 @@ cont {
 }
 cont {
   name: "amenity-hospital"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -7215,6 +7458,20 @@ cont {
 }
 cont {
   name: "amenity-kindergarten"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -7498,8 +7755,19 @@ cont {
 }
 cont {
   name: "amenity-marketplace"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7517,6 +7785,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7534,6 +7806,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7551,6 +7827,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7568,6 +7848,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -9812,6 +10096,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9962,6 +10253,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10112,6 +10410,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10262,6 +10567,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10412,6 +10724,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-mormon"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10562,6 +10881,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10712,6 +11038,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10862,6 +11195,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11012,6 +11352,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11162,6 +11509,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11312,6 +11666,13 @@ cont {
 }
 cont {
   name: "amenity-police"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
     area {
@@ -11910,8 +12271,26 @@ cont {
 }
 cont {
   name: "amenity-recycling-centre"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11919,6 +12298,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11926,6 +12309,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11942,6 +12329,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12218,6 +12609,20 @@ cont {
 }
 cont {
   name: "amenity-school"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -12925,8 +13330,26 @@ cont {
 }
 cont {
   name: "amenity-social_facility"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12943,6 +13366,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12959,6 +13386,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12975,6 +13406,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13544,6 +13979,13 @@ cont {
 }
 cont {
   name: "amenity-university"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -13746,8 +14188,19 @@ cont {
 }
 cont {
   name: "amenity-vehicle_inspection"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13764,6 +14217,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13781,6 +14238,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13798,6 +14259,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13815,6 +14280,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14653,8 +15122,40 @@ cont {
 }
 cont {
   name: "amenity-waste_transfer_station"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14662,6 +15163,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14669,6 +15174,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14685,6 +15194,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -21395,6 +21908,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-s"
       priority: 3900
@@ -21411,6 +21928,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21427,6 +21948,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21443,6 +21968,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21459,6 +21988,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21475,6 +22008,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21491,6 +22028,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21507,6 +22048,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -33428,8 +33973,19 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33437,6 +33993,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33454,6 +34014,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33470,6 +34034,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33486,6 +34054,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33502,6 +34074,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33518,6 +34094,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -36002,8 +36582,19 @@ cont {
 }
 cont {
   name: "highway-services"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-s"
       priority: 4250
@@ -36021,6 +36612,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36038,6 +36633,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36054,6 +36653,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36070,6 +36673,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36086,6 +36693,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36102,6 +36713,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -47668,6 +48283,20 @@ cont {
 }
 cont {
   name: "landuse-construction"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47755,6 +48384,20 @@ cont {
 }
 cont {
   name: "landuse-education"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
   element {
     scale: 15
     area {
@@ -49406,46 +50049,60 @@ cont {
 }
 cont {
   name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 16
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 17
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 18
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 19
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 20
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
 }
@@ -49524,6 +50181,20 @@ cont {
 }
 cont {
   name: "landuse-industrial"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49611,6 +50282,20 @@ cont {
 }
 cont {
   name: "landuse-industrial-mine"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49734,6 +50419,20 @@ cont {
 }
 cont {
   name: "landuse-landfill"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
   element {
     scale: 15
     area {
@@ -50416,6 +51115,20 @@ cont {
 }
 cont {
   name: "landuse-quarry"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -50539,6 +51252,20 @@ cont {
 }
 cont {
   name: "landuse-railway"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -51818,8 +52545,19 @@ cont {
 }
 cont {
   name: "leisure-dog_park"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -51837,6 +52575,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -51854,6 +52596,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -51871,6 +52617,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -51888,6 +52638,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52051,8 +52805,26 @@ cont {
 }
 cont {
   name: "leisure-fitness_station"
+  element {
+    scale: 15
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52070,6 +52842,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52087,6 +52863,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52104,6 +52884,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -54628,6 +55412,20 @@ cont {
 }
 cont {
   name: "leisure-resort"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
@@ -54861,6 +55659,20 @@ cont {
 }
 cont {
   name: "leisure-sports_centre"
+  element {
+    scale: 13
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
   element {
     scale: 15
     area {
@@ -55035,6 +55847,10 @@ cont {
   name: "leisure-stadium"
   element {
     scale: 13
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -55052,6 +55868,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -55611,8 +56431,33 @@ cont {
 }
 cont {
   name: "leisure-water_park"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55630,6 +56475,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55647,6 +56496,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55664,6 +56517,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55681,6 +56538,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -58504,8 +59365,33 @@ cont {
 }
 cont {
   name: "man_made-works"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58513,6 +59399,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58529,6 +59419,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58545,6 +59439,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58561,6 +59459,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -66178,8 +67080,26 @@ cont {
 }
 cont {
   name: "office-diplomatic"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66196,6 +67116,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66212,6 +67136,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66228,6 +67156,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -74713,8 +75645,40 @@ cont {
 }
 cont {
   name: "power-generator"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74722,6 +75686,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74729,6 +75697,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74736,6 +75708,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74744,8 +75720,40 @@ cont {
 }
 cont {
   name: "power-generator-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74753,6 +75761,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74760,6 +75772,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74767,6 +75783,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74775,8 +75795,40 @@ cont {
 }
 cont {
   name: "power-generator-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74784,6 +75836,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74791,6 +75847,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74798,16 +75858,83 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
     }
   }
 }
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+}
 cont {
   name: "power-generator-wind"
   element {
     scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74815,6 +75942,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74822,6 +75953,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74829,6 +75964,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74845,6 +75984,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74861,6 +76004,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74877,6 +76024,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74893,6 +76044,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -75210,8 +76365,40 @@ cont {
 }
 cont {
   name: "power-plant"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75219,6 +76406,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75226,6 +76417,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75233,6 +76428,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75241,8 +76440,40 @@ cont {
 }
 cont {
   name: "power-plant-coal"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75250,6 +76481,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75257,6 +76492,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75264,6 +76503,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75272,8 +76515,40 @@ cont {
 }
 cont {
   name: "power-plant-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75281,6 +76556,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75288,6 +76567,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75295,6 +76578,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75303,8 +76590,40 @@ cont {
 }
 cont {
   name: "power-plant-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75312,6 +76631,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75319,6 +76642,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75326,6 +76653,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75334,8 +76665,40 @@ cont {
 }
 cont {
   name: "power-plant-solar"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75343,6 +76706,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75350,6 +76717,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75357,6 +76728,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75367,6 +76742,10 @@ cont {
   name: "power-plant-wind"
   element {
     scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75374,6 +76753,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75381,6 +76764,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75388,6 +76775,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75404,6 +76795,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75420,6 +76815,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75436,6 +76835,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75452,6 +76855,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75581,8 +76988,54 @@ cont {
 }
 cont {
   name: "power-substation"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -75599,6 +77052,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -130205,7 +131662,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130226,7 +131683,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130247,7 +131704,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130268,7 +131725,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130288,7 +131745,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130308,7 +131765,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130328,7 +131785,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130348,7 +131805,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 262274f1c..ff0724db1 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 45730b3cd..fc7ac6484 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -5738,6 +5738,51 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-waste_transfer_station"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "amenity-water_point"
   element {
@@ -28725,51 +28770,6 @@ cont {
     apply_if: "!name"
   }
 }
-cont {
-  name: "landuse-garages"
-  element {
-    scale: 15
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-}
 cont {
   name: "landuse-grass"
   element {
@@ -32450,6 +32450,51 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-works"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "natural-bare_rock"
   element {
@@ -43165,6 +43210,546 @@ cont {
     }
   }
 }
+cont {
+  name: "power-generator"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-gas"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-hydro"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-coal"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-gas"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-hydro"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-solar"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-wind"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-substation"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "railway-abandoned"
   element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index 9de3261d6..d44f0c902 100644
Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ
diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index 950991951..5e70f3a75 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -5738,6 +5738,51 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-waste_transfer_station"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "amenity-water_point"
   element {
@@ -28185,51 +28230,6 @@ cont {
     apply_if: "!name"
   }
 }
-cont {
-  name: "landuse-garages"
-  element {
-    scale: 15
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-}
 cont {
   name: "landuse-grass"
   element {
@@ -31910,6 +31910,51 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-works"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "natural-bare_rock"
   element {
@@ -42625,6 +42670,546 @@ cont {
     }
   }
 }
+cont {
+  name: "power-generator"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-gas"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-hydro"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-coal"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-gas"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-hydro"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-solar"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-wind"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-substation"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "railway-abandoned"
   element {
diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
index 539532f03..df59ece0e 100644
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -14,34 +14,34 @@
 # - BG-top: water (linear and areal)
 # - BG-by-size: landcover areas sorted by their size
 
-leisure-stadium                                     # area z15- (also has icon z13-, caption(optional) z13-)
+leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
 === 250
 
-amenity-place_of_worship                            # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-buddhist                   # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian                  # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-mormon           # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-hindu                      # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-jewish                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-muslim                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-shinto                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-taoist                     # area z14- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
 === 240
 
-amenity-doctors                                     # area z14- (also has icon z17-, caption(optional) z17-)
+amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
 leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
 leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
 === 230
 
-landuse-landfill                                    # area z15- (also has icon z15-, caption(optional) z15-)
+landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
 === 220
 
 leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
 === 200
 
 amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre                               # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-sports_centre                               # area z13- (also has icon z17-, caption(optional) z17-)
 === 190
 
 amenity-grave_yard                                  # area z14- (also has icon z17-, caption(optional) z17-)
@@ -50,26 +50,26 @@ landuse-cemetery                                    # area z14- (also has icon z
 landuse-cemetery-christian                          # area z14- (also has icon z15-, caption(optional) z15-)
 === 180
 
-amenity-courthouse
-amenity-car_wash
-amenity-fire_station
-amenity-marketplace
-amenity-police                                      # area z16- (also has icon z17-, caption(optional) z17-)
-amenity-recycling-centre
-amenity-social_facility
-amenity-vehicle_inspection
-amenity-charging_station-motorcar
-amenity-fuel
-emergency-mountain_rescue
-highway-services
-highway-rest_area
+amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-fire_station                                # area z15- (also has icon z18-, caption(optional) z18-)
+amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-police                                      # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z19-)
+amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
+emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
-landuse-garages
-leisure-dog_park
-leisure-resort                                      # area z15- (also has icon z16-, caption(optional) z16-)
-leisure-water_park
-office-diplomatic
-tourism-camp_site                                   # area z15- (also has icon z16-, caption(optional) z16-)
+highway-rest_area                                   # area z13- (also has icon z15-, caption(optional) z15-)
+highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-garages                                     # area z13-
+leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
+leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
+office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
+tourism-camp_site                                   # area z13- (also has icon z16-, caption(optional) z16-)
 === 170
 
 highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
@@ -130,7 +130,7 @@ landuse-orchard                                     # area z12- (also has captio
 landuse-recreation_ground                           # area z12- (also has caption z15-)
 landuse-village_green                               # area z12-
 landuse-vineyard                                    # area z12- (also has caption z15-)
-leisure-fitness_station
+leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
 leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
 natural-bare_rock                                   # area z11- (also has caption z14-)
 natural-scree                                       # area z11-
@@ -152,40 +152,40 @@ landuse-forest-deciduous                            # area z10- (also has icon z
 landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
 === 60
 
-amenity-waste_transfer_station
+amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z19-)
 landuse-churchyard                                  # area z15-
-landuse-construction                                # area z15- (also has caption z15-)
-landuse-industrial                                  # area z15- (also has caption z15-)
-landuse-industrial-mine                             # area z15- (also has icon z15-, caption(optional) z15-)
-landuse-quarry                                      # area z15- (also has icon z15-, caption(optional) z15-)
-landuse-railway                                     # area z15- (also has caption z15-)
-man_made-works
-power-plant
-power-plant-coal
-power-plant-gas
-power-plant-hydro
-power-plant-solar
-power-plant-wind
-power-substation
-power-generator
-power-generator-gas
-power-generator-hydro
-power-generator-solar
-power-generator-wind
+landuse-construction                                # area z13- (also has caption z15-)
+landuse-industrial                                  # area z13- (also has caption z15-)
+landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-railway                                     # area z13- (also has caption z15-)
+man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
+power-generator                                     # area z13- (also has icon z17-)
+power-generator-gas                                 # area z13- (also has icon z17-)
+power-generator-hydro                               # area z13- (also has icon z17-)
+power-generator-solar                               # area z13-
+power-generator-wind                                # area z13- (also has icon z15-, caption(optional) z18-)
+power-plant                                         # area z13- (also has icon z17-)
+power-plant-coal                                    # area z13- (also has icon z17-)
+power-plant-gas                                     # area z13- (also has icon z17-)
+power-plant-hydro                                   # area z13- (also has icon z17-)
+power-plant-solar                                   # area z13- (also has icon z17-)
+power-plant-wind                                    # area z13- (also has icon z15-, caption(optional) z16-)
+power-substation                                    # area z13- (also has icon z19-, caption(optional) z19-)
 === 50
 
-amenity-college                                     # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-clinic
-amenity-childcare
-amenity-hospital                                    # area z14- (also has icon z14-, caption(optional) z15-)
-amenity-kindergarten                                # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-school                                      # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-university                                  # area z14- (also has icon z14-, caption(optional) z14-)
+amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
+amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-school                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
 === 40
 
 aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
 aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
-landuse-education                                   # area z15-
+landuse-education                                   # area z13-
 leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
 natural-beach                                       # area z10- (also has caption z15-)
 natural-beach-gravel                                # area z10- (also has caption z15-)
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 96e9ba50e..1c000e9f1 100644
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -414,7 +414,7 @@ piste:type-sled                                     # line z14- (also has pathte
 === 120
 
 building:part                                       # area z16-
-landuse-garages                                     # area z15-
+landuse-garages                                     # area z13-
 === 110
 
 barrier-retaining_wall                              # line z16-
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 2a9eb75d2..b7092661d 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -314,7 +314,7 @@ amenity-theatre                                     # icon z14- (also has captio
 historic-battlefield                                # icon z15- (also has caption(optional) z15-)
 historic-city_gate                                  # icon z13- (also has caption(optional) z13-)
 historic-memorial-war_memorial                      # icon z15- (also has caption(optional) z15-)
-leisure-water_park                                  # icon z16- (also has caption(optional) z16-)
+leisure-water_park                                  # icon z16- (also has caption(optional) z16-, area z13-)
 shop-mall                                           # icon z14- (also has caption(optional) z14-)
 tourism-aquarium                                    # icon z16- (also has caption(optional) z16-)
 tourism-museum                                      # icon z13- (also has caption(optional) z13-)
@@ -322,9 +322,9 @@ tourism-theme_park                                  # icon z14- (also has captio
 tourism-zoo                                         # icon z13- (also has caption(optional) z13-)
 === 5200
 
-amenity-hospital                                    # icon z14- (also has caption(optional) z15-, area z14-)
-amenity-university                                  # icon z14- (also has caption(optional) z14-, area z14-)
-leisure-stadium                                     # icon z13- (also has caption(optional) z13-, area z15-)
+amenity-hospital                                    # icon z14- (also has caption(optional) z15-, area z13-)
+amenity-university                                  # icon z14- (also has caption(optional) z14-, area z13-)
+leisure-stadium                                     # icon z13- (also has caption(optional) z13-, area z13-)
 === 5100
 
 leisure-marina                                      # icon z16- (also has caption(optional) z16-)
@@ -370,25 +370,25 @@ tourism-attraction                                  # icon z14- (also has captio
 tourism-gallery                                     # icon z15- (also has caption(optional) z15-)
 === 4300
 
-amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-)
-amenity-fuel                                        # icon z14- (also has caption(optional) z14-)
+amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
+amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
 === 4270
 
-highway-services                                    # icon z14- (also has caption(optional) z14-)
+highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
 === 4250
 
-amenity-place_of_worship-buddhist                   # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian                  # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian-mormon           # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-hindu                      # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-jewish                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-muslim                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-shinto                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-taoist                     # icon z14- (also has caption(optional) z14-, area z14-)
+amenity-place_of_worship-buddhist                   # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian                  # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian-jehovahs_witness  # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian-mormon           # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-hindu                      # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-jewish                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-muslim                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-shinto                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-taoist                     # icon z14- (also has caption(optional) z14-, area z13-)
 === 4200
 
-amenity-place_of_worship                            # icon z14- (also has caption(optional) z14-, area z14-)
+amenity-place_of_worship                            # icon z14- (also has caption(optional) z14-, area z13-)
 historic-memorial                                   # icon z15- (also has caption(optional) z15-)
 === 4150
 
@@ -409,12 +409,12 @@ amenity-pub                                         # icon z15- (also has captio
 
 amenity-shelter-basic_hut                           # icon z16- (also has caption(optional) z16-)
 amenity-shelter-lean_to                             # icon z16- (also has caption(optional) z16-)
-emergency-mountain_rescue                           # icon z16- (also has caption(optional) z16-)
+emergency-mountain_rescue                           # icon z16- (also has caption(optional) z16-, area z13-)
 tourism-wilderness_hut                              # icon z16- (also has caption(optional) z16-)
 === 3900
 
-highway-rest_area                                   # icon z15- (also has caption(optional) z15-)
-tourism-camp_site                                   # icon z16- (also has caption(optional) z16-, area z15-)
+highway-rest_area                                   # icon z15- (also has caption(optional) z15-, area z13-)
+tourism-camp_site                                   # icon z16- (also has caption(optional) z16-, area z13-)
 tourism-caravan_site                                # icon z16- (also has caption(optional) z16-)
 tourism-chalet                                      # icon z16- (also has caption(optional) z16-)
 === 3800
@@ -747,14 +747,14 @@ piste:type-snow_park                                # caption z15- (also has are
 === 2770
 
 amenity-townhall                                    # icon z16- (also has caption(optional) z16-)
-leisure-resort                                      # icon z16- (also has caption(optional) z16-, area z15-)
+leisure-resort                                      # icon z16- (also has caption(optional) z16-, area z13-)
 tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
 === 2750
 
 amenity-arts_centre                                 # icon z17- (also has caption(optional) z17-)
 amenity-bank                                        # icon z16- (also has caption(optional) z16-)
 amenity-library                                     # icon z18- (also has caption(optional) z18-)
-amenity-marketplace                                 # icon z16- (also has caption(optional) z16-)
+amenity-marketplace                                 # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-pharmacy                                    # icon z16- (also has caption(optional) z17-)
 shop-convenience                                    # icon z16- (also has caption(optional) z16-)
 shop-deli                                           # icon z16- (also has caption(optional) z16-)
@@ -825,7 +825,7 @@ tourism-zoo-petting                                 # icon z15- (also has captio
 
 amenity-bureau_de_change                            # icon z17- (also has caption(optional) z18-)
 amenity-public_bath                                 # icon z17- (also has caption(optional) z17-)
-amenity-vehicle_inspection                          # icon z16- (also has caption(optional) z16-)
+amenity-vehicle_inspection                          # icon z16- (also has caption(optional) z16-, area z15-)
 craft-brewery                                       # icon z17- (also has caption(optional) z18-)
 craft-confectionery                                 # icon z17- (also has caption(optional) z18-)
 craft-winery                                        # icon z17- (also has caption(optional) z18-)
@@ -873,7 +873,7 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
-leisure-dog_park                                    # icon z16- (also has caption(optional) z16-)
+leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
 highway-busway                                      # pathtext z16- (also has line z15-)
@@ -881,9 +881,9 @@ highway-busway-bridge                               # pathtext z16- (also has li
 highway-busway-tunnel                               # pathtext z16- (also has line z15-)
 === 2250
 
-amenity-clinic                                      # icon z17- (also has caption(optional) z17-)
-amenity-college                                     # icon z16- (also has caption(optional) z16-, area z15-)
-amenity-courthouse                                  # icon z17- (also has caption(optional) z17-)
+amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-college                                     # icon z16- (also has caption(optional) z16-, area z13-)
+amenity-courthouse                                  # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-dentist                                     # icon z17- (also has caption(optional) z17-)
 landuse-military                                    # icon z16- (also has caption(optional) z17-, area z12-)
 landuse-military-danger_area                        # icon z16- (also has caption(optional) z17-, area z10-)
@@ -905,14 +905,14 @@ railway-level_crossing                              # icon z17-
 railway-platform                                    # caption z16- (also has area z16-)
 === 1650
 
-amenity-car_wash                                    # icon z17- (also has caption(optional) z17-)
-amenity-childcare                                   # icon z17- (also has caption(optional) z17-)
-amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z14-)
+amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-driving_school                              # icon z17- (also has caption(optional) z19-)
 amenity-language_school                             # icon z17- (also has caption(optional) z19-)
 amenity-money_transfer                              # icon z17- (also has caption(optional) z18-)
 amenity-music_school                                # icon z17- (also has caption(optional) z19-)
-amenity-recycling-centre                            # icon z17- (also has caption(optional) z19-)
+amenity-recycling-centre                            # icon z17- (also has caption(optional) z19-, area z15-)
 amenity-veterinary                                  # icon z16- (also has caption(optional) z16-)
 craft-electrician                                   # icon z17- (also has caption(optional) z18-)
 craft-electronics_repair                            # icon z17- (also has caption(optional) z18-)
@@ -984,8 +984,8 @@ shop-video_games                                    # icon z16- (also has captio
 === 1600
 
 aeroway-gate                                        # icon z17- (also has caption(optional) z17-)
-amenity-kindergarten                                # icon z17- (also has caption(optional) z17-, area z15-)
-amenity-school                                      # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-kindergarten                                # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-school                                      # icon z17- (also has caption(optional) z17-, area z13-)
 amenity-studio                                      # icon z16- (also has caption(optional) z16-)
 historic-archaeological_site                        # icon z17- (also has caption(optional) z17-)
 historic-boundary_stone                             # icon z16- (also has caption(optional) z16-)
@@ -1004,7 +1004,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 amenity-shelter                                     # icon z17- (also has caption(optional) z17-)
 amenity-shelter-public_transport                    # icon z17- (also has caption(optional) z17-)
 emergency-lifeguard                                 # icon z17- (also has caption(optional) z18-)
-leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
+leisure-fitness_station                             # icon z17- (also has caption(optional) z17-, area z15-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z15-)
 natural-cliff                                       # pathtext z16- (also has line z14-)
 === 1500
@@ -1057,7 +1057,7 @@ isoline-step_50                                     # pathtext z16- (also has li
 landuse-recreation_ground                           # caption z15- (also has area z12-)
 leisure-dance                                       # icon z17- (also has caption(optional) z17-)
 leisure-recreation_ground                           # caption z17-
-leisure-sports_centre                               # icon z17- (also has caption(optional) z17-, area z15-)
+leisure-sports_centre                               # icon z17- (also has caption(optional) z17-, area z13-)
 leisure-sports_hall                                 # icon z17- (also has caption(optional) z17-)
 === 1250
 
@@ -1084,8 +1084,8 @@ amenity-grave_yard                                  # icon z17- (also has captio
 amenity-grave_yard-christian                        # icon z17- (also has caption(optional) z17-, area z14-)
 amenity-nursing_home                                # icon z17- (also has caption(optional) z17-)
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
-amenity-social_facility                             # icon z17- (also has caption(optional) z17-)
-amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-)
+amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-, area z13-)
 highway-ladder                                      # icon z17- (also has caption(optional) z17-)
 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 landuse-farmland                                    # caption z15- (also has area z10-)
@@ -1106,18 +1106,18 @@ junction-circular                                   # caption z17-
 junction-roundabout                                 # caption z17-
 man_made-breakwater                                 # caption z17- (also has line z14-, area z12-)
 man_made-pier                                       # caption z17- (also has line z14-, area z12-)
-man_made-works                                      # icon z16- (also has caption(optional) z17-)
+man_made-works                                      # icon z16- (also has caption(optional) z17-, area z13-)
 public_transport-platform                           # caption z17- (also has area z16-)
 waterway-lock_gate                                  # icon z16-
 === 700
 
 amenity-brothel                                     # icon z18- (also has caption(optional) z18-)
 amenity-casino                                      # icon z17- (also has caption(optional) z17-)
-amenity-fire_station                                # icon z18- (also has caption(optional) z18-)
+amenity-fire_station                                # icon z18- (also has caption(optional) z18-, area z15-)
 amenity-gambling                                    # icon z17- (also has caption(optional) z17-)
 amenity-internet_cafe                               # icon z18- (also has caption(optional) z19-)
 amenity-love_hotel                                  # icon z18- (also has caption(optional) z18-)
-amenity-police                                      # icon z17- (also has caption(optional) z17-, area z16-)
+amenity-police                                      # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-stripclub                                   # icon z18- (also has caption(optional) z18-)
 craft                                               # icon z18- (also has caption(optional) z18-)
 craft-beekeeper                                     # icon z17- (also has caption(optional) z18-)
@@ -1141,7 +1141,7 @@ healthcare-speech_therapist                         # icon z17- (also has captio
 leisure-adult_gaming_centre                         # icon z17- (also has caption(optional) z17-)
 leisure-amusement_arcade                            # icon z17- (also has caption(optional) z17-)
 office-company                                      # icon z18- (also has caption(optional) z18-)
-office-diplomatic                                   # icon z17- (also has caption(optional) z17-)
+office-diplomatic                                   # icon z17- (also has caption(optional) z17-, area z15-)
 office-ngo                                          # icon z18- (also has caption(optional) z18-)
 office-telecommunication                            # icon z18- (also has caption(optional) z18-)
 shop-agrarian                                       # icon z18- (also has caption(optional) z18-)
@@ -1207,12 +1207,12 @@ emergency-emergency_ward_entrance                   # icon z18- (also has captio
 building                                            # caption z16- (also has area z14-)
 building-garage                                     # caption z16- (also has area z14-)
 building-has_parts                                  # caption z16- (also has area z14-)
-power-plant                                         # icon z17-
-power-plant-coal                                    # icon z17-
-power-plant-gas                                     # icon z17-
-power-plant-hydro                                   # icon z17-
-power-plant-solar                                   # icon z17-
-power-plant-wind                                    # icon z15- (also has caption(optional) z16-)
+power-plant                                         # icon z17- (also has area z13-)
+power-plant-coal                                    # icon z17- (also has area z13-)
+power-plant-gas                                     # icon z17- (also has area z13-)
+power-plant-hydro                                   # icon z17- (also has area z13-)
+power-plant-solar                                   # icon z17- (also has area z13-)
+power-plant-wind                                    # icon z15- (also has caption(optional) z16-, area z13-)
 power-station                                       # icon z17- (also has caption(optional) z17-)
 === 230
 
@@ -1241,23 +1241,23 @@ amenity-parking-street_side-fee                     # icon z18- (also has captio
 === 150
 
 landuse-commercial                                  # caption z17-
-landuse-construction                                # caption z15- (also has area z15-)
+landuse-construction                                # caption z15- (also has area z13-)
 landuse-farmyard                                    # caption z15- (also has area z10-)
-landuse-industrial                                  # caption z15- (also has area z15-)
-landuse-industrial-mine                             # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-landfill                                    # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-quarry                                      # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-railway                                     # caption z15- (also has area z15-)
+landuse-industrial                                  # caption z15- (also has area z13-)
+landuse-industrial-mine                             # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-landfill                                    # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-quarry                                      # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-railway                                     # caption z15- (also has area z13-)
 landuse-residential                                 # caption z17-
 leisure-common                                      # caption z17-
 leisure-slipway                                     # caption z17-
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
 man_made-petroleum_well                             # icon z17- (also has caption(optional) z18-)
-power-generator                                     # icon z17-
-power-generator-gas                                 # icon z17-
-power-generator-hydro                               # icon z17-
-power-generator-wind                                # icon z15- (also has caption(optional) z18-)
+power-generator                                     # icon z17- (also has area z13-)
+power-generator-gas                                 # icon z17- (also has area z13-)
+power-generator-hydro                               # icon z17- (also has area z13-)
+power-generator-wind                                # icon z15- (also has caption(optional) z18-, area z13-)
 === 120
 
 amenity-parking-lane-private                        # icon z19- (also has caption(optional) z19-, area z17-)
@@ -1462,7 +1462,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-battlefield                              # caption(optional) z15- (also has icon z15-)
 # historic-city_gate                                # caption(optional) z13- (also has icon z13-)
 # historic-memorial-war_memorial                    # caption(optional) z15- (also has icon z15-)
-# leisure-water_park                                # caption(optional) z16- (also has icon z16-)
+# leisure-water_park                                # caption(optional) z16- (also has icon z16-, area z13-)
 # shop-mall                                         # caption(optional) z14- (also has icon z14-)
 # tourism-aquarium                                  # caption(optional) z16- (also has icon z16-)
 # tourism-museum                                    # caption(optional) z13- (also has icon z13-)
@@ -1470,9 +1470,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-zoo                                       # caption(optional) z13- (also has icon z13-)
 # === -4800
 
-# amenity-hospital                                  # caption(optional) z15- (also has icon z14-, area z14-)
-# amenity-university                                # caption(optional) z14- (also has icon z14-, area z14-)
-# leisure-stadium                                   # caption(optional) z13- (also has icon z13-, area z15-)
+# amenity-hospital                                  # caption(optional) z15- (also has icon z14-, area z13-)
+# amenity-university                                # caption(optional) z14- (also has icon z14-, area z13-)
+# leisure-stadium                                   # caption(optional) z13- (also has icon z13-, area z13-)
 # === -4900
 
 # leisure-marina                                    # caption(optional) z16- (also has icon z16-)
@@ -1516,25 +1516,25 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-gallery                                   # caption(optional) z15- (also has icon z15-)
 # === -5700
 
-# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-)
-# amenity-fuel                                      # caption(optional) z14- (also has icon z14-)
+# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
+# amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
 # === -5730
 
-# highway-services                                  # caption(optional) z14- (also has icon z14-)
+# highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5750
 
-# amenity-place_of_worship-buddhist                 # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian                # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian-jehovahs_witness  # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian-mormon         # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-hindu                    # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-jewish                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-muslim                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-shinto                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-taoist                   # caption(optional) z14- (also has icon z14-, area z14-)
+# amenity-place_of_worship-buddhist                 # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian                # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian-jehovahs_witness  # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian-mormon         # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-hindu                    # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-jewish                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-muslim                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-shinto                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-taoist                   # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5800
 
-# amenity-place_of_worship                          # caption(optional) z14- (also has icon z14-, area z14-)
+# amenity-place_of_worship                          # caption(optional) z14- (also has icon z14-, area z13-)
 # historic-memorial                                 # caption(optional) z15- (also has icon z15-)
 # === -5850
 
@@ -1555,12 +1555,12 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-shelter-basic_hut                         # caption(optional) z16- (also has icon z16-)
 # amenity-shelter-lean_to                           # caption(optional) z16- (also has icon z16-)
-# emergency-mountain_rescue                         # caption(optional) z16- (also has icon z16-)
+# emergency-mountain_rescue                         # caption(optional) z16- (also has icon z16-, area z13-)
 # tourism-wilderness_hut                            # caption(optional) z16- (also has icon z16-)
 # === -6100
 
-# highway-rest_area                                 # caption(optional) z15- (also has icon z15-)
-# tourism-camp_site                                 # caption(optional) z16- (also has icon z16-, area z15-)
+# highway-rest_area                                 # caption(optional) z15- (also has icon z15-, area z13-)
+# tourism-camp_site                                 # caption(optional) z16- (also has icon z16-, area z13-)
 # tourism-caravan_site                              # caption(optional) z16- (also has icon z16-)
 # tourism-chalet                                    # caption(optional) z16- (also has icon z16-)
 # === -6200
@@ -1719,14 +1719,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -7150
 
 # amenity-townhall                                  # caption(optional) z16- (also has icon z16-)
-# leisure-resort                                    # caption(optional) z16- (also has icon z16-, area z15-)
+# leisure-resort                                    # caption(optional) z16- (also has icon z16-, area z13-)
 # tourism-hotel                                     # caption(optional) z16- (also has icon z16-)
 # === -7250
 
 # amenity-arts_centre                               # caption(optional) z17- (also has icon z17-)
 # amenity-bank                                      # caption(optional) z16- (also has icon z16-)
 # amenity-library                                   # caption(optional) z18- (also has icon z18-)
-# amenity-marketplace                               # caption(optional) z16- (also has icon z16-)
+# amenity-marketplace                               # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-pharmacy                                  # caption(optional) z17- (also has icon z16-)
 # shop-convenience                                  # caption(optional) z16- (also has icon z16-)
 # shop-deli                                         # caption(optional) z16- (also has icon z16-)
@@ -1793,7 +1793,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-bureau_de_change                          # caption(optional) z18- (also has icon z17-)
 # amenity-public_bath                               # caption(optional) z17- (also has icon z17-)
-# amenity-vehicle_inspection                        # caption(optional) z16- (also has icon z16-)
+# amenity-vehicle_inspection                        # caption(optional) z16- (also has icon z16-, area z15-)
 # craft-brewery                                     # caption(optional) z18- (also has icon z17-)
 # craft-confectionery                               # caption(optional) z18- (also has icon z17-)
 # craft-winery                                      # caption(optional) z18- (also has icon z17-)
@@ -1841,12 +1841,12 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
-# leisure-dog_park                                  # caption(optional) z16- (also has icon z16-)
+# leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700
 
-# amenity-clinic                                    # caption(optional) z17- (also has icon z17-)
-# amenity-college                                   # caption(optional) z16- (also has icon z16-, area z15-)
-# amenity-courthouse                                # caption(optional) z17- (also has icon z17-)
+# amenity-clinic                                    # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-college                                   # caption(optional) z16- (also has icon z16-, area z13-)
+# amenity-courthouse                                # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-dentist                                   # caption(optional) z17- (also has icon z17-)
 # landuse-military                                  # caption(optional) z17- (also has icon z16-, area z12-)
 # landuse-military-danger_area                      # caption(optional) z17- (also has icon z16-, area z10-)
@@ -1858,14 +1858,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-picnic_site                               # caption(optional) z16- (also has icon z16-)
 # === -8200
 
-# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-)
-# amenity-childcare                                 # caption(optional) z17- (also has icon z17-)
-# amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z14-)
+# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-driving_school                            # caption(optional) z19- (also has icon z17-)
 # amenity-language_school                           # caption(optional) z19- (also has icon z17-)
 # amenity-money_transfer                            # caption(optional) z18- (also has icon z17-)
 # amenity-music_school                              # caption(optional) z19- (also has icon z17-)
-# amenity-recycling-centre                          # caption(optional) z19- (also has icon z17-)
+# amenity-recycling-centre                          # caption(optional) z19- (also has icon z17-, area z15-)
 # amenity-veterinary                                # caption(optional) z16- (also has icon z16-)
 # craft-electrician                                 # caption(optional) z18- (also has icon z17-)
 # craft-electronics_repair                          # caption(optional) z18- (also has icon z17-)
@@ -1937,8 +1937,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -8400
 
 # aeroway-gate                                      # caption(optional) z17- (also has icon z17-)
-# amenity-kindergarten                              # caption(optional) z17- (also has icon z17-, area z15-)
-# amenity-school                                    # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-kindergarten                              # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-school                                    # caption(optional) z17- (also has icon z17-, area z13-)
 # amenity-studio                                    # caption(optional) z16- (also has icon z16-)
 # historic-archaeological_site                      # caption(optional) z17- (also has icon z17-)
 # historic-boundary_stone                           # caption(optional) z16- (also has icon z16-)
@@ -1957,7 +1957,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-shelter                                   # caption(optional) z17- (also has icon z17-)
 # amenity-shelter-public_transport                  # caption(optional) z17- (also has icon z17-)
 # emergency-lifeguard                               # caption(optional) z18- (also has icon z17-)
-# leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
+# leisure-fitness_station                           # caption(optional) z17- (also has icon z17-, area z15-)
 # leisure-playground                                # caption(optional) z17- (also has icon z17-, area z15-)
 # === -8500
 
@@ -2006,7 +2006,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-atm                                       # caption(optional) z18- (also has icon z18-)
 # amenity-dojo                                      # caption(optional) z18- (also has icon z17-)
 # leisure-dance                                     # caption(optional) z17- (also has icon z17-)
-# leisure-sports_centre                             # caption(optional) z17- (also has icon z17-, area z15-)
+# leisure-sports_centre                             # caption(optional) z17- (also has icon z17-, area z13-)
 # leisure-sports_hall                               # caption(optional) z17- (also has icon z17-)
 # === -8750
 
@@ -2028,8 +2028,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-grave_yard-christian                      # caption(optional) z17- (also has icon z17-, area z14-)
 # amenity-nursing_home                              # caption(optional) z17- (also has icon z17-)
 # amenity-prison                                    # caption(optional) z17- (also has icon z17-, area z12-)
-# amenity-social_facility                           # caption(optional) z17- (also has icon z17-)
-# amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-)
+# amenity-social_facility                           # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-, area z13-)
 # highway-ladder                                    # caption(optional) z17- (also has icon z17-)
 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
@@ -2041,16 +2041,16 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-tower-communication                      # caption(optional) z18- (also has icon z16-)
 # === -9150
 
-# man_made-works                                    # caption(optional) z17- (also has icon z16-)
+# man_made-works                                    # caption(optional) z17- (also has icon z16-, area z13-)
 # === -9300
 
 # amenity-brothel                                   # caption(optional) z18- (also has icon z18-)
 # amenity-casino                                    # caption(optional) z17- (also has icon z17-)
-# amenity-fire_station                              # caption(optional) z18- (also has icon z18-)
+# amenity-fire_station                              # caption(optional) z18- (also has icon z18-, area z15-)
 # amenity-gambling                                  # caption(optional) z17- (also has icon z17-)
 # amenity-internet_cafe                             # caption(optional) z19- (also has icon z18-)
 # amenity-love_hotel                                # caption(optional) z18- (also has icon z18-)
-# amenity-police                                    # caption(optional) z17- (also has icon z17-, area z16-)
+# amenity-police                                    # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-stripclub                                 # caption(optional) z18- (also has icon z18-)
 # craft                                             # caption(optional) z18- (also has icon z18-)
 # craft-beekeeper                                   # caption(optional) z18- (also has icon z17-)
@@ -2074,7 +2074,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-adult_gaming_centre                       # caption(optional) z17- (also has icon z17-)
 # leisure-amusement_arcade                          # caption(optional) z17- (also has icon z17-)
 # office-company                                    # caption(optional) z18- (also has icon z18-)
-# office-diplomatic                                 # caption(optional) z17- (also has icon z17-)
+# office-diplomatic                                 # caption(optional) z17- (also has icon z17-, area z15-)
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
 # shop-agrarian                                     # caption(optional) z18- (also has icon z18-)
@@ -2133,7 +2133,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z18-)
 # === -9750
 
-# power-plant-wind                                  # caption(optional) z16- (also has icon z15-)
+# power-plant-wind                                  # caption(optional) z16- (also has icon z15-, area z13-)
 # power-station                                     # caption(optional) z17- (also has icon z17-)
 # === -9770
 
@@ -2158,11 +2158,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-parking-street_side-fee                   # caption(optional) z18- (also has icon z18-, area z17-)
 # === -9850
 
-# landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z15-)
-# landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z15-)
-# landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z15-)
+# landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z13-)
+# landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z13-)
+# landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z13-)
 # man_made-petroleum_well                           # caption(optional) z18- (also has icon z17-)
-# power-generator-wind                              # caption(optional) z18- (also has icon z15-)
+# power-generator-wind                              # caption(optional) z18- (also has icon z15-, area z13-)
 # === -9880
 
 # amenity-parking-lane-private                      # caption(optional) z19- (also has icon z19-, area z17-)
@@ -2215,7 +2215,7 @@ emergency-phone                                     # icon z17-
 
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
-power-substation                                    # icon z19- (also has caption(optional) z19-)
+power-substation                                    # icon z19- (also has caption(optional) z19-, area z13-)
 === -9990
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2242,7 +2242,7 @@ entrance-exit                                       # icon z19- (also has captio
 # entrance-exit                                     # caption(optional) z19- (also has icon z19-)
 # man_made-cairn                                    # caption(optional) z19- (also has icon z19-)
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
-# power-substation                                  # caption(optional) z19- (also has icon z19-)
+# power-substation                                  # caption(optional) z19- (also has icon z19-, area z13-)
 # tourism-information                               # caption(optional) z16- (also has icon z16-)
 # tourism-information-board                         # caption(optional) z16- (also has icon z16-)
 # tourism-information-guidepost                     # caption(optional) z16- (also has icon z16-)
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 73dfd81c5..0e03901dd 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -14,34 +14,34 @@
 # - BG-top: water (linear and areal)
 # - BG-by-size: landcover areas sorted by their size
 
-leisure-stadium                                     # area z15- (also has icon z13-, caption(optional) z13-)
+leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
 === 250
 
-amenity-place_of_worship                            # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-buddhist                   # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian                  # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-mormon           # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-hindu                      # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-jewish                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-muslim                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-shinto                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-taoist                     # area z14- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
 === 240
 
-amenity-doctors                                     # area z14- (also has icon z17-, caption(optional) z17-)
+amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
 leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
 leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
 === 230
 
-landuse-landfill                                    # area z15- (also has icon z15-, caption(optional) z15-)
+landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
 === 220
 
 leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
 === 200
 
 amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre                               # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-sports_centre                               # area z13- (also has icon z17-, caption(optional) z17-)
 === 190
 
 amenity-grave_yard                                  # area z14- (also has icon z17-, caption(optional) z17-)
@@ -50,25 +50,25 @@ landuse-cemetery                                    # area z14- (also has icon z
 landuse-cemetery-christian                          # area z14- (also has icon z15-, caption(optional) z15-)
 === 180
 
-amenity-courthouse
-amenity-car_wash
-amenity-fire_station
-amenity-marketplace
-amenity-police                                      # area z16- (also has icon z17-, caption(optional) z17-)
-amenity-recycling-centre
-amenity-social_facility
-amenity-vehicle_inspection
-amenity-charging_station-motorcar
-amenity-fuel
-emergency-mountain_rescue
-highway-services
-highway-rest_area
+amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-fire_station                                # area z15- (also has icon z18-, caption(optional) z18-)
+amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-police                                      # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z19-)
+amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
+emergency-mountain_rescue                           # area z13- (also has icon z12-, caption(optional) z12-)
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
-landuse-garages
-leisure-dog_park
-leisure-resort                                      # area z15- (also has icon z16-, caption(optional) z16-)
-leisure-water_park
-office-diplomatic
+highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z15-)
+highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-garages                                     # area z13-
+leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
+leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
+office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
 tourism-camp_site                                   # area z13- (also has icon z13-, caption(optional) z13-)
 === 170
 
@@ -130,7 +130,7 @@ landuse-orchard                                     # area z12- (also has captio
 landuse-recreation_ground                           # area z12- (also has caption z15-)
 landuse-village_green                               # area z12-
 landuse-vineyard                                    # area z12- (also has caption z15-)
-leisure-fitness_station
+leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
 leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
 natural-bare_rock                                   # area z11- (also has caption z13-)
 natural-scree                                       # area z11-
@@ -152,40 +152,40 @@ landuse-forest-deciduous                            # area z10- (also has icon z
 landuse-forest-mixed                                # area z10- (also has icon z12-, caption(optional) z13-)
 === 60
 
-amenity-waste_transfer_station
+amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z19-)
 landuse-churchyard                                  # area z15-
-landuse-construction                                # area z15- (also has caption z15-)
-landuse-industrial                                  # area z15- (also has caption z15-)
-landuse-industrial-mine                             # area z15- (also has icon z15-, caption(optional) z15-)
-landuse-quarry                                      # area z15- (also has icon z15-, caption(optional) z15-)
-landuse-railway                                     # area z15- (also has caption z15-)
-man_made-works
-power-plant
-power-plant-coal
-power-plant-gas
-power-plant-hydro
-power-plant-solar
-power-plant-wind
-power-substation
-power-generator
-power-generator-gas
-power-generator-hydro
-power-generator-solar
-power-generator-wind
+landuse-construction                                # area z13- (also has caption z15-)
+landuse-industrial                                  # area z13- (also has caption z15-)
+landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-railway                                     # area z13- (also has caption z15-)
+man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
+power-generator                                     # area z13- (also has icon z17-)
+power-generator-gas                                 # area z13- (also has icon z17-)
+power-generator-hydro                               # area z13- (also has icon z17-)
+power-generator-solar                               # area z13-
+power-generator-wind                                # area z13- (also has icon z13-, caption(optional) z16-)
+power-plant                                         # area z13- (also has icon z17-)
+power-plant-coal                                    # area z13- (also has icon z17-)
+power-plant-gas                                     # area z13- (also has icon z17-)
+power-plant-hydro                                   # area z13- (also has icon z17-)
+power-plant-solar                                   # area z13- (also has icon z17-)
+power-plant-wind                                    # area z13- (also has icon z13-, caption(optional) z16-)
+power-substation                                    # area z13- (also has icon z19-, caption(optional) z19-)
 === 50
 
-amenity-college                                     # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-clinic
-amenity-childcare
-amenity-hospital                                    # area z14- (also has icon z14-, caption(optional) z15-)
-amenity-kindergarten                                # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-school                                      # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-university                                  # area z14- (also has icon z14-, caption(optional) z14-)
+amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
+amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-school                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
 === 40
 
 aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
 aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
-landuse-education                                   # area z15-
+landuse-education                                   # area z13-
 leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
 natural-beach                                       # area z10- (also has caption z14-)
 natural-beach-gravel                                # area z10- (also has caption z14-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 7e5f6b0b1..618259b3d 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -314,7 +314,7 @@ amenity-theatre                                     # icon z14- (also has captio
 historic-battlefield                                # icon z15- (also has caption(optional) z15-)
 historic-city_gate                                  # icon z13- (also has caption(optional) z13-)
 historic-memorial-war_memorial                      # icon z15- (also has caption(optional) z15-)
-leisure-water_park                                  # icon z16- (also has caption(optional) z16-)
+leisure-water_park                                  # icon z16- (also has caption(optional) z16-, area z13-)
 shop-mall                                           # icon z14- (also has caption(optional) z14-)
 tourism-aquarium                                    # icon z16- (also has caption(optional) z16-)
 tourism-museum                                      # icon z13- (also has caption(optional) z13-)
@@ -322,9 +322,9 @@ tourism-theme_park                                  # icon z14- (also has captio
 tourism-zoo                                         # icon z13- (also has caption(optional) z13-)
 === 5200
 
-amenity-hospital                                    # icon z14- (also has caption(optional) z15-, area z14-)
-amenity-university                                  # icon z14- (also has caption(optional) z14-, area z14-)
-leisure-stadium                                     # icon z13- (also has caption(optional) z13-, area z15-)
+amenity-hospital                                    # icon z14- (also has caption(optional) z15-, area z13-)
+amenity-university                                  # icon z14- (also has caption(optional) z14-, area z13-)
+leisure-stadium                                     # icon z13- (also has caption(optional) z13-, area z13-)
 === 5100
 
 leisure-marina                                      # icon z16- (also has caption(optional) z16-)
@@ -370,25 +370,25 @@ tourism-attraction                                  # icon z14- (also has captio
 tourism-gallery                                     # icon z15- (also has caption(optional) z15-)
 === 4300
 
-amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-)
-amenity-fuel                                        # icon z14- (also has caption(optional) z14-)
+amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
+amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
 === 4270
 
-highway-services                                    # icon z14- (also has caption(optional) z14-)
+highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
 === 4250
 
-amenity-place_of_worship-buddhist                   # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian                  # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian-mormon           # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-hindu                      # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-jewish                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-muslim                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-shinto                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-taoist                     # icon z14- (also has caption(optional) z14-, area z14-)
+amenity-place_of_worship-buddhist                   # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian                  # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian-jehovahs_witness  # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian-mormon           # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-hindu                      # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-jewish                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-muslim                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-shinto                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-taoist                     # icon z14- (also has caption(optional) z14-, area z13-)
 === 4200
 
-amenity-place_of_worship                            # icon z14- (also has caption(optional) z14-, area z14-)
+amenity-place_of_worship                            # icon z14- (also has caption(optional) z14-, area z13-)
 historic-memorial                                   # icon z15- (also has caption(optional) z15-)
 === 4150
 
@@ -409,11 +409,11 @@ amenity-pub                                         # icon z15- (also has captio
 
 amenity-shelter-basic_hut                           # icon z12- (also has caption(optional) z13-)
 amenity-shelter-lean_to                             # icon z12- (also has caption(optional) z13-)
-emergency-mountain_rescue                           # icon z12- (also has caption(optional) z12-)
+emergency-mountain_rescue                           # icon z12- (also has caption(optional) z12-, area z13-)
 tourism-wilderness_hut                              # icon z12- (also has caption(optional) z13-)
 === 3900
 
-highway-rest_area                                   # icon z14- (also has caption(optional) z15-)
+highway-rest_area                                   # icon z14- (also has caption(optional) z15-, area z13-)
 tourism-camp_site                                   # icon z13- (also has caption(optional) z13-, area z13-)
 tourism-caravan_site                                # icon z13- (also has caption(optional) z13-)
 tourism-chalet                                      # icon z14- (also has caption(optional) z14-)
@@ -747,14 +747,14 @@ piste:type-snow_park                                # caption z15- (also has are
 === 2770
 
 amenity-townhall                                    # icon z16- (also has caption(optional) z16-)
-leisure-resort                                      # icon z16- (also has caption(optional) z16-, area z15-)
+leisure-resort                                      # icon z16- (also has caption(optional) z16-, area z13-)
 tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
 === 2750
 
 amenity-arts_centre                                 # icon z17- (also has caption(optional) z17-)
 amenity-bank                                        # icon z16- (also has caption(optional) z16-)
 amenity-library                                     # icon z18- (also has caption(optional) z18-)
-amenity-marketplace                                 # icon z16- (also has caption(optional) z16-)
+amenity-marketplace                                 # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-pharmacy                                    # icon z16- (also has caption(optional) z17-)
 shop-convenience                                    # icon z16- (also has caption(optional) z16-)
 shop-deli                                           # icon z16- (also has caption(optional) z16-)
@@ -825,7 +825,7 @@ tourism-zoo-petting                                 # icon z15- (also has captio
 
 amenity-bureau_de_change                            # icon z17- (also has caption(optional) z18-)
 amenity-public_bath                                 # icon z17- (also has caption(optional) z17-)
-amenity-vehicle_inspection                          # icon z16- (also has caption(optional) z16-)
+amenity-vehicle_inspection                          # icon z16- (also has caption(optional) z16-, area z15-)
 craft-brewery                                       # icon z17- (also has caption(optional) z18-)
 craft-confectionery                                 # icon z17- (also has caption(optional) z18-)
 craft-winery                                        # icon z17- (also has caption(optional) z18-)
@@ -873,7 +873,7 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
-leisure-dog_park                                    # icon z16- (also has caption(optional) z16-)
+leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
 highway-busway                                      # pathtext z16- (also has line z15-)
@@ -881,9 +881,9 @@ highway-busway-bridge                               # pathtext z16- (also has li
 highway-busway-tunnel                               # pathtext z16- (also has line z15-)
 === 2250
 
-amenity-clinic                                      # icon z17- (also has caption(optional) z17-)
-amenity-college                                     # icon z16- (also has caption(optional) z16-, area z15-)
-amenity-courthouse                                  # icon z17- (also has caption(optional) z17-)
+amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-college                                     # icon z16- (also has caption(optional) z16-, area z13-)
+amenity-courthouse                                  # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-dentist                                     # icon z17- (also has caption(optional) z17-)
 landuse-military                                    # icon z16- (also has caption(optional) z17-, area z12-)
 landuse-military-danger_area                        # icon z16- (also has caption(optional) z17-, area z10-)
@@ -905,14 +905,14 @@ railway-level_crossing                              # icon z17-
 railway-platform                                    # caption z16- (also has area z16-)
 === 1650
 
-amenity-car_wash                                    # icon z17- (also has caption(optional) z17-)
-amenity-childcare                                   # icon z17- (also has caption(optional) z17-)
-amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z14-)
+amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-driving_school                              # icon z17- (also has caption(optional) z19-)
 amenity-language_school                             # icon z17- (also has caption(optional) z19-)
 amenity-money_transfer                              # icon z17- (also has caption(optional) z18-)
 amenity-music_school                                # icon z17- (also has caption(optional) z19-)
-amenity-recycling-centre                            # icon z17- (also has caption(optional) z19-)
+amenity-recycling-centre                            # icon z17- (also has caption(optional) z19-, area z15-)
 amenity-veterinary                                  # icon z16- (also has caption(optional) z16-)
 craft-electrician                                   # icon z17- (also has caption(optional) z18-)
 craft-electronics_repair                            # icon z17- (also has caption(optional) z18-)
@@ -984,8 +984,8 @@ shop-video_games                                    # icon z16- (also has captio
 === 1600
 
 aeroway-gate                                        # icon z17- (also has caption(optional) z17-)
-amenity-kindergarten                                # icon z17- (also has caption(optional) z17-, area z15-)
-amenity-school                                      # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-kindergarten                                # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-school                                      # icon z17- (also has caption(optional) z17-, area z13-)
 amenity-studio                                      # icon z16- (also has caption(optional) z16-)
 historic-archaeological_site                        # icon z17- (also has caption(optional) z17-)
 historic-boundary_stone                             # icon z16- (also has caption(optional) z16-)
@@ -1004,7 +1004,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 amenity-shelter                                     # icon z12- (also has caption(optional) z13-)
 amenity-shelter-public_transport                    # icon z14- (also has caption(optional) z14-)
 emergency-lifeguard                                 # icon z14- (also has caption(optional) z18-)
-leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
+leisure-fitness_station                             # icon z17- (also has caption(optional) z17-, area z15-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z15-)
 natural-cliff                                       # pathtext z14- (also has line z12-)
 === 1500
@@ -1057,7 +1057,7 @@ isoline-step_50                                     # pathtext z15- (also has li
 landuse-recreation_ground                           # caption z15- (also has area z12-)
 leisure-dance                                       # icon z17- (also has caption(optional) z17-)
 leisure-recreation_ground                           # caption z17-
-leisure-sports_centre                               # icon z17- (also has caption(optional) z17-, area z15-)
+leisure-sports_centre                               # icon z17- (also has caption(optional) z17-, area z13-)
 leisure-sports_hall                                 # icon z17- (also has caption(optional) z17-)
 === 1250
 
@@ -1085,8 +1085,8 @@ amenity-grave_yard                                  # icon z17- (also has captio
 amenity-grave_yard-christian                        # icon z17- (also has caption(optional) z17-, area z14-)
 amenity-nursing_home                                # icon z17- (also has caption(optional) z17-)
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
-amenity-social_facility                             # icon z17- (also has caption(optional) z17-)
-amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-)
+amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-, area z13-)
 highway-ladder                                      # icon z16- (also has caption(optional) z17-)
 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 landuse-farmland                                    # caption z15- (also has area z10-)
@@ -1107,18 +1107,18 @@ junction-circular                                   # caption z17-
 junction-roundabout                                 # caption z17-
 man_made-breakwater                                 # caption z17- (also has line z14-, area z12-)
 man_made-pier                                       # caption z17- (also has line z14-, area z12-)
-man_made-works                                      # icon z16- (also has caption(optional) z17-)
+man_made-works                                      # icon z16- (also has caption(optional) z17-, area z13-)
 public_transport-platform                           # caption z17- (also has area z16-)
 waterway-lock_gate                                  # icon z16-
 === 700
 
 amenity-brothel                                     # icon z18- (also has caption(optional) z18-)
 amenity-casino                                      # icon z17- (also has caption(optional) z17-)
-amenity-fire_station                                # icon z18- (also has caption(optional) z18-)
+amenity-fire_station                                # icon z18- (also has caption(optional) z18-, area z15-)
 amenity-gambling                                    # icon z17- (also has caption(optional) z17-)
 amenity-internet_cafe                               # icon z18- (also has caption(optional) z19-)
 amenity-love_hotel                                  # icon z18- (also has caption(optional) z18-)
-amenity-police                                      # icon z17- (also has caption(optional) z17-, area z16-)
+amenity-police                                      # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-stripclub                                   # icon z18- (also has caption(optional) z18-)
 craft                                               # icon z18- (also has caption(optional) z18-)
 craft-beekeeper                                     # icon z17- (also has caption(optional) z18-)
@@ -1142,7 +1142,7 @@ healthcare-speech_therapist                         # icon z17- (also has captio
 leisure-adult_gaming_centre                         # icon z17- (also has caption(optional) z17-)
 leisure-amusement_arcade                            # icon z17- (also has caption(optional) z17-)
 office-company                                      # icon z18- (also has caption(optional) z18-)
-office-diplomatic                                   # icon z17- (also has caption(optional) z17-)
+office-diplomatic                                   # icon z17- (also has caption(optional) z17-, area z15-)
 office-ngo                                          # icon z18- (also has caption(optional) z18-)
 office-telecommunication                            # icon z18- (also has caption(optional) z18-)
 shop-agrarian                                       # icon z18- (also has caption(optional) z18-)
@@ -1209,12 +1209,12 @@ building                                            # caption z16- (also has are
 building-garage                                     # caption z16- (also has area z14-)
 building-has_parts                                  # caption z16- (also has area z14-)
 man_made-utility_pole                               # icon z15-
-power-plant                                         # icon z17-
-power-plant-coal                                    # icon z17-
-power-plant-gas                                     # icon z17-
-power-plant-hydro                                   # icon z17-
-power-plant-solar                                   # icon z17-
-power-plant-wind                                    # icon z13- (also has caption(optional) z16-)
+power-plant                                         # icon z17- (also has area z13-)
+power-plant-coal                                    # icon z17- (also has area z13-)
+power-plant-gas                                     # icon z17- (also has area z13-)
+power-plant-hydro                                   # icon z17- (also has area z13-)
+power-plant-solar                                   # icon z17- (also has area z13-)
+power-plant-wind                                    # icon z13- (also has caption(optional) z16-, area z13-)
 power-pole                                          # icon z15-
 power-station                                       # icon z17- (also has caption(optional) z17-)
 === 230
@@ -1244,23 +1244,23 @@ amenity-parking-street_side-fee                     # icon z18- (also has captio
 === 150
 
 landuse-commercial                                  # caption z17-
-landuse-construction                                # caption z15- (also has area z15-)
+landuse-construction                                # caption z15- (also has area z13-)
 landuse-farmyard                                    # caption z15- (also has area z10-)
-landuse-industrial                                  # caption z15- (also has area z15-)
-landuse-industrial-mine                             # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-landfill                                    # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-quarry                                      # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-railway                                     # caption z15- (also has area z15-)
+landuse-industrial                                  # caption z15- (also has area z13-)
+landuse-industrial-mine                             # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-landfill                                    # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-quarry                                      # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-railway                                     # caption z15- (also has area z13-)
 landuse-residential                                 # caption z17-
 leisure-common                                      # caption z17-
 leisure-slipway                                     # caption z17-
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
 man_made-petroleum_well                             # icon z14- (also has caption(optional) z18-)
-power-generator                                     # icon z17-
-power-generator-gas                                 # icon z17-
-power-generator-hydro                               # icon z17-
-power-generator-wind                                # icon z13- (also has caption(optional) z16-)
+power-generator                                     # icon z17- (also has area z13-)
+power-generator-gas                                 # icon z17- (also has area z13-)
+power-generator-hydro                               # icon z17- (also has area z13-)
+power-generator-wind                                # icon z13- (also has caption(optional) z16-, area z13-)
 === 120
 
 amenity-parking-lane-private                        # icon z19- (also has caption(optional) z19-, area z17-)
@@ -1465,7 +1465,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-battlefield                              # caption(optional) z15- (also has icon z15-)
 # historic-city_gate                                # caption(optional) z13- (also has icon z13-)
 # historic-memorial-war_memorial                    # caption(optional) z15- (also has icon z15-)
-# leisure-water_park                                # caption(optional) z16- (also has icon z16-)
+# leisure-water_park                                # caption(optional) z16- (also has icon z16-, area z13-)
 # shop-mall                                         # caption(optional) z14- (also has icon z14-)
 # tourism-aquarium                                  # caption(optional) z16- (also has icon z16-)
 # tourism-museum                                    # caption(optional) z13- (also has icon z13-)
@@ -1473,9 +1473,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-zoo                                       # caption(optional) z13- (also has icon z13-)
 # === -4800
 
-# amenity-hospital                                  # caption(optional) z15- (also has icon z14-, area z14-)
-# amenity-university                                # caption(optional) z14- (also has icon z14-, area z14-)
-# leisure-stadium                                   # caption(optional) z13- (also has icon z13-, area z15-)
+# amenity-hospital                                  # caption(optional) z15- (also has icon z14-, area z13-)
+# amenity-university                                # caption(optional) z14- (also has icon z14-, area z13-)
+# leisure-stadium                                   # caption(optional) z13- (also has icon z13-, area z13-)
 # === -4900
 
 # leisure-marina                                    # caption(optional) z16- (also has icon z16-)
@@ -1519,25 +1519,25 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-gallery                                   # caption(optional) z15- (also has icon z15-)
 # === -5700
 
-# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-)
-# amenity-fuel                                      # caption(optional) z14- (also has icon z14-)
+# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
+# amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
 # === -5730
 
-# highway-services                                  # caption(optional) z14- (also has icon z14-)
+# highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5750
 
-# amenity-place_of_worship-buddhist                 # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian                # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian-jehovahs_witness  # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian-mormon         # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-hindu                    # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-jewish                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-muslim                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-shinto                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-taoist                   # caption(optional) z14- (also has icon z14-, area z14-)
+# amenity-place_of_worship-buddhist                 # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian                # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian-jehovahs_witness  # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian-mormon         # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-hindu                    # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-jewish                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-muslim                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-shinto                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-taoist                   # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5800
 
-# amenity-place_of_worship                          # caption(optional) z14- (also has icon z14-, area z14-)
+# amenity-place_of_worship                          # caption(optional) z14- (also has icon z14-, area z13-)
 # historic-memorial                                 # caption(optional) z15- (also has icon z15-)
 # === -5850
 
@@ -1558,11 +1558,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-shelter-basic_hut                         # caption(optional) z13- (also has icon z12-)
 # amenity-shelter-lean_to                           # caption(optional) z13- (also has icon z12-)
-# emergency-mountain_rescue                         # caption(optional) z12- (also has icon z12-)
+# emergency-mountain_rescue                         # caption(optional) z12- (also has icon z12-, area z13-)
 # tourism-wilderness_hut                            # caption(optional) z13- (also has icon z12-)
 # === -6100
 
-# highway-rest_area                                 # caption(optional) z15- (also has icon z14-)
+# highway-rest_area                                 # caption(optional) z15- (also has icon z14-, area z13-)
 # tourism-camp_site                                 # caption(optional) z13- (also has icon z13-, area z13-)
 # tourism-caravan_site                              # caption(optional) z13- (also has icon z13-)
 # tourism-chalet                                    # caption(optional) z14- (also has icon z14-)
@@ -1722,14 +1722,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -7150
 
 # amenity-townhall                                  # caption(optional) z16- (also has icon z16-)
-# leisure-resort                                    # caption(optional) z16- (also has icon z16-, area z15-)
+# leisure-resort                                    # caption(optional) z16- (also has icon z16-, area z13-)
 # tourism-hotel                                     # caption(optional) z16- (also has icon z16-)
 # === -7250
 
 # amenity-arts_centre                               # caption(optional) z17- (also has icon z17-)
 # amenity-bank                                      # caption(optional) z16- (also has icon z16-)
 # amenity-library                                   # caption(optional) z18- (also has icon z18-)
-# amenity-marketplace                               # caption(optional) z16- (also has icon z16-)
+# amenity-marketplace                               # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-pharmacy                                  # caption(optional) z17- (also has icon z16-)
 # shop-convenience                                  # caption(optional) z16- (also has icon z16-)
 # shop-deli                                         # caption(optional) z16- (also has icon z16-)
@@ -1796,7 +1796,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-bureau_de_change                          # caption(optional) z18- (also has icon z17-)
 # amenity-public_bath                               # caption(optional) z17- (also has icon z17-)
-# amenity-vehicle_inspection                        # caption(optional) z16- (also has icon z16-)
+# amenity-vehicle_inspection                        # caption(optional) z16- (also has icon z16-, area z15-)
 # craft-brewery                                     # caption(optional) z18- (also has icon z17-)
 # craft-confectionery                               # caption(optional) z18- (also has icon z17-)
 # craft-winery                                      # caption(optional) z18- (also has icon z17-)
@@ -1844,12 +1844,12 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
-# leisure-dog_park                                  # caption(optional) z16- (also has icon z16-)
+# leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700
 
-# amenity-clinic                                    # caption(optional) z17- (also has icon z17-)
-# amenity-college                                   # caption(optional) z16- (also has icon z16-, area z15-)
-# amenity-courthouse                                # caption(optional) z17- (also has icon z17-)
+# amenity-clinic                                    # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-college                                   # caption(optional) z16- (also has icon z16-, area z13-)
+# amenity-courthouse                                # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-dentist                                   # caption(optional) z17- (also has icon z17-)
 # landuse-military                                  # caption(optional) z17- (also has icon z16-, area z12-)
 # landuse-military-danger_area                      # caption(optional) z17- (also has icon z16-, area z10-)
@@ -1861,14 +1861,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-picnic_site                               # caption(optional) z14- (also has icon z14-)
 # === -8200
 
-# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-)
-# amenity-childcare                                 # caption(optional) z17- (also has icon z17-)
-# amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z14-)
+# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-driving_school                            # caption(optional) z19- (also has icon z17-)
 # amenity-language_school                           # caption(optional) z19- (also has icon z17-)
 # amenity-money_transfer                            # caption(optional) z18- (also has icon z17-)
 # amenity-music_school                              # caption(optional) z19- (also has icon z17-)
-# amenity-recycling-centre                          # caption(optional) z19- (also has icon z17-)
+# amenity-recycling-centre                          # caption(optional) z19- (also has icon z17-, area z15-)
 # amenity-veterinary                                # caption(optional) z16- (also has icon z16-)
 # craft-electrician                                 # caption(optional) z18- (also has icon z17-)
 # craft-electronics_repair                          # caption(optional) z18- (also has icon z17-)
@@ -1940,8 +1940,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -8400
 
 # aeroway-gate                                      # caption(optional) z17- (also has icon z17-)
-# amenity-kindergarten                              # caption(optional) z17- (also has icon z17-, area z15-)
-# amenity-school                                    # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-kindergarten                              # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-school                                    # caption(optional) z17- (also has icon z17-, area z13-)
 # amenity-studio                                    # caption(optional) z16- (also has icon z16-)
 # historic-archaeological_site                      # caption(optional) z17- (also has icon z17-)
 # historic-boundary_stone                           # caption(optional) z16- (also has icon z16-)
@@ -1960,7 +1960,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-shelter                                   # caption(optional) z13- (also has icon z12-)
 # amenity-shelter-public_transport                  # caption(optional) z14- (also has icon z14-)
 # emergency-lifeguard                               # caption(optional) z18- (also has icon z14-)
-# leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
+# leisure-fitness_station                           # caption(optional) z17- (also has icon z17-, area z15-)
 # leisure-playground                                # caption(optional) z17- (also has icon z17-, area z15-)
 # === -8500
 
@@ -2009,7 +2009,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-atm                                       # caption(optional) z18- (also has icon z18-)
 # amenity-dojo                                      # caption(optional) z18- (also has icon z17-)
 # leisure-dance                                     # caption(optional) z17- (also has icon z17-)
-# leisure-sports_centre                             # caption(optional) z17- (also has icon z17-, area z15-)
+# leisure-sports_centre                             # caption(optional) z17- (also has icon z17-, area z13-)
 # leisure-sports_hall                               # caption(optional) z17- (also has icon z17-)
 # === -8750
 
@@ -2031,8 +2031,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-grave_yard-christian                      # caption(optional) z17- (also has icon z17-, area z14-)
 # amenity-nursing_home                              # caption(optional) z17- (also has icon z17-)
 # amenity-prison                                    # caption(optional) z17- (also has icon z17-, area z12-)
-# amenity-social_facility                           # caption(optional) z17- (also has icon z17-)
-# amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-)
+# amenity-social_facility                           # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-, area z13-)
 # highway-ladder                                    # caption(optional) z17- (also has icon z16-)
 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
@@ -2045,16 +2045,16 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-tower-communication                      # caption(optional) z14- (also has icon z13-)
 # === -9150
 
-# man_made-works                                    # caption(optional) z17- (also has icon z16-)
+# man_made-works                                    # caption(optional) z17- (also has icon z16-, area z13-)
 # === -9300
 
 # amenity-brothel                                   # caption(optional) z18- (also has icon z18-)
 # amenity-casino                                    # caption(optional) z17- (also has icon z17-)
-# amenity-fire_station                              # caption(optional) z18- (also has icon z18-)
+# amenity-fire_station                              # caption(optional) z18- (also has icon z18-, area z15-)
 # amenity-gambling                                  # caption(optional) z17- (also has icon z17-)
 # amenity-internet_cafe                             # caption(optional) z19- (also has icon z18-)
 # amenity-love_hotel                                # caption(optional) z18- (also has icon z18-)
-# amenity-police                                    # caption(optional) z17- (also has icon z17-, area z16-)
+# amenity-police                                    # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-stripclub                                 # caption(optional) z18- (also has icon z18-)
 # craft                                             # caption(optional) z18- (also has icon z18-)
 # craft-beekeeper                                   # caption(optional) z18- (also has icon z17-)
@@ -2078,7 +2078,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-adult_gaming_centre                       # caption(optional) z17- (also has icon z17-)
 # leisure-amusement_arcade                          # caption(optional) z17- (also has icon z17-)
 # office-company                                    # caption(optional) z18- (also has icon z18-)
-# office-diplomatic                                 # caption(optional) z17- (also has icon z17-)
+# office-diplomatic                                 # caption(optional) z17- (also has icon z17-, area z15-)
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
 # shop-agrarian                                     # caption(optional) z18- (also has icon z18-)
@@ -2138,7 +2138,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z18-)
 # === -9750
 
-# power-plant-wind                                  # caption(optional) z16- (also has icon z13-)
+# power-plant-wind                                  # caption(optional) z16- (also has icon z13-, area z13-)
 # power-station                                     # caption(optional) z17- (also has icon z17-)
 # === -9770
 
@@ -2163,11 +2163,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-parking-street_side-fee                   # caption(optional) z18- (also has icon z18-, area z17-)
 # === -9850
 
-# landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z15-)
-# landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z15-)
-# landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z15-)
+# landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z13-)
+# landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z13-)
+# landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z13-)
 # man_made-petroleum_well                           # caption(optional) z18- (also has icon z14-)
-# power-generator-wind                              # caption(optional) z16- (also has icon z13-)
+# power-generator-wind                              # caption(optional) z16- (also has icon z13-, area z13-)
 # === -9880
 
 # amenity-parking-lane-private                      # caption(optional) z19- (also has icon z19-, area z17-)
@@ -2220,7 +2220,7 @@ emergency-phone                                     # icon z17-
 
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
-power-substation                                    # icon z19- (also has caption(optional) z19-)
+power-substation                                    # icon z19- (also has caption(optional) z19-, area z13-)
 === -9990
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2247,7 +2247,7 @@ entrance-exit                                       # icon z19- (also has captio
 # entrance-exit                                     # caption(optional) z19- (also has icon z19-)
 # man_made-cairn                                    # caption(optional) z17- (also has icon z17-)
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
-# power-substation                                  # caption(optional) z19- (also has icon z19-)
+# power-substation                                  # caption(optional) z19- (also has icon z19-, area z13-)
 # tourism-information                               # caption(optional) z15- (also has icon z15-)
 # tourism-information-board                         # caption(optional) z15- (also has icon z15-)
 # tourism-information-guidepost                     # caption(optional) z15- (also has icon z15-)
diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
index 2097bd478..bebfa2f86 100644
--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -86,7 +86,7 @@ landuse-forest-deciduous                            # area z10- (also has icon z
 landuse-forest-mixed                                # area z10- (also has icon z12-, caption(optional) z12-)
 === 50
 
-amenity-waste_transfer_station
+amenity-waste_transfer_station                      # area z15-
 landuse-churchyard                                  # area z15-
 landuse-construction                                # area z15-
 landuse-industrial                                  # area z15-
@@ -94,19 +94,19 @@ landuse-industrial-mine                             # area z15-
 landuse-landfill                                    # area z15- (also has caption z15-)
 landuse-quarry                                      # area z15- (also has caption z15-)
 landuse-railway                                     # area z15- (also has caption z15-)
-man_made-works
-power-plant
-power-plant-coal
-power-plant-gas
-power-plant-hydro
-power-plant-solar
-power-plant-wind
-power-substation
-power-generator
-power-generator-gas
-power-generator-hydro
-power-generator-solar
-power-generator-wind
+man_made-works                                      # area z15-
+power-generator                                     # area z15-
+power-generator-gas                                 # area z15-
+power-generator-hydro                               # area z15-
+power-generator-solar                               # area z15-
+power-generator-wind                                # area z15-
+power-plant                                         # area z15-
+power-plant-coal                                    # area z15-
+power-plant-gas                                     # area z15-
+power-plant-hydro                                   # area z15-
+power-plant-solar                                   # area z15-
+power-plant-wind                                    # area z15-
+power-substation                                    # area z15-
 === 40
 
 aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
diff --git a/data/visibility.txt b/data/visibility.txt
index c678a9ac5..86f0303fc 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -184,7 +184,7 @@ world  000000000000000000000  +
         veterinary  000000000000000000000  -
         waste_basket  000000000000000000000  -
         waste_disposal  000000000000000000000  -
-        waste_transfer_station  000000000000000000000  -
+        waste_transfer_station  000000000000000111111  -
         water_point  000000000000000011111  +
             drinking_water_no  000000000000000000111  -
             {}
@@ -633,7 +633,7 @@ world  000000000000000000000  +
             deciduous  000000000011111111111  -
             mixed  000000000011111111111  -
             {}
-        garages  000000000000000111111  -
+        garages  000000000000000000000  -
         grass  000000000000111111111  -
         greenfield  000000000000000000000  -
         greenhouse_horticulture  000000000000000000000  -
@@ -735,7 +735,7 @@ world  000000000000000000000  +
             drinking_water_no  000000000000000000000  -
             {}
         windmill  000000000000000000000  -
-        works  000000000000000000000  -
+        works  000000000000000111111  -
         {}
     mapswithme  000000000000000000000  +
         grid  000000000000000000000  -
@@ -875,24 +875,24 @@ world  000000000000000000000  +
         village  000000000001111111111  -
         {}
     power  000000000000000000000  +
-        generator  000000000000000000000  +
-            gas  000000000000000000000  -
-            hydro  000000000000000000000  -
-            solar  000000000000000000000  -
-            wind  000000000000000000000  -
+        generator  000000000000000111111  +
+            gas  000000000000000111111  -
+            hydro  000000000000000111111  -
+            solar  000000000000000111111  -
+            wind  000000000000000111111  -
             {}
         line  000000000000000000000  -
         minor_line  000000000000000000000  -
-        plant  000000000000000000000  +
-            coal  000000000000000000000  -
-            gas  000000000000000000000  -
-            hydro  000000000000000000000  -
-            solar  000000000000000000000  -
-            wind  000000000000000000000  -
+        plant  000000000000000111111  +
+            coal  000000000000000111111  -
+            gas  000000000000000111111  -
+            hydro  000000000000000111111  -
+            solar  000000000000000111111  -
+            wind  000000000000000111111  -
             {}
         pole  000000000000000000000  -
         station  000000000000000000000  -
-        substation  000000000000000000000  -
+        substation  000000000000000111111  -
         tower  000000000000000000000  -
         {}
     psurface  000000000000000000000  +