diff --git a/data/colors.txt b/data/colors.txt
index 1653682f1..24d1ef8fb 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -725,6 +725,7 @@
 3007930697
 3008054851
 3008113177
+3008787798
 3009559935
 3012069512
 3015998207
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 9a16fcc66..6546285d1 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 6165817e2..56e24ffa7 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -47366,7 +47366,7 @@ cont {
     scale: 13
     lines {
       width: 1.1
-      color: 3226034505
+      color: 3007930697
       priority: 60
       cap: BUTTCAP
     }
@@ -47375,7 +47375,7 @@ cont {
     scale: 14
     lines {
       width: 1.1
-      color: 3226034505
+      color: 3007930697
       priority: 60
       cap: BUTTCAP
     }
@@ -47570,7 +47570,7 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 1716085065
+      color: 2152292681
       priority: 60
     }
     path_text {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index fcd359141..d9cc14dff 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 71d0c275f..d4a6d5100 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -47260,7 +47260,7 @@ cont {
     scale: 13
     lines {
       width: 1.1
-      color: 3226891606
+      color: 3008787798
       priority: 60
       cap: BUTTCAP
     }
@@ -47269,7 +47269,7 @@ cont {
     scale: 14
     lines {
       width: 1.1
-      color: 3226891606
+      color: 3008787798
       priority: 60
       cap: BUTTCAP
     }
@@ -47464,7 +47464,7 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 1716085065
+      color: 2152292681
       priority: 60
     }
     path_text {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 71e23b4d2..da60f4779 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 74ff2c22b..88e561f53 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -1018,6 +1018,9 @@ cont {
   name: "amenity-car_wash"
   element {
     scale: 17
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-wash-m"
       priority: 2650
@@ -1035,6 +1038,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-wash-m"
       priority: 2650
@@ -1051,6 +1057,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-wash-m"
       priority: 2650
@@ -1067,6 +1076,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-wash-m"
       priority: 2650
@@ -1271,6 +1283,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1288,6 +1303,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1305,6 +1323,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1321,6 +1342,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1337,6 +1361,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1353,6 +1380,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1735,6 +1765,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -1752,6 +1785,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -1769,6 +1805,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -1785,6 +1824,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -1801,6 +1843,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -1817,6 +1862,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -5576,6 +5624,9 @@ cont {
   name: "amenity-vehicle_inspection"
   element {
     scale: 17
+    area {
+      priority: -1850
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2650
@@ -5584,6 +5635,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1850
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2650
@@ -5591,6 +5645,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1850
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2650
@@ -5598,6 +5655,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1850
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2650
@@ -15944,8 +16004,17 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 13
+    area {
+      priority: -1850
+    }
+  }
   element {
     scale: 14
+    area {
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -15963,6 +16032,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -15979,6 +16051,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -15995,6 +16070,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -16011,6 +16089,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -16027,6 +16108,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -16043,6 +16127,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -18645,6 +18732,9 @@ cont {
   }
   element {
     scale: 13
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18662,6 +18752,9 @@ cont {
   }
   element {
     scale: 14
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18679,6 +18772,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18696,6 +18792,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18713,6 +18812,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18729,6 +18831,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18745,6 +18850,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18761,6 +18869,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -28725,6 +28836,57 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      priority: -1850
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1850
+    }
+  }
+  element {
+    scale: 15
+    area {
+      priority: -1850
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1850
+    }
+  }
+  element {
+    scale: 17
+    area {
+      priority: -1850
+    }
+  }
+  element {
+    scale: 18
+    area {
+      priority: -1850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      priority: -1850
+    }
+  }
+  element {
+    scale: 20
+    area {
+      priority: -1850
+    }
+  }
+}
 cont {
   name: "landuse-grass"
   element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index 69e7966da..105b6d45f 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 fdd2a3d5f..d24e3eb5b 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -1018,6 +1018,10 @@ cont {
   name: "amenity-car_wash"
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-wash-m"
       priority: 2650
@@ -1035,6 +1039,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-wash-m"
       priority: 2650
@@ -1051,6 +1059,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-wash-m"
       priority: 2650
@@ -1067,6 +1079,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-wash-m"
       priority: 2650
@@ -1271,6 +1287,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1288,6 +1308,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1305,6 +1329,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1321,6 +1349,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1337,6 +1369,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1353,6 +1389,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "charging-station-m"
       priority: 3200
@@ -1735,6 +1775,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -1752,6 +1796,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -1769,6 +1817,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -1785,6 +1837,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -1801,6 +1857,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -1817,6 +1877,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "fuel-m"
       priority: 3200
@@ -5576,6 +5640,10 @@ cont {
   name: "amenity-vehicle_inspection"
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2650
@@ -5584,6 +5652,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2650
@@ -5591,6 +5663,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2650
@@ -5598,6 +5674,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2650
@@ -15638,8 +15718,19 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1850
+    }
+  }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -15657,6 +15748,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -15673,6 +15768,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -15689,6 +15788,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -15705,6 +15808,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -15721,6 +15828,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -15737,6 +15848,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "picnic-m"
       priority: 4150
@@ -18285,6 +18400,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18302,6 +18421,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18319,6 +18442,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18336,6 +18463,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18353,6 +18484,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18369,6 +18504,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18385,6 +18524,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -18401,6 +18544,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1850
+    }
     symbol {
       name: "car-repair-m"
       priority: 4200
@@ -28185,6 +28332,65 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1850
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1850
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1850
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1850
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1850
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16445409
+      priority: -1850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16445409
+      priority: -1850
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 16445409
+      priority: -1850
+    }
+  }
+}
 cont {
   name: "landuse-grass"
   element {
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 5e1d0a3ee..4b6ad4ee1 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
@@ -30,14 +30,14 @@ amenity-parking-street_side-fee                     # area z15- (also has icon z
 amenity-parking-street_side-private                 # area z15- (also has icon z17-, caption(optional) z17-)
 === 160
 
+amenity-car_wash                                    # area z17- (also has icon z17-, caption(optional) z17-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-fuel                                        # area z15- (also has icon z12-, caption(optional) z12-)
+amenity-vehicle_inspection                          # area z17- (also has icon z17-)
+highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z14-)
+highway-services                                    # area z13- (also has icon z12-, caption(optional) z13-)
+landuse-garages                                     # area z13-
 leisure-stadium                                     # area z15-
-highway-services
-highway-rest_area
-landuse-garages
-amenity-vehicle_inspection
-amenity-car_wash
-amenity-charging_station-motorcar
-amenity-fuel
 === 150
 
 amenity-grave_yard                                  # area z14-
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index 5943de823..582060cb4 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -62,11 +62,11 @@ highway-motorway_junction                           # caption z15-
 highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
 highway-primary_link-bridge                         # pathtext z11- (also has shield::shield z11-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-)
 highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
-highway-services                                    # icon z12- (also has caption(optional) z13-)
+highway-services                                    # icon z12- (also has caption(optional) z13-, area z13-)
 === 4200
 
 highway-ford                                        # icon z14-
-highway-rest_area                                   # icon z14- (also has caption(optional) z14-)
+highway-rest_area                                   # icon z14- (also has caption(optional) z14-, area z13-)
 highway-secondary                                   # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z14-)
 highway-secondary-bridge                            # pathtext z10- (also has shield::shield z12-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-)
 highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z14-)
@@ -170,8 +170,8 @@ aeroway-aerodrome-international                     # icon z7- (also has caption
 place-town                                          # caption z8-
 === 3250
 
-amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-)
-amenity-fuel                                        # icon z12- (also has caption(optional) z12-)
+amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
+amenity-fuel                                        # icon z12- (also has caption(optional) z12-, area z15-)
 === 3200
 
 amenity-charging_station                            # icon z16- (also has caption(optional) z16-)
@@ -216,8 +216,8 @@ barrier-lift_gate                                   # icon z16- (also has captio
 railway-level_crossing                              # icon z17-
 === 2700
 
-amenity-car_wash                                    # icon z17- (also has caption(optional) z17-)
-amenity-vehicle_inspection                          # icon z17-
+amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z17-)
+amenity-vehicle_inspection                          # icon z17- (also has area z17-)
 amenity-vending_machine-parking_tickets             # icon z17- (also has caption(optional) z17-)
 shop-car_parts                                      # icon z17-
 shop-car_repair                                     # icon z17-
@@ -754,17 +754,17 @@ entrance-main                                       # icon z18- (also has captio
 # They follow the order of their correspoding icons.
 #
 
-# highway-services                                  # caption(optional) z13- (also has icon z12-)
+# highway-services                                  # caption(optional) z13- (also has icon z12-, area z13-)
 # === -5800
 
-# highway-rest_area                                 # caption(optional) z14- (also has icon z14-)
+# highway-rest_area                                 # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5850
 
 # aeroway-aerodrome-international                   # caption(optional) z10- (also has icon z7-, area z10-)
 # === -6700
 
-# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-)
-# amenity-fuel                                      # caption(optional) z12- (also has icon z12-)
+# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
+# amenity-fuel                                      # caption(optional) z12- (also has icon z12-, area z15-)
 # === -6800
 
 # amenity-charging_station                          # caption(optional) z16- (also has icon z16-)
@@ -795,7 +795,7 @@ entrance-main                                       # icon z18- (also has captio
 # barrier-lift_gate                                 # caption(optional) z16- (also has icon z16-)
 # === -7250
 
-# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-)
+# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z17-)
 # amenity-vending_machine-parking_tickets           # caption(optional) z17- (also has icon z17-)
 # shop-car_repair-tyres                             # caption(optional) z15- (also has icon z15-)
 # === -7350
diff --git a/data/visibility.txt b/data/visibility.txt
index c931bfbbd..97b41e1ba 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -482,7 +482,7 @@ world  000000000000000000000  +
             bridge  000000000000111111111  -
             tunnel  000000000000111111111  -
             {}
-        rest_area  000000000000001111111  -
+        rest_area  000000000000011111111  -
         road  000000000000111111111  +
             bridge  000000000000111111111  -
             tunnel  000000000000111111111  -
@@ -632,7 +632,7 @@ world  000000000000000000000  +
             deciduous  000000000011111111111  -
             mixed  000000000011111111111  -
             {}
-        garages  000000000000000000000  -
+        garages  000000000000011111111  -
         grass  000000000000111111111  -
         greenfield  000000000000000000000  -
         greenhouse_horticulture  000000000000000000000  -