From f4dd133872c45dd46a301efa683f9bad33794a31 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 26 Jul 2025 17:49:53 +0700
Subject: [PATCH] [styles] Regenerate for generic amenities areas

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/drules_proto.bin                         | Bin 444711 -> 445512 bytes
 data/drules_proto.txt                         | 318 +++++++++++++++---
 data/drules_proto_default_dark.bin            | Bin 424298 -> 425036 bytes
 data/drules_proto_default_dark.txt            | 243 +++++++++++++
 data/drules_proto_default_light.bin           | Bin 427338 -> 428276 bytes
 data/drules_proto_default_light.txt           | 283 ++++++++++++++++
 data/drules_proto_outdoors_dark.bin           | Bin 444907 -> 445654 bytes
 data/drules_proto_outdoors_dark.txt           | 241 ++++++++++++-
 data/drules_proto_outdoors_light.bin          | Bin 448134 -> 449081 bytes
 data/drules_proto_outdoors_light.txt          | 281 +++++++++++++++-
 data/drules_proto_vehicle_dark.bin            | Bin 284466 -> 284598 bytes
 data/drules_proto_vehicle_dark.txt            |  52 +++
 data/drules_proto_vehicle_light.bin           | Bin 284739 -> 284891 bytes
 data/drules_proto_vehicle_light.txt           |  56 +++
 .../include/priorities_1_BG-by-size.prio.txt  |  16 +-
 .../include/priorities_4_overlays.prio.txt    |  30 +-
 .../include/priorities_1_BG-by-size.prio.txt  |  16 +-
 .../include/priorities_4_overlays.prio.txt    |  30 +-
 .../include/priorities_1_BG-by-size.prio.txt  |   4 +-
 .../include/priorities_4_overlays.prio.txt    |   4 +-
 20 files changed, 1481 insertions(+), 93 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 85749ed9b5af902bb4516c9e3c5f8c9dbdfeb3ca..59af042146e5d50e535c8d31379dbe735c454607 100644
GIT binary patch
delta 1020
zcmZ2JN&3VL=?#gx8c&(H#1nH<^D;{+b(1oaE0c3l;|mgtvNQA2g+w^`r35%0-ha(5
zF=cYTyC~z7$qHLUxu$&l4*`sm8+46D-8h8cs!(Jm@7ltRsaOQ7Vk2g*UgpW+dP+R#
zmMS2u6Y}E_#G<=K&sx+Et0N#X!Z`I{b4!h$)#d{IG7H8plb@%{;dPEDR_8con2CB~
zbq+)Zn{yyC*qq~-VY>N6#&0XBU(8%$u!t&3%u7!#iZ3onEXmBzo31;JO_$MqdgDz-
z(aB6pjDgI;X>3sD<ih=6)?^JkiODQW3?~;t>0Myjpt)}8_PV8vFZZcsatY-m=B1Pt
zr|Kr>=jNssC1)n)2=Q|WXmN9~b8rb9>6pkQQL()yg=wuA(?X`{+SN>Uj4B{oMW#o6
zV&Y@D#3rNyvKfgBv>k~zeZe6n5g{!;E=~?^uyGoU5+F^J6+EyBPggk1BqD&WeEXYf
zCOJ{2MyBaJ6Pbb;6{jamWD=QvJ%dSr8<aS1AKuR{aqh$P^BGJs>_{95Zcw<R2!Mhc
zNkFvy%tR(2W(HywAZFcuW+K};A*L4A>2sE_$ufI$@J>D$Bs|?{Ih#47_w<Fkfc`dI
z&Sn8*gF+rA4hniOdvd{k$?2xc*-U^6fF1`6Do%G;#wIqI>i}3r4#EpZ;)ybI&10E9
Wc^RAPbiHY8I@C3Ld;bcy843WcaGNp!

delta 597
zcmcJHIZFdU7>1ddbzIhCv$K<pL<|zpE|*D&y5d#Z#==g5#v^#3VkaV4*okBU6Mujv
zB0@lLtvs+%#E7+xt=K5o2%?TS5ky-DUY_TB`Mx>NHx{yurBpz90-A?i1w9IhsRla=
zL{Us7lBOgTY(v^6WS2od>JodwkS$0gO-Z`%3zyo#3cH^0p@dk|GjW9^#GViyY6U7Y
zGm+1R?(3Pb4K`WtmKVj<dUm`W6VxSLl7=LaG$pBEbk#06b^+WUxra0|m6{n{Tu28-
zW~Zmq^COd~DQ92|?pg2@@Rudn%`fuU;;vz2v5lk!C^LE}KU{~k{NV;_kWdyGq>gtP
z`rPmY@J<Gk{B0a!bbEHp`>K)24;a+@2~~;LrHZn;q5Sy%^?+#2KU?~{U9)pg1c@jj
zRgRs*WdffOuPNXr)S=e#xgu^CQeP3hBCd)U6(OJE=XXVHi3{_`M879D(q0kI?%<Yx
L`rj$-;(YT5Ylp%c

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index c5bf7f970..a413262af 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3539,8 +3539,26 @@ cont {
 }
 cont {
   name: "amenity-bicycle_parking"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3557,6 +3575,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3573,6 +3595,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3589,6 +3615,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3606,8 +3636,26 @@ cont {
 }
 cont {
   name: "amenity-bicycle_parking-covered"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3624,6 +3672,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3640,6 +3692,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3656,6 +3712,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -8060,8 +8120,26 @@ cont {
 }
 cont {
   name: "amenity-motorcycle_parking"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -8078,6 +8156,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -8094,6 +8176,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -8110,6 +8196,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -12499,24 +12589,25 @@ cont {
 cont {
   name: "amenity-ranger_station"
   element {
-    scale: 14
-    symbol {
-      name: "ranger-station-m"
-      priority: 4400
-      min_distance: 10
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5600
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12534,6 +12625,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12551,6 +12646,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12568,6 +12667,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12585,6 +12688,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12602,6 +12709,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -49032,6 +49143,16 @@ cont {
 }
 cont {
   name: "landuse-commercial"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
+  }
   element {
     scale: 17
     caption {
@@ -50769,6 +50890,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 16
@@ -50776,6 +50905,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 17
@@ -50783,6 +50920,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 18
@@ -50790,6 +50935,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 19
@@ -50797,6 +50950,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 20
@@ -50804,6 +50965,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
 }
 cont {
@@ -52542,6 +52711,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 17
@@ -52549,6 +52725,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 18
@@ -52556,6 +52739,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 19
@@ -52563,6 +52753,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 20
@@ -52570,6 +52767,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
 }
 cont {
@@ -133662,6 +133866,10 @@ cont {
   name: "tourism-information-office"
   element {
     scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133679,6 +133887,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133696,6 +133908,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133713,6 +133929,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133730,6 +133950,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133747,6 +133971,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133764,6 +133992,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133781,6 +134013,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133801,40 +134037,24 @@ cont {
   name: "tourism-information-visitor_centre"
   element {
     scale: 13
-    symbol {
-      name: "information-office-m"
-      priority: 4400
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5600
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 14
-    symbol {
-      name: "information-office-m"
-      priority: 4400
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5600
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133852,6 +134072,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133869,6 +134093,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133886,6 +134114,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133903,6 +134135,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133920,6 +134156,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 1992ca982302431fc8fbc23a3abd469a698f68d6..75c8ec97e2fa06c697d49a2f98ede282fdc4e928 100644
GIT binary patch
delta 1079
zcmaF$N%G7O$ql@^Ovjlf^Xp0(@pJG?aZ613_#Xloh4?uHPz4-01W^PgpVKuG6msMc
z!YV3^Ra69B)R^Tx6PNsCL0$35GJ2duxWW_N6&iZh0-orOfC!?w0V0Uz1Pwi_%`*BT
zW{lS+8>Y$;;Q$wO2mDPn6%=wocL7us%?VIZR5xt?o9b#Vb%~ivEHO7VFSDdlw<s|$
zJ+&ylxFoS8Ge2*-&MZb{0Vi+--GWEZ<b=5<KtWI>p$bk;wiTY7JlAmYatIAn1abwc
zBA_715h#Mj&CBL(Up9|1e~wxvmrzb(UP@_ks%~<AZf<H(a%N%<C`o8>bFp)93G~d|
z#3E6#UCWxuLyYm~^x{A!Q+9cX1E(+8%_PosiA_iz;x;5cDE-_5^Hag{pp=7fffgSZ
zCkHp!XbnaQumV(fV^M(W2XqD7d4re=M1bzAOJfS;Q2@G!pJU<-ABl4xrf;xk5(A0|
zVu%P~hzMhdh@gmwwwtFj0WmWWvurm{XU%`kbcT8Q3O_bk0XMWrn;sazW&spMjWw|7
z<ds`QriTWwnN0o&VaQF74`dUYY`GOI4COT<@kE)pzD?H%U{jl}JBv|?#&&IAAIP>_
F9RS<u$fE!N

delta 593
zcmX@}L-N%p$ql@^OdlC1^Xp16n{WtDeyD2<q=lfgFq9Sn(nhRYGnu&LCkyI|^XMk$
zm!%e^rU=;pwe;y*u>cuDForOUA+oto-_MM(Ve;KnIc9U9%KvGmEJEf$l|aUH8zDxH
z$;|17AQ6$x|I=K}<sLC{i6!Qy=4F;t>J}yDrKc9f7ndZKWaj4ynR4(?o;c5h*_1;7
zN((}1At)^jrA2_WakIpN?Gg(Z^XG_0a0%rk=B1Ptrve?Fo10pcoSB%jeXR|XhZy6`
z>ED8wOsC&n#3VTRfra2?gCId8ehwiiZi!nT|3d(y5I=`7x_}6Z!1fQpOa&s0JEkXQ
zFa>4^a|lTBb4;A!BXRBn+zeq3L2QCT*aU^K35s9{wnt|&0WmWWvuuyfWX*rh^p9!!
znE*CfW=jtK>5hSH7C?poj3EeP2u;5TkrIY6M5ZSOu~{&-O`jFSrbeFT?UO>-cBumZ
D#(dIC

diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index 3014def41..fca34e2cf 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -3507,8 +3507,23 @@ cont {
 }
 cont {
   name: "amenity-bicycle_parking"
+  element {
+    scale: 15
+    area {
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3525,6 +3540,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3541,6 +3559,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3557,6 +3578,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3574,8 +3598,23 @@ cont {
 }
 cont {
   name: "amenity-bicycle_parking-covered"
+  element {
+    scale: 15
+    area {
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3592,6 +3631,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3608,6 +3650,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3624,6 +3669,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -7866,8 +7914,23 @@ cont {
 }
 cont {
   name: "amenity-motorcycle_parking"
+  element {
+    scale: 15
+    area {
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -7884,6 +7947,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -7900,6 +7966,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -7916,6 +7985,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -12074,8 +12146,23 @@ cont {
 }
 cont {
   name: "amenity-ranger_station"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12093,6 +12180,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12110,6 +12200,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12127,6 +12220,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12144,6 +12240,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12161,6 +12260,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -45842,6 +45944,16 @@ cont {
 }
 cont {
   name: "landuse-commercial"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
+  }
   element {
     scale: 17
     caption {
@@ -47576,36 +47688,84 @@ cont {
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 16
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 17
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 18
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 19
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 20
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
 }
 cont {
@@ -49336,6 +49496,13 @@ cont {
       color: 1248273
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
   }
   element {
     scale: 17
@@ -49343,6 +49510,13 @@ cont {
       color: 1248273
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
   }
   element {
     scale: 18
@@ -49350,6 +49524,13 @@ cont {
       color: 1248273
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
   }
   element {
     scale: 19
@@ -49357,6 +49538,13 @@ cont {
       color: 1248273
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
   }
   element {
     scale: 20
@@ -49364,6 +49552,13 @@ cont {
       color: 1248273
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
   }
 }
 cont {
@@ -127565,6 +127760,9 @@ cont {
   name: "tourism-information-office"
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127582,6 +127780,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127599,6 +127800,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127616,6 +127820,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127633,6 +127840,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127650,6 +127860,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127668,8 +127881,23 @@ cont {
 }
 cont {
   name: "tourism-information-visitor_centre"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127687,6 +127915,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127704,6 +127935,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127721,6 +127955,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127738,6 +127975,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127755,6 +127995,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index e3641662b79725d3842ad0a767c616ea9c3d228e..98f5c142284ffc95212ba48e3489e6d4d6efba3b 100644
GIT binary patch
delta 1005
zcmX@rCG};Z)COK%rl(Ak`E{juL^$}R1UMevf6Xp2WwO47DC3mLhVG(VQ$GHO0LIDZ
zbdAJ>+&F~b$}psaaZ8C{l`>}OW#*EfET}6!Sw@c&!wm`u+lBl%1hE*Qp=T}Xht)|C
z8Eh_s$Y67jhMv`C8T|)lj9(`IO_jrN4%3v6lLLE1ki%p`nwh94R{J3`*zAYMV6%Th
zn(5|$X)KmfznHni5_41YGD|9TixTtFQ;Xt@OA<>m^Yf-(T+F1)=sx|UDznIBg#{*z
z?vovDMJFpRFb1*$EWoVES8OFFD=#nvD!U-Y2oXxN0|^;4r!Cx`wvaJ;rdlSKP)=fA
zN@;PbZgPHZZfa3-W@3&IKZk%8Hy1kxm%x#ZiA)j|+pk$MtrcTh$TYn*kjaiw1#Ith
z&HYS#ESK1XRDgDiAn^h$AUrLQ93oV1!4rxW9~UPFH`r_qMhTEAkPAhGu!swaGl~eH
zi*I)eVv-YOYGj(8md+H+tH>b$OcS>c?`M}d_hEXzJ(I-ri|I_l)64Cd1h_%z6j_QJ
z6c<PWGVDkk(RQ^ACLm@8VwUY{8LZr&6kaiNNtNW67G)Oa>SpGp<rn3GV?Z}QEiE%S
zRmd9>7WUC>O4Bz)v57HygJNR3Lo}Nrm_K>_cFF0^(QI-s+5drHS@X%BJHQeqlczx#
e#>`yvSf+1@W>cMhX)%)yBNa{FZWYTWpaB4ehlm*f

delta 547
zcmew|QR-Be)COK%rjLx1`E{k3O*jN6XXzRPX(1>r45dYYv=J-UOeQY*$%4A#lPBnL
zGTQ)E-_o-N(n3&L7)pz5KBX^ZuGGN9C6$<)nwMEpshgW$l3$cunVgdvUyxXootc*|
zWDeBdpKiu%4%82!g`u<vkT%^MmBC`k^oVJ4!a_-AQx5*g_ZFD|X#prL2&ILfv@nzw
z0n*0JQH!@nEoO|KDH_2gl#`g3Qd*p<o1CAUn_85dnV7Tvwhhx-F{Xoz)4PJ1?55`g
zu!&7JSRyw0LXa4v$mGUFBGWxnnRupWhcIz535iT*v=Z6AI)q71l<5HD^wXJ4!OS8Y
z0@LqjGKn$@LMR~!B@Cv7MWh5cZXe#yE^+R|e+Xb~Ka<4-#LPg<vi(dJEB7a+e@xSF
z#<0mUTXOJEPe@=>n(i0RCI;jQpzs7yctRka1yGSNj3EMIm@{*=F;71h$EHdZ)23^L
Nv+-{Kn83!Y0RXn3qsssQ

diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 65dc98463..9997f8deb 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -3507,8 +3507,26 @@ cont {
 }
 cont {
   name: "amenity-bicycle_parking"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3525,6 +3543,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3541,6 +3563,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3557,6 +3583,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3574,8 +3604,26 @@ cont {
 }
 cont {
   name: "amenity-bicycle_parking-covered"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3592,6 +3640,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3608,6 +3660,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3624,6 +3680,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -7902,8 +7962,26 @@ cont {
 }
 cont {
   name: "amenity-motorcycle_parking"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -7920,6 +7998,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -7936,6 +8018,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -7952,6 +8038,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -12196,8 +12286,26 @@ cont {
 }
 cont {
   name: "amenity-ranger_station"
+  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: "ranger-station-m"
       priority: 4400
@@ -12215,6 +12323,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12232,6 +12344,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12249,6 +12365,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12266,6 +12386,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12283,6 +12407,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -45736,6 +45864,16 @@ cont {
 }
 cont {
   name: "landuse-commercial"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
+  }
   element {
     scale: 17
     caption {
@@ -47473,6 +47611,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 16
@@ -47480,6 +47626,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 17
@@ -47487,6 +47641,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 18
@@ -47494,6 +47656,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 19
@@ -47501,6 +47671,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 20
@@ -47508,6 +47686,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
 }
 cont {
@@ -49246,6 +49432,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 17
@@ -49253,6 +49446,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 18
@@ -49260,6 +49460,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 19
@@ -49267,6 +49474,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 20
@@ -49274,6 +49488,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
 }
 cont {
@@ -127641,6 +127862,10 @@ cont {
   name: "tourism-information-office"
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127658,6 +127883,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127675,6 +127904,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127692,6 +127925,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127709,6 +127946,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127726,6 +127967,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127744,8 +127989,26 @@ cont {
 }
 cont {
   name: "tourism-information-visitor_centre"
+  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: "information-office-m"
       priority: 4400
@@ -127763,6 +128026,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127780,6 +128047,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127797,6 +128068,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127814,6 +128089,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -127831,6 +128110,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index bcbf5df286b2f43ad2adef8266ed7c27142148e8..d01721d03d45a3a0839484df84960584304fc897 100644
GIT binary patch
delta 1197
zcmaDoS^C;c=?(6>EXSF+#3$S9i5m;?bMQ-XOHBFr9|9PG0s^Q4jvRt00+Z+H8Vfjb
z2w@Wx#wI9&E@;HW^?tIAp0W{P%RSL8U!Z3#;E8TIL=eq#h#;Ef3-qiuhw0BV54^_2
zC6$<)nwMEpshgW$l3$cunVgdvUyxXootc+TM6kG^yX;`Psi2Sxy3?SdXl{dwqB?H#
z!E{%1-B~PLVlamlCFZ547R48rB$j06=LxBC@B)MK7Cf$$L?;(45ET}3;NZg|J~?24
zw15*hdJ$SCEieI!fnpe43>3*IVv`@*3QuNUU^rRT4nk*wX@lm43$`y@z^J#2F?0Hb
zC?;_}0WEGWb`CCqo|&6iBr3K)iDFtK&iHfs#3CkBc6o^X(;HtiiE~|I6OxD6jl>7r
z3+AVS<w5BR;SMc6E=~?^u+bWf5?}?Opv0>H6soutY}YPkDi8s>Z%#W?AddpjJ^UOK
zXZT2*`!Jm`o=FTSB8VX(gdrk~AtHhzBHA9>!34z2K+FQftlL97*yac^En%7dc@|r#
zfE!x8On*3=O=)`GTsASF6l(N<q%44<s1XDfoh-UbWct(DY$iZy)L?-~FNH`OGjknd
rnSN#to2rl&dJ>YH{(ml;q%bhyqNO2-#B{y6Y|?ag?e<mk*c`P1ArKZQ

delta 638
zcmcaMQ~LE}=?(6>@*f$w#1nH<^D;{+b(1oaE0c3l;|mgtvNQA2g-kdEC&%d-u>cuD
zForOUAp&F=GtQhmNl%&C2B@%B-x^2@L1|$qEdr#iHZvK_GiPj=yf9sk*&L|!W4alT
z7J|~kAbR>)X-4+RU(*dY|Hu$9mz&AVB?fa<QDR<tYEgV~Nn%N6ex8si2jAp}3rv_z
zIryQp0F)Ml(n3&L7)pyYe_Xiz<3h&7U7`_OLOF?fDW%1!y2<&uxv53TnTa{uD`J?|
zh%?Tdu3ExmI(@<pCc(+N!AeH_970mu61P77hX6()ehy)D0TC2|?ee8e1tN?)rcdZ(
z3d|7Z5Rl^Mm^i~n;@k(g8NwWb*aU^J2?}Eq6u}T|@9JU#VrC#_0b<teU0rN*gjlXI
zb4g7PoX;jQ-EJ;hJhLSS|8%<rY)aG5&t($>@&rIU3m`)f#t?!rgkcPk>2V9$EST;w
gPxqhCrpheK!8?7!d^YLn$#dDP$TM&|(7+090HoUHZvX%Q

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 1b745ce8a..a14de9d24 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -3530,8 +3530,23 @@ cont {
 }
 cont {
   name: "amenity-bicycle_parking"
+  element {
+    scale: 15
+    area {
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3548,6 +3563,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3564,6 +3582,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3580,6 +3601,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3597,8 +3621,23 @@ cont {
 }
 cont {
   name: "amenity-bicycle_parking-covered"
+  element {
+    scale: 15
+    area {
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3615,6 +3654,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3631,6 +3673,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3647,6 +3692,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -8008,8 +8056,23 @@ cont {
 }
 cont {
   name: "amenity-motorcycle_parking"
+  element {
+    scale: 15
+    area {
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -8026,6 +8089,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -8042,6 +8108,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -8058,6 +8127,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -12217,11 +12289,23 @@ cont {
 cont {
   name: "amenity-ranger_station"
   element {
-    scale: 14
+    scale: 13
+    area {
+      priority: -1830
+    }
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
-      min_distance: 10
     }
     caption {
       primary {
@@ -12235,6 +12319,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12252,6 +12339,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12269,6 +12359,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12286,6 +12379,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12303,6 +12399,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12320,6 +12419,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -48539,6 +48641,16 @@ cont {
 }
 cont {
   name: "landuse-commercial"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
+  }
   element {
     scale: 17
     caption {
@@ -50365,36 +50477,84 @@ cont {
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 16
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 17
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 18
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 19
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 20
     area {
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
 }
 cont {
@@ -52125,6 +52285,13 @@ cont {
       color: 1248273
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
   }
   element {
     scale: 17
@@ -52132,6 +52299,13 @@ cont {
       color: 1248273
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
   }
   element {
     scale: 18
@@ -52139,6 +52313,13 @@ cont {
       color: 1248273
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
   }
   element {
     scale: 19
@@ -52146,6 +52327,13 @@ cont {
       color: 1248273
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
   }
   element {
     scale: 20
@@ -52153,6 +52341,13 @@ cont {
       color: 1248273
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+      }
+      priority: 120
+    }
   }
 }
 cont {
@@ -133925,6 +134120,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133942,6 +134140,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133959,6 +134160,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133976,6 +134180,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -133993,6 +134200,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134010,6 +134220,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134030,6 +134243,9 @@ cont {
   name: "tourism-information-visitor_centre"
   element {
     scale: 13
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134037,6 +134253,9 @@ cont {
   }
   element {
     scale: 14
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134053,6 +134272,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134070,6 +134292,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134087,6 +134312,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134104,6 +134332,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134121,6 +134352,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134138,6 +134372,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index d2affef3437538bfe3cb3d508b4aca3e50abe38a..78b2c865ea8daf48f2902f113ec65879917f5fb1 100644
GIT binary patch
delta 987
zcmZo$E4_1z^agibmZwZy;*;(5#Ce58IQXRmI3C`A%`P!za^Y-I#wn98ZWQI3^6@_e
zFixJMYb@%<Ap}>2E+dRnMg*&j5i?gW^JH5+B_4FU6%e)x`Edwh(Y-*=TGS7#TOcyn
z+yaro=9UF|R-420vn&|DOg@+{hv6KiDIX_KXcs{ai{1>=$r*h-XhLE_o*dY02C1&>
zKvuoEH^b6W<`4^)SYmE!US>(9Zc$=hdTLR8aY<rHW`3TK_H@IYOd?E5qLU34i!uqh
zPMg6d$_VC6-{`<3&FDVaz*cnf!9~W5?$Z};2Fd`LlaJa;Og_BG5GZ+ZHbf-c4lFWx
z0hl&uPF%b_aWSLRcC}0{p`66Ll+xl<-Q@h-+|;7v%)}faehvXGZZ38XE`cK*6PY9`
zwoiy+5|v<D$TWR<5tALG3eZxK=_lVY@v&TD6H=M{FbIh^{lR8NBrebiB0^exT$~)-
zV8b*RB|v(nZ=B48O?>h~I}rhN<=ZogndC&78kwedbT9?;Dsl(_lfv!8``IPVeVBeA
zj!A|ci6g-cN}4DFptwL007X8MfM~l%Cle4e12GE_vu^k3WJ{H0I>a)4{W7*vMsH9c
zPd8Y_rZ`<|C7T$dH#n$40%nsh?U9;pyo$|uvix2MgGtC6<T<c<v&lOlq9!cwSh$p?
vZ(PPEGJW0(HhxBZaJ)|6u!2p7(GwJ@(>JbQlbZf&1)DU5)@=v6CRhgmawv|f

delta 575
zcmdnFMY?UR^agib`HzfT;)%Jbd6^}Zx=ESImB~4&@db%R*_nCiLM9x7li%nXGn;S-
zL1|$qEi$=A&zNZ@)8vhMO3XGuWg`04Kw1b&3qxs<%`65>EEpRmugs8RHU}!3muUv1
zg`l)BlokQfrkmxmSS;mcGINQ+oKuvTm!4V_UtE${l9`_;WXi!edEpWhW>XG+C@lb`
z1);PMlop24B0$=>Ic@3ow55zv+ZiLKH^wlDZ(kY1BqYIfka7Cn5+=Lpb51acO}1Gk
zHu+w#7_$h6(DcMuX3@z-TZEZ}M5aHy!YH!+UMZ8DDANJP>HoTzg1tpJ1f&EwZXe#y
zE^+R|e+Xa{65$ZUDk_9kR2U*UeIqNgFh816?f<)(fS4JGS%8>z`~PmXR9U8L%+u3W
zvXwGha_~=2T*GDoWC%<zT+L?AB4o)S2xkewS;BCZ2#96DbdP!Z>eXzj)0<baMUZdI
KcByr2@;U&XZp9}6

diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index e9ecbbd9e..75a478c98 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -3530,8 +3530,26 @@ cont {
 }
 cont {
   name: "amenity-bicycle_parking"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3548,6 +3566,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3564,6 +3586,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3580,6 +3606,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-m"
       priority: 250
@@ -3597,8 +3627,26 @@ cont {
 }
 cont {
   name: "amenity-bicycle_parking-covered"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3615,6 +3663,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3631,6 +3683,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -3647,6 +3703,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "bicycle-parking-covered-m"
       priority: 250
@@ -8044,8 +8104,26 @@ cont {
 }
 cont {
   name: "amenity-motorcycle_parking"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1900
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -8062,6 +8140,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -8078,6 +8160,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -8094,6 +8180,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1900
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 250
@@ -12339,11 +12429,25 @@ cont {
 cont {
   name: "amenity-ranger_station"
   element {
-    scale: 14
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
-      min_distance: 10
     }
     caption {
       primary {
@@ -12357,6 +12461,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12374,6 +12482,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12391,6 +12503,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12408,6 +12524,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12425,6 +12545,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -12442,6 +12566,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "ranger-station-m"
       priority: 4400
@@ -48433,6 +48561,16 @@ cont {
 }
 cont {
   name: "landuse-commercial"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
+  }
   element {
     scale: 17
     caption {
@@ -50262,6 +50400,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 16
@@ -50269,6 +50415,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 17
@@ -50276,6 +50430,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 18
@@ -50283,6 +50445,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 19
@@ -50290,6 +50460,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
   element {
     scale: 20
@@ -50297,6 +50475,14 @@ cont {
       color: 16445409
       priority: -1830
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 850
+    }
   }
 }
 cont {
@@ -52035,6 +52221,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 17
@@ -52042,6 +52235,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 18
@@ -52049,6 +52249,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 19
@@ -52056,6 +52263,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
   element {
     scale: 20
@@ -52063,6 +52277,13 @@ cont {
       color: 15720923
       priority: -1970
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 120
+    }
   }
 }
 cont {
@@ -134001,6 +134222,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134018,6 +134243,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134035,6 +134264,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134052,6 +134285,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134069,6 +134306,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134086,6 +134327,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134106,6 +134351,10 @@ cont {
   name: "tourism-information-visitor_centre"
   element {
     scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134113,6 +134362,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134129,6 +134382,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134146,6 +134403,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134163,6 +134424,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134180,6 +134445,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134197,6 +134466,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
@@ -134214,6 +134487,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "information-office-m"
       priority: 4400
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 8ac5ad0058d59ea282aea5a42bcdbb86035db086..db10949bc06c1014f467aa67cee7a9fc22de1b62 100644
GIT binary patch
delta 305
zcmdnAPH@|L!3~e3Sk5qVNlk8)7M3VTEXvNzOBd4O5R~GUxbX2m1Taocl$I6*iV9&B
z6~-zmf+E_SD7`&Vn(>Y=<ICxGnT&4r@*Dy{1;^l4Xz_7za_|T|J2R76gHhs<u#i01
t4QL8@Q51ljgQkEFMFGfV*cGTk?EtwFy9$tk_8XauK+LrLMkaIATL2j<fzJQ{

delta 187
zcmdnCUU1Vo!3~e3lx8q;NhRi{=4F;t>gMK`<QFAZCg-Ha7bF&CXXd2~$#Muz7L=A@
zmgNwF(!x+$1V~FaZ;;-;L7MTPFXPPVMVX9lA^aQyQrr^9KK_RQMj?I<L39BjbOB*>
V0TC2|_LwY2AZFSglf@kM76552PAmWb

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 35962ce9f..f13b2b94f 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -2125,6 +2125,9 @@ cont {
   name: "amenity-motorcycle_parking"
   element {
     scale: 17
+    area {
+      priority: -1840
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 2530
@@ -2132,6 +2135,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1840
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 2530
@@ -2139,6 +2145,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1840
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 2530
@@ -2146,6 +2155,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1840
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 2530
@@ -28861,30 +28873,70 @@ cont {
     area {
       priority: -1850
     }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 2530
+    }
   }
   element {
     scale: 17
     area {
       priority: -1850
     }
+    caption {
+      primary {
+        height: 13
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 2530
+    }
   }
   element {
     scale: 18
     area {
       priority: -1850
     }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 2530
+    }
   }
   element {
     scale: 19
     area {
       priority: -1850
     }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 2530
+    }
   }
   element {
     scale: 20
     area {
       priority: -1850
     }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 2530
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index 4fb1af8b9a083f84398df6310d024e66b03bd9b5..08cb5cd6032d0fad38f9651cffcc64c1af1925a9 100644
GIT binary patch
delta 305
zcmX@SLGboQ!3{~$EDspDq$V@U2+I~E7G-DVr3>kE2ucZXJiPy!UE;#W{}8}9`JuG5
z7*I+Gx0En$DG^Mm=7-YTA4)TRaAlgvH2rcSV~DQ`hX733F}S^2d|aFyJOW2LCNgO-
zN<0!4QbD*5O%*S)s>v64M1;Va`A~!fd9ey#^cE37SKU4(i4lmIwogf7UjG#UQu}(!

delta 153
zcmcb;QSk5v!3{~$N;4R_q!M#e^D;{+b#wDe@{5uylXFtz3lfX6GxO4gWH|&UYsyHo
z02x9shA@mF(yS@7T~mhfgDcZP#_7^Yj3JC7(+iRqMOcJHI0UB~Br%FkzQ`lYBqTCf
lkXJ+uC@3N&!13_@Yj%laAOAxDW4lf=2s3ThNoHRE6#%6RFSY;x

diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index 1e66199eb..43fdc515e 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -2141,6 +2141,10 @@ cont {
   name: "amenity-motorcycle_parking"
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1840
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 2530
@@ -2148,6 +2152,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1840
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 2530
@@ -2155,6 +2163,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1840
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 2530
@@ -2162,6 +2174,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1840
+    }
     symbol {
       name: "motorcycle-parking-m"
       priority: 2530
@@ -28361,6 +28377,14 @@ cont {
       color: 16445409
       priority: -1850
     }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 2530
+    }
   }
   element {
     scale: 17
@@ -28368,6 +28392,14 @@ cont {
       color: 16445409
       priority: -1850
     }
+    caption {
+      primary {
+        height: 13
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 2530
+    }
   }
   element {
     scale: 18
@@ -28375,6 +28407,14 @@ cont {
       color: 16445409
       priority: -1850
     }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 2530
+    }
   }
   element {
     scale: 19
@@ -28382,6 +28422,14 @@ cont {
       color: 16445409
       priority: -1850
     }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 2530
+    }
   }
   element {
     scale: 20
@@ -28389,6 +28437,14 @@ cont {
       color: 16445409
       priority: -1850
     }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 2530
+    }
   }
 }
 cont {
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 2d32ee8f0..b16c5c5dd 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
@@ -58,22 +58,22 @@ amenity-fire_station                                # area z15- (also has icon z
 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-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
 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-ranger_station
 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-)
 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-
+landuse-garages                                     # area z13- (also has caption z15-)
 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-)
-tourism-information-office
-tourism-information-visitor_centre
+tourism-information-office                          # area z15- (also has icon z15-, caption(optional) z15-)
+tourism-information-visitor_centre                  # area z13- (also has icon z15-, caption(optional) z15-)
 === 170
 
 highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
@@ -103,6 +103,9 @@ public_transport-platform                           # area z16- (also has captio
 railway-platform                                    # area z16- (also has caption z16-)
 === 110
 
+amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
 amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
 amenity-parking-lane                                # area z17- (also has icon z18-, caption(optional) z18-)
@@ -117,9 +120,6 @@ amenity-parking-private                             # area z17- (also has icon z
 amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
 amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
 amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-bicycle_parking
-amenity-bicycle_parking-covered
-amenity-motorcycle_parking
 === 100
 
 natural-wetland                                     # area z11- (also has caption z16-)
@@ -199,7 +199,7 @@ amenity-university                                  # area z13- (also has icon z
 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 z13-
-landuse-retail                                      # area z13-
+landuse-retail                                      # area z13- (also has caption z16-)
 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_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 8be3f19a4..1894b6352 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -357,10 +357,10 @@ railway-subway_entrance-moscow                      # icon z15- (also has captio
 railway-subway_entrance-spb                         # icon z15- (also has caption(optional) z16-)
 === 4450
 
-amenity-ranger_station                              # icon z15- (also has caption(optional) z15-)
+amenity-ranger_station                              # icon z15- (also has caption(optional) z15-, area z13-)
 historic-monument                                   # icon z13- (also has caption(optional) z13-)
-tourism-information-office                          # icon z15- (also has caption(optional) z15-)
-tourism-information-visitor_centre                  # icon z15- (also has caption(optional) z15-)
+tourism-information-office                          # icon z15- (also has caption(optional) z15-, area z15-)
+tourism-information-visitor_centre                  # icon z15- (also has caption(optional) z15-, area z13-)
 === 4400
 
 amenity-community_centre                            # icon z15- (also has caption(optional) z15-)
@@ -1098,8 +1098,8 @@ amenity-social_facility                             # icon z17- (also has captio
 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-garages
 landuse-farmland                                    # caption z15- (also has area z10-)
+landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
 landuse-vineyard                                    # caption z15- (also has area z12-)
 leisure-ice_rink                                    # icon z17- (also has caption(optional) z17-)
@@ -1208,9 +1208,9 @@ amenity-parking-underground                         # icon z16- (also has captio
 amenity-parking-underground-fee                     # icon z16- (also has caption(optional) z18-)
 === 300
 
-amenity-bicycle_parking                             # icon z17- (also has caption(optional) z17-)
-amenity-bicycle_parking-covered                     # icon z17- (also has caption(optional) z17-)
-amenity-motorcycle_parking                          # icon z17- (also has caption(optional) z17-)
+amenity-bicycle_parking                             # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-bicycle_parking-covered                     # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-motorcycle_parking                          # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-parking-permissive                          # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking_entrance                            # icon z17- (also has caption(optional) z19-)
 amenity-parking_entrance-permissive                 # icon z17- (also has caption(optional) z19-)
@@ -1252,7 +1252,7 @@ amenity-parking-street_side                         # icon z18- (also has captio
 amenity-parking-street_side-fee                     # icon z18- (also has caption(optional) z18-, area z17-)
 === 150
 
-landuse-commercial                                  # caption z17-
+landuse-commercial                                  # caption z16-
 landuse-construction                                # caption z15- (also has area z13-)
 landuse-farmyard                                    # caption z15- (also has area z10-)
 landuse-industrial                                  # caption z15- (also has area z13-)
@@ -1260,8 +1260,8 @@ landuse-industrial-mine                             # icon z15- (also has captio
 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-retail
 landuse-residential                                 # caption z17-
+landuse-retail                                      # caption z16- (also has area z13-)
 leisure-common                                      # caption z17-
 leisure-slipway                                     # caption z17-
 leisure-track                                       # caption z16- (also has line z15-)
@@ -1516,10 +1516,10 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-subway_entrance-spb                       # caption(optional) z16- (also has icon z15-)
 # === -5550
 
-# amenity-ranger_station                            # caption(optional) z15- (also has icon z15-)
+# amenity-ranger_station                            # caption(optional) z15- (also has icon z15-, area z13-)
 # historic-monument                                 # caption(optional) z13- (also has icon z13-)
-# tourism-information-office                        # caption(optional) z15- (also has icon z15-)
-# tourism-information-visitor_centre                # caption(optional) z15- (also has icon z15-)
+# tourism-information-office                        # caption(optional) z15- (also has icon z15-, area z15-)
+# tourism-information-visitor_centre                # caption(optional) z15- (also has icon z15-, area z13-)
 # === -5600
 
 # amenity-community_centre                          # caption(optional) z15- (also has icon z15-)
@@ -2142,9 +2142,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-parking-underground-fee                   # caption(optional) z18- (also has icon z16-)
 # === -9700
 
-# amenity-bicycle_parking                           # caption(optional) z17- (also has icon z17-)
-# amenity-bicycle_parking-covered                   # caption(optional) z17- (also has icon z17-)
-# amenity-motorcycle_parking                        # caption(optional) z17- (also has icon z17-)
+# amenity-bicycle_parking                           # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-bicycle_parking-covered                   # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-motorcycle_parking                        # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-parking-permissive                        # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking_entrance                          # caption(optional) z19- (also has icon z17-)
 # amenity-parking_entrance-permissive               # caption(optional) z19- (also has icon z17-)
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 3976c68d3..390e15000 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
@@ -58,22 +58,22 @@ amenity-fire_station                                # area z15- (also has icon z
 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-ranger_station                              # area z13- (also has icon z13-, caption(optional) z14-)
 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-ranger_station
 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-)
 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-
+landuse-garages                                     # area z13- (also has caption z15-)
 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-)
-tourism-information-office
-tourism-information-visitor_centre
+tourism-information-office                          # area z15- (also has icon z13-, caption(optional) z14-)
+tourism-information-visitor_centre                  # area z13- (also has icon z13-, caption(optional) z14-)
 === 170
 
 highway-footway-area                                # area z14- (also has line z11-, pathtext z13-)
@@ -103,6 +103,9 @@ public_transport-platform                           # area z16- (also has captio
 railway-platform                                    # area z16- (also has caption z16-)
 === 110
 
+amenity-bicycle_parking                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-bicycle_parking-covered                     # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-motorcycle_parking                          # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-parking                                     # area z15- (also has icon z16-, caption(optional) z18-)
 amenity-parking-fee                                 # area z15- (also has icon z16-, caption(optional) z18-)
 amenity-parking-lane                                # area z17- (also has icon z18-, caption(optional) z18-)
@@ -117,9 +120,6 @@ amenity-parking-private                             # area z17- (also has icon z
 amenity-parking-street_side                         # area z17- (also has icon z18-, caption(optional) z18-)
 amenity-parking-street_side-fee                     # area z17- (also has icon z18-, caption(optional) z18-)
 amenity-parking-street_side-private                 # area z17- (also has icon z18-, caption(optional) z18-)
-amenity-bicycle_parking
-amenity-bicycle_parking-covered
-amenity-motorcycle_parking
 === 100
 
 natural-wetland                                     # area z11- (also has caption z16-)
@@ -199,7 +199,7 @@ amenity-university                                  # area z13- (also has icon z
 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 z13-
-landuse-retail                                      # area z13-
+landuse-retail                                      # area z13- (also has caption z16-)
 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 370a7759e..7765af9d7 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -357,10 +357,10 @@ railway-subway_entrance-moscow                      # icon z15- (also has captio
 railway-subway_entrance-spb                         # icon z15- (also has caption(optional) z16-)
 === 4450
 
-amenity-ranger_station                              # icon z14- (also has caption(optional) z14-)
+amenity-ranger_station                              # icon z13- (also has caption(optional) z14-, area z13-)
 historic-monument                                   # icon z13- (also has caption(optional) z13-)
-tourism-information-office                          # icon z13- (also has caption(optional) z14-)
-tourism-information-visitor_centre                  # icon z13- (also has caption(optional) z14-)
+tourism-information-office                          # icon z13- (also has caption(optional) z14-, area z15-)
+tourism-information-visitor_centre                  # icon z13- (also has caption(optional) z14-, area z13-)
 === 4400
 
 amenity-community_centre                            # icon z15- (also has caption(optional) z15-)
@@ -1099,8 +1099,8 @@ amenity-social_facility                             # icon z17- (also has captio
 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-garages
 landuse-farmland                                    # caption z15- (also has area z10-)
+landuse-garages                                     # caption z15- (also has area z13-)
 landuse-orchard                                     # caption z15- (also has area z12-)
 landuse-vineyard                                    # caption z15- (also has area z12-)
 leisure-ice_rink                                    # icon z17- (also has caption(optional) z17-)
@@ -1209,9 +1209,9 @@ amenity-parking-underground                         # icon z16- (also has captio
 amenity-parking-underground-fee                     # icon z16- (also has caption(optional) z18-)
 === 300
 
-amenity-bicycle_parking                             # icon z17- (also has caption(optional) z17-)
-amenity-bicycle_parking-covered                     # icon z17- (also has caption(optional) z17-)
-amenity-motorcycle_parking                          # icon z17- (also has caption(optional) z17-)
+amenity-bicycle_parking                             # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-bicycle_parking-covered                     # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-motorcycle_parking                          # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-parking-permissive                          # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking_entrance                            # icon z17- (also has caption(optional) z19-)
 amenity-parking_entrance-permissive                 # icon z17- (also has caption(optional) z19-)
@@ -1255,7 +1255,7 @@ amenity-parking-street_side                         # icon z18- (also has captio
 amenity-parking-street_side-fee                     # icon z18- (also has caption(optional) z18-, area z17-)
 === 150
 
-landuse-commercial                                  # caption z17-
+landuse-commercial                                  # caption z16-
 landuse-construction                                # caption z15- (also has area z13-)
 landuse-farmyard                                    # caption z15- (also has area z10-)
 landuse-industrial                                  # caption z15- (also has area z13-)
@@ -1263,8 +1263,8 @@ landuse-industrial-mine                             # icon z15- (also has captio
 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-retail
 landuse-residential                                 # caption z17-
+landuse-retail                                      # caption z16- (also has area z13-)
 leisure-common                                      # caption z17-
 leisure-slipway                                     # caption z17-
 leisure-track                                       # caption z16- (also has line z15-)
@@ -1519,10 +1519,10 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-subway_entrance-spb                       # caption(optional) z16- (also has icon z15-)
 # === -5550
 
-# amenity-ranger_station                            # caption(optional) z14- (also has icon z14-)
+# amenity-ranger_station                            # caption(optional) z14- (also has icon z13-, area z13-)
 # historic-monument                                 # caption(optional) z13- (also has icon z13-)
-# tourism-information-office                        # caption(optional) z14- (also has icon z13-)
-# tourism-information-visitor_centre                # caption(optional) z14- (also has icon z13-)
+# tourism-information-office                        # caption(optional) z14- (also has icon z13-, area z15-)
+# tourism-information-visitor_centre                # caption(optional) z14- (also has icon z13-, area z13-)
 # === -5600
 
 # amenity-community_centre                          # caption(optional) z15- (also has icon z15-)
@@ -2147,9 +2147,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-parking-underground-fee                   # caption(optional) z18- (also has icon z16-)
 # === -9700
 
-# amenity-bicycle_parking                           # caption(optional) z17- (also has icon z17-)
-# amenity-bicycle_parking-covered                   # caption(optional) z17- (also has icon z17-)
-# amenity-motorcycle_parking                        # caption(optional) z17- (also has icon z17-)
+# amenity-bicycle_parking                           # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-bicycle_parking-covered                   # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-motorcycle_parking                        # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-parking-permissive                        # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking_entrance                          # caption(optional) z19- (also has icon z17-)
 # amenity-parking_entrance-permissive               # caption(optional) z19- (also has icon z17-)
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 e0a1b5761..7fad027b4 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
@@ -14,6 +14,7 @@
 # - BG-top: water (linear and areal)
 # - BG-by-size: landcover areas sorted by their size
 
+amenity-motorcycle_parking                          # area z17- (also has icon z17-)
 amenity-parking                                     # area z15- (also has icon z15-, caption(optional) z16-)
 amenity-parking-fee                                 # area z15- (also has icon z15-, caption(optional) z16-)
 amenity-parking-lane                                # area z15- (also has icon z17-)
@@ -28,7 +29,6 @@ amenity-parking-private                             # area z15- (also has icon z
 amenity-parking-street_side                         # area z15- (also has icon z17-)
 amenity-parking-street_side-fee                     # area z15- (also has icon z15-)
 amenity-parking-street_side-private                 # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-motorcycle_parking
 === 160
 
 amenity-car_wash                                    # area z17- (also has icon z17-, caption(optional) z17-)
@@ -37,7 +37,7 @@ amenity-fuel                                        # area z15- (also has icon z
 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-
+landuse-garages                                     # area z13- (also has caption z16-)
 leisure-stadium                                     # area z15-
 === 150
 
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index e67834ddb..e583f20fb 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -239,10 +239,10 @@ amenity-parking-underground                         # icon z15- (also has captio
 amenity-parking-underground-fee                     # icon z15- (also has caption(optional) z16-)
 === 2550
 
-amenity-motorcycle_parking                          # icon z17-
+amenity-motorcycle_parking                          # icon z17- (also has area z17-)
 amenity-parking_entrance                            # icon z16-
 amenity-parking_entrance-permissive                 # icon z16-
-landuse-garages
+landuse-garages                                     # caption z16- (also has area z13-)
 === 2530
 
 amenity-parking-lane                                # icon z17- (also has area z15-)