From fbfaab7d625a78aa237f59b4d77d2e64cec32d05 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Fri, 5 Jan 2024 07:56:12 +0200
Subject: [PATCH] [styles] Regenerate

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/drules_proto.bin                         | Bin 426345 -> 427320 bytes
 data/drules_proto.txt                         | 540 ++++++++++++-----
 data/drules_proto_clear.bin                   | Bin 414963 -> 414797 bytes
 data/drules_proto_clear.txt                   | 225 +++----
 data/drules_proto_dark.bin                    | Bin 413705 -> 413539 bytes
 data/drules_proto_dark.txt                    | 225 +++----
 data/drules_proto_outdoors_clear.bin          | Bin 430985 -> 431928 bytes
 data/drules_proto_outdoors_clear.txt          | 573 ++++++++++++------
 data/drules_proto_outdoors_dark.bin           | Bin 429612 -> 430555 bytes
 data/drules_proto_outdoors_dark.txt           | 573 ++++++++++++------
 data/drules_proto_vehicle_clear.bin           | Bin 279270 -> 278973 bytes
 data/drules_proto_vehicle_clear.txt           | 427 +++++--------
 data/drules_proto_vehicle_dark.bin            | Bin 279478 -> 279181 bytes
 data/drules_proto_vehicle_dark.txt            | 427 +++++--------
 .../include/priorities_1_BG-by-size.prio.txt  |   2 +-
 .../include/priorities_4_overlays.prio.txt    |  34 +-
 .../include/priorities_1_BG-by-size.prio.txt  |   2 +-
 .../include/priorities_4_overlays.prio.txt    |  70 +--
 .../include/priorities_4_overlays.prio.txt    |  30 +-
 data/visibility.txt                           |  16 +-
 20 files changed, 1721 insertions(+), 1423 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index b872e3cb03f206877a0ff0258a937db5e8b4a233..9edfb3872a8168068ad96a11681fd1fc1b2b163b 100644
GIT binary patch
delta 2514
zcmc(gUrZcD9LF=W$8=q|+r8Q4jys^G(ArWs%O44mhZYh|6KJT7g<jR<*yBz;x!r}m
z#iphS(HEM=M4Hu3)L236lTB(o<N83XkknG?gU0uwK4?V)CDAt<oLlY=jyv{IANFRx
z-_LJn=eNI|-~Ik(@T<$g&(@p7Wx$ooN?c7C7edkK7(UDj<`d10z?=C^GtHj|>uy2L
zmkWvM33Vi)z8pC(8*v>6*oyi}^2Se4WN%bc<t|X30>u|7p+I>H6yB!VS&^zAR-g!P
zRGX_Of(W;>(w3E8JuxSMb@S736Vt+a&GoQko;nwVxW!xx`!Z7(ZehiopYA;8?}gW)
z`RuF&cyoUChzmE<l(Q3WW|Ed?r*Z8Z<iuRocCwLCEuk9QQ(p0JPuW)alx>wy*;e_K
zZIw^iR{4~v+De%m5MgcER=ycslRj;|>uSEmaK5Ol>xsA?ifVc+u1AJ7)zGyh4$-3U
z92d>%P|EC?tK;1zJWsKgZkzk0tm!)Bgxu<Jx~i-W$8iTM)cZNS!#8IZ>im>>9T;|C
zq63pku=LDAau0aV^nB-gx{_w<<thv<nT$j=&3Gl0s#<KvmGnC-VIO5ZC2VtgDd@*X
zS$+po=t?;zI54jR!wyVzU{VQ|o?dz}1+J1u$H4n#eXM{VCs)1&BDr}SNcH6$dWn7n
zA*JeLUl-=w>|;Xu*L$F9V`JkZhI+V<RJ;z3u(?2T_c*8_t=*t;Pxe+a)D425m;8AV
zG;W1uOs1EW$m&IKsK5?P@;$)fd*GM-@I!{&c^ig71F4&W5*eC;ybCw50_mTE`>oz7
zc&rtE!H~=IFbF*4$^z_k;ip*Mo>?>V@Diw*gdA36HKNF|cxdyu8S?0VaM%L*{=(V^
zG1pq^R{Y#0+5&cL>U=zz{2zA(SNxWI8~y<f5f|rHv~kst6KZ5sPNi@gTV5}5e9jDI
z%n%v71NT+7(Q~pZa_^2jyC7d1JuXEHD&+e`xR)})fq5Mmc3`3dlXhXX*6F)&pl0GN
zz*VTSF|NzWkgg4nV1agm3U1G6TplrK%b@2&pb71Cgd)dV<lrJlEOI8KLW}zaa-Q6N
zQgSSojN>ZWvWj15)jJK8l&FHTNlFzVLkdg4s+-?}LcG7(^(k3{EGt=qEGt=qEGt<9
z%4*4l`_Mhv@c`0`p_j|*cu>|l9Qc6YyoNTeCsImiSXM?Ose}=yeb`NY?n5oKPh<w`
zW*<5LYQAPTX)9KjU!$GE4sWO7YbVi@*6K+#2EgBBs2@r6-kwuPB6Iy{uVwV3SIfX7
zviuwh0G^DUK@H@aLF8k)Xn)Ep(sl+t-2Wrw0=dT|RN7D#*+^(A{ePA97=5WcSsp;u
z_U%^p0CEAaMxGf&4Rqa^LDUHZdmz(;=svhjCeET-N<bI|HlNr+pO{zV-dVH=|6<71
mFxm&)WIc?!=*I1Vw+HKC7##%QAL4r+9d?MYuDyVk4*m=OoAEIK

delta 2217
zcmc(g&u<$=6vs8=&19K4jy>z&Zho1dCZroSs<<GProOZZO_d%>oC3Ah_KI4yz0U5Y
zRXLEhAX?y1g%z4ogea&N1W2uX*h(}NA^iT)s((SLav_ZnaO(*e|Jt}&J4ZOIH1GR)
z^LD;^^LB5%6<t3Uz4q6r@HW6*azQEPjMHK|Jx_*tVvg+^DWBbSAqwuAcz@It<K6V`
z1{BQFevTU$A~Aa9J`C}n#VTvwV>48Zd+fNDD{pM(`nIq;8!%9*TG{zDFH~rNtJF26
z15w()1|!v|EFHM%1<U5|$x&C3_nFt{{2U3ggH{(3FR;Z}`SZEZl<+>lJq<gCn#(JO
zUY4(3A+g&K3k`5eHWV#YQgcOv8K|2(V>O$55NbBZ*dylb+^V^HZrz;Cs^;oDZF7}e
z`jH>T=)f8bbB!=s-h1O+uJ1m?!L+PtIYkrGs+MJ^%&0{}Q}aaRJ?7%_SoziEs~!F8
z0DBvG3gdDyqmU8a8}GvCW!W&NR|n1EZ#?GV)m}WplV<thw^iBvq>6WxC%-<}DSzt1
zq*2dM^Z8U-RgL2$#Jl4Hc5f=89{zs!0M9^oYcS4xS^{(M=U8~0@7V$i)pB*{-46P;
zgJe4>YzO`AV6-g#lF-2t)hEDZFhxE4z$n7FBdZ#8VjqaQrg$H{cLof1#+%hip3vvc
zf}OTHp8ye#OtQP(e{PEm$t0affG6u^&$Co(J^}9>g8x98Sb|CVg#o+3O$vU60s7+-
z#2nef-ul539JKg%U}QXU3*taQE~W}{RuT0D?WA(LcCD>ztMCGdz6UX}dF|F4a_K+1
z^RfCsquPAX!8I5fsI2j2Hj7)1bxO(S|HpGx2hlqC9ozs<yvE_~g1S&N<XkaTl69R(
zd{>-oiXs!~u^(W+Ah7{y1G?J*Pdm`l4tU!EUpqkB0ihl6w*r0E%un#hj>T87yC@qA
znw%FkHFJV^*&w@dXGxJy7-Av(agZrqhvIW6#Gwcd#s8>+U+3_Ur}1`O&SvvUtA6P8
z-fyta-=ZNladgBcj+WTO(G#0Enqm`2S8U>Fi%lGTv5BKGRnmL@(mG_1i#?omX}#mw
zOymK?K0{s5a(Y3`$c0i$&lw7Niv6GuPb0~inMOk({H6>0H<L8^B>Q?)@~o9Z$N=Ok
zh&?twF0<b!mG+{5b#VqIJGd1#w{#_m1nZgSkqEdCA&yjHKV6(fJn+&#XVGr@$1J)H
zEP5-69=9TMC<uT_rK6~qE*?b>xxXQf*7jU{0X+tK=$9{|xFsD!djNQYsxP78CXL_u
EFVR+|4gdfE

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 509105295c..2954077ca4 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3414,6 +3414,38 @@ cont {
 }
 cont {
   name: "amenity-bbq"
+  element {
+    scale: 16
+    symbol {
+      name: "bbq-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bbq-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
   element {
     scale: 18
     symbol {
@@ -5527,7 +5559,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5535,7 +5566,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5543,7 +5573,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5551,7 +5580,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5559,7 +5587,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5567,7 +5594,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5575,7 +5601,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5583,7 +5608,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5600,7 +5624,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -6971,6 +6994,15 @@ cont {
       priority: 2550
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
   }
   element {
     scale: 18
@@ -6979,6 +7011,15 @@ cont {
       priority: 2550
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
   }
   element {
     scale: 19
@@ -12598,6 +12639,54 @@ cont {
 }
 cont {
   name: "amenity-toilets"
+  element {
+    scale: 15
+    symbol {
+      name: "toilets-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "toilets-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "toilets-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
   element {
     scale: 18
     symbol {
@@ -13911,7 +14000,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13919,7 +14007,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13927,7 +14014,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13935,7 +14021,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13943,7 +14028,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13951,7 +14035,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13959,7 +14042,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13967,7 +14049,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13984,7 +14065,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -14405,10 +14485,42 @@ cont {
 }
 cont {
   name: "barrier-border_control"
+  element {
+    scale: 12
+    symbol {
+      name: "bcontrol-s"
+      priority: 5800
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4200
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bcontrol-s"
+      priority: 5800
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4200
+    }
+  }
   element {
     scale: 14
     symbol {
-      name: "bcontrol-m"
+      name: "bcontrol-s"
       priority: 5800
     }
     caption {
@@ -14855,7 +14967,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14871,7 +14983,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14887,7 +14999,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14903,7 +15015,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14919,7 +15031,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -15532,7 +15644,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
   }
   element {
@@ -15540,7 +15651,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
   }
   element {
@@ -15548,7 +15658,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15565,7 +15674,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15582,7 +15690,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15599,7 +15706,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15616,7 +15722,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15633,7 +15738,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15650,7 +15754,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -24642,7 +24745,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24666,7 +24769,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24690,7 +24793,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24714,7 +24817,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24738,7 +24841,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -52413,6 +52516,11 @@ cont {
       color: 13029267
       priority: -1860
     }
+    symbol {
+      name: "golf-m"
+      priority: 1800
+      min_distance: 10
+    }
   }
   element {
     scale: 16
@@ -52420,6 +52528,11 @@ cont {
       color: 13029267
       priority: -1860
     }
+    symbol {
+      name: "golf-m"
+      priority: 1800
+      min_distance: 10
+    }
   }
   element {
     scale: 17
@@ -56398,6 +56511,38 @@ cont {
 }
 cont {
   name: "man_made-survey_point"
+  element {
+    scale: 14
+    symbol {
+      name: "survey_point-m"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "survey_point-m"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -56517,7 +56662,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56525,7 +56669,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56533,7 +56676,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56541,7 +56683,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56549,7 +56690,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56557,7 +56697,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56565,7 +56704,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56573,7 +56711,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56581,7 +56718,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
 }
@@ -56592,7 +56728,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56600,7 +56735,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56608,7 +56742,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56616,7 +56749,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56624,7 +56756,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56632,7 +56763,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56640,7 +56770,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56648,7 +56777,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -56656,7 +56784,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
 }
@@ -56827,7 +56954,7 @@ cont {
   element {
     scale: 11
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-s"
       priority: 5050
     }
     caption {
@@ -56843,7 +56970,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-s"
       priority: 5050
     }
     caption {
@@ -56859,7 +56986,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-s"
       priority: 5050
     }
     caption {
@@ -56875,7 +57002,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-s"
       priority: 5050
     }
     caption {
@@ -56891,7 +57018,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -56907,7 +57034,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -56923,7 +57050,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -56939,7 +57066,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -56955,7 +57082,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -56971,7 +57098,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -59378,135 +59505,83 @@ cont {
 }
 cont {
   name: "natural-rock"
+  element {
+    scale: 14
+    symbol {
+      name: "peakt-s"
+      priority: 2850
+    }
+  }
   element {
     scale: 15
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 17
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 19
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 20
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
 }
 cont {
   name: "natural-saddle"
-  element {
-    scale: 11
-    symbol {
-      name: "mountain-pass"
-      priority: 4500
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
-  }
-  element {
-    scale: 12
-    symbol {
-      name: "mountain-pass"
-      priority: 4500
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
-  }
   element {
     scale: 13
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
   }
   element {
     scale: 14
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
   }
   element {
     scale: 15
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
   }
   element {
     scale: 16
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -59522,7 +59597,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -59538,7 +59613,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -59554,7 +59629,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -59570,7 +59645,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -126666,6 +126741,23 @@ cont {
 }
 cont {
   name: "tourism-camp_site"
+  element {
+    scale: 13
+    symbol {
+      name: "campsite-m"
+      priority: 3800
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6200
+    }
+  }
   element {
     scale: 14
     symbol {
@@ -126788,6 +126880,23 @@ cont {
 }
 cont {
   name: "tourism-caravan_site"
+  element {
+    scale: 13
+    symbol {
+      name: "caravan_site-m"
+      priority: 3800
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6200
+    }
+  }
   element {
     scale: 14
     symbol {
@@ -126910,6 +127019,23 @@ cont {
 }
 cont {
   name: "tourism-chalet"
+  element {
+    scale: 14
+    symbol {
+      name: "alpine_hut-m"
+      priority: 3800
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6200
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -127383,6 +127509,23 @@ cont {
 }
 cont {
   name: "tourism-information"
+  element {
+    scale: 15
+    symbol {
+      name: "information-m"
+      priority: -9950
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -127471,6 +127614,23 @@ cont {
 }
 cont {
   name: "tourism-information-board"
+  element {
+    scale: 15
+    symbol {
+      name: "board"
+      priority: -9950
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -127559,6 +127719,23 @@ cont {
 }
 cont {
   name: "tourism-information-guidepost"
+  element {
+    scale: 15
+    symbol {
+      name: "guidepost"
+      priority: -9950
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -127647,6 +127824,23 @@ cont {
 }
 cont {
   name: "tourism-information-map"
+  element {
+    scale: 15
+    symbol {
+      name: "map"
+      priority: -9950
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -127735,6 +127929,40 @@ cont {
 }
 cont {
   name: "tourism-information-office"
+  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
+    }
+  }
+  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
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -127840,6 +128068,40 @@ cont {
 }
 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
+    }
+  }
+  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
+    }
+  }
   element {
     scale: 15
     symbol {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 37537ac71ad62cd89e17762318f303fc771ee8fc..83b9371faa31a72ca8f484f1254f3aec054b6cd1 100644
GIT binary patch
delta 1617
zcmaiz%}*0S7{)Wx0_#}lcDCQ81j>ORu9PAd4yYGUNIYtziFKi?ZD@C4yTowt<6z`q
z3^A)t{KD{I(1aMVl5&w4NfZ-FNc0boizIk~crkjwDYO*mE*>VC_xZgu`{dbqf4%f9
zzVN)BX|MhYkW)yCQd}M6qe@)rjZ2p!R|Hj5u!ms-4sH4k$4vQXVcS{YLeb1{0S7tp
z4svkHr(Nvul{7Q<U5Yn7-Eooy>)M~Q4W=Mt(~gJj+DO<7aZqauJF{Ce4l-O`Pu~hx
zobxXM#O0lB8jAGEaY@~_<tW`YwYlB0M7IS)WFiFpJM3iZ%JiM|ee>aEh@9PmqQpgo
z@0OLQs6={XNmb+o=9!9s6`}52&8M`}v(@Qivx6lK&mm&-r$pK<NIfEMp*gt_-lJ>$
zT#d7Zre=t+G2)DoT_07a$LEfgoquR57*XX!BGN6(Y79FVOTdOK1%*$!7n-SDt|vFr
z0E)Y{k&ixSBV*lzlJue+VvUi_7-3_?86&$s@}_To`W*ug$kiZt1iHut5ge)w97Ls;
z=s)I@?lEU8M&--_HvQuZaBpmEJTp-Zcaag=$mAQzsU}cKrkg;0S?(zL-UPg$lU$2|
z`a)Y)G<7m|aw7)ncFCTh;Sk6Shu};bd}<=?{V;5*WvpbeAJ&+0EyHf^GN1e5`$o6`
z$n8<+1(+<4!d7x-41TM83=mEVQY0xvMSkn~t3u!ZAHQdN8ktoWZO>1ldDVrUkhO8>
zD#_2a;Q$%k0asm_w-fLusQU|1c~TybR3R=!`h-*phv=KJBWqsdvm#H{CSjF}GHWqQ
zlJ!aG&q8)TXxk6s{UEm=wClhOHH5s^W5^;2>VP67ct!5%#Vj>wL1lfS(5uq1p|6Fd
zQ@vNgMG9A>*mo=F6+{*JPo;!tG$CR)b3`vI_q|%9pq4(sDrbl~DoQ^|a!fa-9MerH
Z$MizV-svA&nTK?l=rU(k=1VMh{{e25?nnRt

delta 1768
zcmb_bOHUI~7|p#D7%qiQZ%dzmwP}n%8d@;%u@KovU};PsZt8`OFrl5+=^(*{jVp{h
zGBG#0&_GO(=)yR`5`tBEL>KCYg}*=&H5iE|CT?)r&d8%PMvRk8@||<;neXJg^SyoG
z{Wj-)Jb$+NCqOQe<OE)t2**WU80CfG*f^0m5&Ib%jjX~3=8-=TQW3ic+4mq^M3%xy
z+O-C~#Y#^1_~;cKDe0a;7Ce*J``ds^-tKon?2@AcE`<!7x#0f+kVDT=Y#&RfctP3;
z@yWeAgod;b8qz`(P$@*Qy50!=bbJkZEIRZl8ReD*JdtY_8kO@46P1TP0>lmyQRF!>
z%n6c6gdq;MFl?|ERSgqKZqFY^EsT8^lsBH&%bocqm3Hi=pS~>6jmr1@vFhx@3WW8~
zN~uI5Hke9DBiPMYgAQcfVZs^D>&^h93U$Upl&LoqT0N+iLG0>{DR>l|0G@>p+ocEK
zC}Yd+^CXL1{^(&3Zn2wMvZm3nsmIjfIJm{-H1sHQuP_g$=u!mS0e$q{FlY@15vq)*
zq;S$R<2r>=9aF<98*hL|o#wp?mBW2BF!DF&dg)dav{scqM}-dH1HJU(CD2l>wa~e{
z`#A69dI!j@cfk46a2wK_m*D`ty$EZ;5}h7`4QOdgzuH`z2w$|rJfxe`&<9w0Z3Z5<
z;FFB~cZG`;?V5q_eaishBoSgs66eCD)sjg19~P^sv}Uw>4Z2aOW}HE{Y*QMV10l4c
zZt%W7<6I)~e;dI-D0l8Y{0xq4LR6PbjR_Lrg;<(oGB~0xiF$Q987`0%%)(}8gt3__
ztf^u*Rj{ezFjbs}N>gre7H)d8SCLg9(wImRVKFr{idi+W6;-D>GFtj6Rfa8N>}3ot
zV;p6Sb1#FwKoqLiyJtu|p5TmU`E}WBmYQNPOHDDDrKT9nQd10OsVN4tRF$U5?iHxM
O73yorb+1%fr+xvkp(05D

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 2021c1ef0c..277f3ca94a 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -5522,20 +5522,11 @@ cont {
 }
 cont {
   name: "amenity-drinking_water"
-  element {
-    scale: 15
-    symbol {
-      name: "drinking-water-s"
-      priority: 3500
-      min_distance: 36
-    }
-  }
   element {
     scale: 16
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5543,7 +5534,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5551,7 +5541,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5559,7 +5548,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5576,7 +5564,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -6913,6 +6900,15 @@ cont {
       priority: 2550
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
   }
   element {
     scale: 18
@@ -6921,6 +6917,15 @@ cont {
       priority: 2550
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
   }
   element {
     scale: 19
@@ -13637,20 +13642,11 @@ cont {
 }
 cont {
   name: "amenity-water_point"
-  element {
-    scale: 15
-    symbol {
-      name: "drinking-water-s"
-      priority: 3050
-      min_distance: 36
-    }
-  }
   element {
     scale: 16
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13658,7 +13654,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13666,7 +13661,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13674,7 +13668,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13691,7 +13684,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -14112,6 +14104,22 @@ cont {
 }
 cont {
   name: "barrier-border_control"
+  element {
+    scale: 14
+    symbol {
+      name: "bcontrol-s"
+      priority: 5800
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4200
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -14534,7 +14542,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14550,7 +14558,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14566,7 +14574,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14582,7 +14590,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14598,7 +14606,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -15203,7 +15211,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
   }
   element {
@@ -15211,7 +15218,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
   }
   element {
@@ -15219,7 +15225,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15236,7 +15241,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15253,7 +15257,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15270,7 +15273,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15287,7 +15289,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15304,7 +15305,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15321,7 +15321,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -23529,7 +23528,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -23553,7 +23552,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -23577,7 +23576,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -23601,7 +23600,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -23625,7 +23624,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -50100,6 +50099,11 @@ cont {
       color: 13029267
       priority: -1860
     }
+    symbol {
+      name: "golf-m"
+      priority: 1800
+      min_distance: 10
+    }
   }
   element {
     scale: 16
@@ -50107,6 +50111,11 @@ cont {
       color: 13029267
       priority: -1860
     }
+    symbol {
+      name: "golf-m"
+      priority: 1800
+      min_distance: 10
+    }
   }
   element {
     scale: 17
@@ -53950,38 +53959,6 @@ cont {
 }
 cont {
   name: "man_made-survey_point"
-  element {
-    scale: 16
-    symbol {
-      name: "survey_point-m"
-      priority: -9950
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "survey_point-m"
-      priority: -9950
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -54064,20 +54041,11 @@ cont {
 }
 cont {
   name: "man_made-water_tap"
-  element {
-    scale: 15
-    symbol {
-      name: "drinking-water-s"
-      priority: 3050
-      min_distance: 36
-    }
-  }
   element {
     scale: 16
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54085,7 +54053,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54093,7 +54060,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54101,7 +54067,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54109,26 +54074,16 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
 }
 cont {
   name: "man_made-water_well"
-  element {
-    scale: 15
-    symbol {
-      name: "drinking-water-s"
-      priority: 3050
-      min_distance: 36
-    }
-  }
   element {
     scale: 16
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54136,7 +54091,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54144,7 +54098,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54152,7 +54105,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54160,7 +54112,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
 }
@@ -54331,7 +54282,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-s"
       priority: 5050
     }
     caption {
@@ -54347,7 +54298,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -54363,7 +54314,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -54379,7 +54330,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -54395,7 +54346,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -54411,7 +54362,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -54427,7 +54378,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -56630,87 +56581,55 @@ cont {
 }
 cont {
   name: "natural-rock"
-  element {
-    scale: 15
-    symbol {
-      name: "peakt-m"
-      priority: 2850
-    }
-  }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 17
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 19
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 20
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
 }
 cont {
   name: "natural-saddle"
-  element {
-    scale: 14
-    symbol {
-      name: "mountain-pass"
-      priority: 4500
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
-  }
   element {
     scale: 15
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
   }
   element {
     scale: 16
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -56726,7 +56645,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -56742,7 +56661,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -56758,7 +56677,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -56774,7 +56693,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index f18649a515e2ef4a49a1c436d41a0e6b167e8e68..40ae0f29815ad56950860dd53142ac06322eaced 100644
GIT binary patch
delta 1600
zcma)*PfXKL9LMwCHfSD$wQpPZFT+s}C|DRHcrYgFMH0Ab#CVw9R@}nYlCFesQE$X}
zF)8uIKQTr{gE2<3m}%m_0|62)5-;8iffF8tBk`aQST|wq;-Sf}-_Lum-+cSNw;qSq
zABEn$Js<l95HA&EC8tk`87-%b<&<m5NlBMA9Aa3(Z+Hg%O?2dHBR0o=#w+;A>LT>Q
zR}tgtV8qqW_zo!H()?h81>45PrEU;6*b$z5UvWj)ID-X@T5@SQnbu^fKvq{=Lg~!N
z&gJM=fV`%mJs-(&HK*wNZpfWkXxgdH)K6uu86pcOVe}t6WMc<JONr8q^TZlNd`i-^
zoUDl{Rm;d)GOa4QrslE8v<V)BQk8eHXmq@bmDbBsuI^cgSaX+5S4&D-#sf5=0K$iK
zWA$SPKR^?+Mc5vB?UBzK#f<l#TT2%{bv9qQ=ct*{)qFmgQdK>R{ft}Skh`Xc#o%&3
zm0PXkUK&FEYQwV_;d>d+Ayl9TRS;{BID3Tck=GvitWmghZ0T1P+$F&{xDSTOa29ki
zLJMjdrT>}4`#_kAf8wCK`G7V==%(Yfg<JxJARZz=My=GfKG0?EpQcO8Tmo*NgEJ1|
z)Zs;kz<9{n2^e!?fnh7tX@=XKPL;pt@Iwz=2ITrv7%sOxgB}1LkoH-~yY|{vz0<UA
z)wy=RL)F4Dn*rJgvuv@=0D4G!Q;?KoLCVPDesLz{eEz?BV|Omx43u9yhd)8*Z-`n8
z>V%?8IVCwR6^l4QuZa(NOi|nwMKV7JkMIe4P3lmA+?<2$l(7vM*MQ*$%-ewZY*@4m
zUcy-DMi#jhNuSW9yr`+^G0akjZqz(3OJh1M$`hU{T%CgJ6mOm4JE)-75Ve_~DoUA5
yUdBPD$11Df%uyP!Wl~!UFdCrHGAa{VW@SRluuN!`)-;9manQ$E-db>lZvO=jp4}b*

delta 1601
zcmb`GPiWIn9LIUDUH8noE`90RrtRh&L)oOGoq{Ne>@erXc9cyKOSXnBtWCQ#V@weB
zH2ec9QJ#2^sY4VMbVYhu>(sgJ;=haN%|9m<MK3B|G))#)*R&uQc;x&0eqP@D^5d6x
z7ujP|?Cra|0zU!e=Hk34$P>Y+B#0w|I20M@WM0C4@+1pA=%&A+3HuREo@HUJO|Qt8
zM=Jzt#F{5${{mz+r6fCjL@}y#va^Q<StZ-I(c(r<<!Haliron7B7_)Kw5AXBFYRT&
z1Bx*MX*nXvgdoaBnh&1BG<v0{StiSA@|B)OQ<uEZPtGntuhl4hX;1o`70f8NGJ*7u
z%tXc7_kf}YI7t$CDaebm#EFAEZbo!t6=fUZWTic~PI)!wP&#sT%JF;Jn`%Z(A>MaC
zZwJ!nbDJx<8x{&1=gEm!EHaQt$ivu!?2Qa%UvYvd@6x6Qq=IU55JnDDp!6>KSR6(*
zt7u$1&!BW!>MTofS;~~9E>oKBU0fr8Go&vBE`V-wY8bRsHd0hYG$E7GFbI&h!=Sm)
z@qsRKG7MU5%bT)c;InighCGge4SzP~U3KGgq2OcHV<*KnkP+M9%Xat;lHD@gQ^lYf
zUky4k)8m~bqdTF?G5htG{s6okImwg^8!~7NzG#IxNM2uoK0uSvX}HCTx2o7sSX0W{
zJBVzXhEKf@0EOe67>RRHKBy0_%q9PEY;F1wlLHITW9T<I=&8^9)I;^xSaroXAB+8`
zJG4I|({UAk1nWORsydz+6J<^iBS|im!Xb4A@roJDn`G`9tapXf`71@}lEhh(;F5$X
zNnAxFbNV{m!5%(H*+otslekz=N(_!*S`BNbDw8}nA_wE%%Wl=7iyUW>gNq!d$Z`Gc
zP@f^y<S=eeanWduH*aJ2Jglo#kx3s7WYS0jnRL=XCapA(NiPjl+{{T8smr1+Yo>d?
Hf<5sYd2i?B

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 170b61178f..15bb7f9e3b 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5522,20 +5522,11 @@ cont {
 }
 cont {
   name: "amenity-drinking_water"
-  element {
-    scale: 15
-    symbol {
-      name: "drinking-water-s"
-      priority: 3500
-      min_distance: 36
-    }
-  }
   element {
     scale: 16
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5543,7 +5534,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5551,7 +5541,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3500
-      min_distance: 36
     }
   }
   element {
@@ -5559,7 +5548,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5576,7 +5564,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -6913,6 +6900,15 @@ cont {
       priority: 2550
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
   }
   element {
     scale: 18
@@ -6921,6 +6917,15 @@ cont {
       priority: 2550
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
   }
   element {
     scale: 19
@@ -13637,20 +13642,11 @@ cont {
 }
 cont {
   name: "amenity-water_point"
-  element {
-    scale: 15
-    symbol {
-      name: "drinking-water-s"
-      priority: 3050
-      min_distance: 36
-    }
-  }
   element {
     scale: 16
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13658,7 +13654,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13666,7 +13661,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -13674,7 +13668,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13691,7 +13684,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -14112,6 +14104,22 @@ cont {
 }
 cont {
   name: "barrier-border_control"
+  element {
+    scale: 14
+    symbol {
+      name: "bcontrol-s"
+      priority: 5800
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4200
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -14534,7 +14542,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14550,7 +14558,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14566,7 +14574,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14582,7 +14590,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14598,7 +14606,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -15203,7 +15211,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
   }
   element {
@@ -15211,7 +15218,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
   }
   element {
@@ -15219,7 +15225,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15236,7 +15241,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15253,7 +15257,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15270,7 +15273,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15287,7 +15289,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15304,7 +15305,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15321,7 +15321,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -23529,7 +23528,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -23553,7 +23552,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -23577,7 +23576,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -23601,7 +23600,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -23625,7 +23624,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -50364,6 +50363,11 @@ cont {
       color: 1251584
       priority: -1860
     }
+    symbol {
+      name: "golf-m"
+      priority: 1800
+      min_distance: 10
+    }
   }
   element {
     scale: 16
@@ -50371,6 +50375,11 @@ cont {
       color: 1251584
       priority: -1860
     }
+    symbol {
+      name: "golf-m"
+      priority: 1800
+      min_distance: 10
+    }
   }
   element {
     scale: 17
@@ -54196,38 +54205,6 @@ cont {
 }
 cont {
   name: "man_made-survey_point"
-  element {
-    scale: 16
-    symbol {
-      name: "survey_point-m"
-      priority: -9950
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "survey_point-m"
-      priority: -9950
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -54310,20 +54287,11 @@ cont {
 }
 cont {
   name: "man_made-water_tap"
-  element {
-    scale: 15
-    symbol {
-      name: "drinking-water-s"
-      priority: 3050
-      min_distance: 36
-    }
-  }
   element {
     scale: 16
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54331,7 +54299,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54339,7 +54306,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54347,7 +54313,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54355,26 +54320,16 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
 }
 cont {
   name: "man_made-water_well"
-  element {
-    scale: 15
-    symbol {
-      name: "drinking-water-s"
-      priority: 3050
-      min_distance: 36
-    }
-  }
   element {
     scale: 16
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54382,7 +54337,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54390,7 +54344,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54398,7 +54351,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
   element {
@@ -54406,7 +54358,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
   }
 }
@@ -54577,7 +54528,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-s"
       priority: 5050
     }
     caption {
@@ -54593,7 +54544,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -54609,7 +54560,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -54625,7 +54576,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -54641,7 +54592,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -54657,7 +54608,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -54673,7 +54624,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -56856,87 +56807,55 @@ cont {
 }
 cont {
   name: "natural-rock"
-  element {
-    scale: 15
-    symbol {
-      name: "peakt-m"
-      priority: 2850
-    }
-  }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 17
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 19
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 20
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
 }
 cont {
   name: "natural-saddle"
-  element {
-    scale: 14
-    symbol {
-      name: "mountain-pass"
-      priority: 4500
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
-  }
   element {
     scale: 15
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
   }
   element {
     scale: 16
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -56952,7 +56871,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -56968,7 +56887,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -56984,7 +56903,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -57000,7 +56919,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index 62bc4dc135c5cf12534761d78d615068a66f6393..8a9fe6a796d13f2d8570042adb628599cd3926e3 100644
GIT binary patch
delta 3352
zcmcJRZ)_7~9LMuKx82Ia);~|%+tyOXHvR}($7CWx6d0lsi3$V^a~s{YD^j=iN_)eg
z5jG+*Dw>odK2f6yM9>hj%#~5BVe)4Xg7QLN;51PZUuZ-`=37|w*FV>F*IVE5V%_)o
zeD8ku{oSv9?%w{~adyx#G|^zaiO6g*=nn<ty>72}H+{%pR+<_YBTMQt&NU7@&;{kp
z(+5ji45m7}vU$XcPdSzMpK$^(Yk@@zs1{hYz?Kgj@i#YYFrx|O`t}B{*<evR+nO+K
zRxE9TvZl?2tSJz0Yg@GrMcIW@cwYSU$6uGe@FOB7wFg-W^!nu}r4ZLhW@VS|VATx{
zm|2Hev@Cw$Xb(lB%ANRuT-SEx;gPA9)m5fnb(LvWU1d5|SD7~LY<DYm#*-sQO7Od!
zvMK3oD6caS;`K=(IU@DCqg7wHsnt+X2;BywGLUSF_a{%3HXO&q>=h%CfIs5)!<k~p
z=cmh|yGlYeT$wmOuM#{<5swz}tVKMVju)Re-&5B9AvYC7mU??VUP+R7QM;kM&O*wk
z2sC`P1#pEPUTQGvVCC*rr?3>JJH1d43S}+x%$8+li_UCWXSQtmmLopv+C(23V)xdd
z)o3Lfd>u8K>ShyurxfXiFXJ(Ru4H!$;YK#N7B!S*4`esjA_v;YhW4Q)2KDR|oWlm@
zBPZK*098!!3$1YQvn<w%mgEX#S<@S6@w5Z06ARX%mwf09>pza{)B<<9f*8U9Unt;%
zc;l|bk>hCVZTtzxZpH9+uHIl`yAR{q5?XICr&S_&7}qzTlPq=)FW+y10uVYVMrAnt
z2cDW>KpJ4y0*e+<EwE~VZ5kj6j#z_Y$dgz-iiZ*UfK7aZYc*jma+)w{kRK)u^24M-
zewZ}K50eJ@VJ>pyGA0%2Fz=klcd+Xtj@VPnpxEtqNBbgs{ChoNDG-urjlswU#;~h|
zu7ukPY6Xj3!V6h2i3N835?+u|hA~w=nN$0+%FfP?VG*5Uj>~x9foxJ}l>L4MKbQ?L
zF?<!@Lamb=+%TyxB#VKNCoD#zw8}8M&PGfsbf+L}5y?e#8SESd4*TgEt`U~O?onU`
zS@>H#7d&GT&s4-S>v^wyhh3GB#Zt_q#Y}54)23r4;F{yE{f7`K4~cSLMC^4(Bwr6T
zLucirEbJG1WVl7Jp_t((rzPeBVkscBfLIGi&^8^B`<NKjJW;W`yVnoH)0;!pk$Q0S
zrjT-$L1vxViGQVMr#pl9ZWoz>YU<8FHFam8nz}OpbM&+QBk-yemR^NtuAKU$0<=X*
zMIM5^4|WCtn$qXy8MtKzPV;$7>dM&*So4iMZqx9$#$p`&l_bVur3Z(VD@lQQ*7L5E
zNE}|zBV%KXBNkceiv*%Uw@(a)J<)*dr%TgMWRe1@HGILwUGvJ>(QUj78QCve_@>0q
zTlhJs<upfZQ>RD7J+R}YE3`lbJ2CpiDVA5o$xK`MYLu?%Wb5<v-mUz9!XNPM%2nMZ
z!V4WFGP2qi`6_l|8()P?X`KN5RH^G8CRX+6KnR|&K~WA!A^I51!NL05c?bJ+3_D8b
zDtLD7Yv=3P(ImFB)$RPEjCw7n&g9g;StX$FS#t;PGB&5DTI!X=NO#pSWoU9fd#;0@
zo2k&>!PjKe>705#iObkO9S}KvxjCJgLxe?tW8%`u>wdW}(CrUPQJFph*Am!JCod>p
zO**+pA@^YRbUQoQsdn&NPC0g{Y)e)N=n^}$gLjrUK`k@kf?_z68s4kTY^{f{&cqtu
z!MiewcvSUxPKB~cn16#K4!zLQ&Yb~x`E<d!tJ#-bd^Jy3!0#fXS*#0cUi3h?8ZX?4
wNl-BK+Ae-o=3gbdFRG}L4R%fGKQnss6WE5yudH6=7nVNAizH5Z`J2uE15V5F0ssI2

delta 2898
zcmcImeQXnD7|;8by*uBIuDz~D*REsh02xp=Bqm4%*$m^uh%w4!8rNOhn^e}`Xm1!6
zu|R@C{DY7~pFcD)pcxVjSytf)AY{lUAo!JNFeWM*m+&FTANm(M-@AU$bypK&Xwv5Q
z@&2BB+UNST#}0dT9q<g^p6h%QQL7k};!$ODAQalj&*pe_{=CNYws|`}=#olT?0~LY
z*gfSVZ`};_#}!_H3GC&uLa*$PLUwtAmn`r+>5D5@+R-Pft79$_)RqpRh8H;A&r@qO
zECs^}NsI+z?!TOMZoZjws^53aPk-C7xE1)rxIW$d?ujzzJBU{1`c~v<kEA5ii}!Ef
z(FJwj<L#NAuT5h;UpbQPInRuq^UUZu&y1e)%;-7GJZb6ZTT}37SiN)H%iH{wl!n4`
zTuI11tkn+#>DY;bWz(-BY7dEtL{v%yBxZ{7u*5fVcE6R9mqbNv8Lp>|oTGrMZJ*lI
z<-<NEI}2rDM3-yQOU^t|o;qZqe6Fk__w)oqvaGD<r*Rd2C#|@v1d{G^3+p&$Of@$a
za5ht8j+<IJYCpSk51x${A@{N0#xoDZFW@RuMVXj!mH*7x?>*uu8A+9FjW3xg8FAiw
zM5r>&q#yX)x(OWwR|{H-7QvUVqIotyrDYLWVYkG7fnNlUEydbuNTtx6^6WXd(}Fx`
zHGEyHSypj83^ySUY;8q0lBo(;TG{DU;CKx+<||~ir;4;{t?hC2d>FkC`v#CpJ3oM)
zxq-(q)T($LH15DwbP@(PVi!GmJ2z_Ww2B+%vc#{a@WV|ucB|yy%r}I$ag{~fUdUnZ
zC~nbqpT@@#+6}9RaeZ_`g)^3k6%1Zb!QhU&6%Ec8ac2>)%5d$6Vf;6)K82|(CdPv?
zF(L($eThxd=3uWJjVtiv2%ZIBbrJz~jo_IXbT)_7t?6<gqqx@4)mua5uy!QFT%e3%
z5uJzcM)9`$u~aa<0B@he_hn&eYcJsIXvtLzof?z-;))oJ2Ybb2lC4@RTeW#Hpo{L~
z53*HTQLMwZi+FlfGg~Lc0jRx%Ynfv!=~R|<?310FnQD%bj{fT~v1Q0+oF$zqQ^%)0
z_60uSOZC%=xTy3c#GXJx4sYP?>;|u(<-L-)A^ZKcv&CJkI3_9lB*i&NshX(JYZkiP
zmb-dVj6`}Q^Reu0FdIwKy|*E=e&N;)>@pwF*o{&H$~q<k$~q<kTJyV6&167X$7DcR
z$7DcR$7Ddv@oD8Z@xBjITd1{Heue##D*7v19|a5Pey$UJ`e!WkjV{%~o>R0gwJbFR
zhuYZs_;We&8AzMmMv%?*Go}tj?n^|Iu|Qai^#+qsMbhMF$r_|D+tX`FHB4<M(@-t!
zIe@&dtesTna9=wa7mi|T%NJNLvi~uB6ITg?>xdho2aup$eU3Dhd51A|=8i?<-Etx(
zDp5JkFXrq}-$@$O_I?2dUL>;&@QV({#@$fYNoFum16`e@jsX{@?*ViYpXDJId^$+H
z#(7VW)EZ!o4#vg>*q#GNGk^s(xE>_+(Aq`(#@YTH7}9|rx|Rce(NI`Og%?EPwKTJ<
zZ48lWBY0UPH3py|2K3;gS)eur2q+;U=&d%;e=zl!yy<}4-Oc_c@{h33sU<@EaAYYK
sV4*~2W>7qj4(iA!v5#_0A`Ka|ERsR2x!0jTLS|Y1XC1AhoBY)LFHp3tO#lD@

diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 559d188980..8925735658 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -3414,6 +3414,38 @@ cont {
 }
 cont {
   name: "amenity-bbq"
+  element {
+    scale: 16
+    symbol {
+      name: "bbq-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bbq-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
   element {
     scale: 18
     symbol {
@@ -5557,7 +5589,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5574,7 +5605,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5591,7 +5621,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5608,7 +5637,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5625,7 +5653,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5642,7 +5669,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -6979,6 +7005,15 @@ cont {
       priority: 2550
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
   }
   element {
     scale: 18
@@ -6987,6 +7022,15 @@ cont {
       priority: 2550
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
   }
   element {
     scale: 19
@@ -11949,7 +11993,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "shelter-m"
+      name: "shelter-s"
       priority: 1500
       min_distance: 10
     }
@@ -12457,6 +12501,27 @@ cont {
 }
 cont {
   name: "amenity-toilets"
+  element {
+    scale: 15
+    symbol {
+      name: "toilets-m"
+      priority: 470
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "toilets-m"
+      priority: 470
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "toilets-m"
+      priority: 470
+    }
+  }
   element {
     scale: 18
     symbol {
@@ -13784,7 +13849,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13801,7 +13865,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13818,7 +13881,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13835,7 +13897,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13852,7 +13913,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13869,7 +13929,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -14290,12 +14349,35 @@ cont {
 }
 cont {
   name: "barrier-border_control"
+  element {
+    scale: 12
+    symbol {
+      name: "bcontrol-s"
+      priority: 5800
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bcontrol-s"
+      priority: 5800
+    }
+  }
   element {
     scale: 14
     symbol {
       name: "bcontrol-m"
       priority: 5800
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4200
+    }
   }
   element {
     scale: 15
@@ -14732,7 +14814,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14748,7 +14830,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14764,7 +14846,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14780,7 +14862,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14796,7 +14878,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -15410,7 +15492,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
   }
   element {
@@ -15418,7 +15499,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
   }
   element {
@@ -15426,7 +15506,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15443,7 +15522,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15460,7 +15538,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15477,7 +15554,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15494,7 +15570,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15511,7 +15586,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15528,7 +15602,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -24784,7 +24857,7 @@ cont {
       cap: BUTTCAP
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
   }
@@ -24801,7 +24874,7 @@ cont {
       cap: BUTTCAP
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
   }
@@ -24817,7 +24890,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24841,7 +24914,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24865,7 +24938,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24889,7 +24962,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24913,7 +24986,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -33252,6 +33325,13 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 14
+    symbol {
+      name: "picnic-m"
+      priority: 3800
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -52937,6 +53017,11 @@ cont {
       color: 13029267
       priority: -1860
     }
+    symbol {
+      name: "golf-m"
+      priority: 1800
+      min_distance: 10
+    }
   }
   element {
     scale: 16
@@ -52944,6 +53029,11 @@ cont {
       color: 13029267
       priority: -1860
     }
+    symbol {
+      name: "golf-m"
+      priority: 1800
+      min_distance: 10
+    }
   }
   element {
     scale: 17
@@ -56391,49 +56481,49 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 15
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 16
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
@@ -56589,49 +56679,49 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 15
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 16
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
@@ -56900,7 +56990,14 @@ cont {
 cont {
   name: "man_made-survey_point"
   element {
-    scale: 16
+    scale: 14
+    symbol {
+      name: "survey_point-m"
+      priority: -9950
+    }
+  }
+  element {
+    scale: 15
     symbol {
       name: "survey_point-m"
       priority: -9950
@@ -56915,6 +57012,22 @@ cont {
       priority: -10000
     }
   }
+  element {
+    scale: 16
+    symbol {
+      name: "survey_point-m"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 17
     symbol {
@@ -56923,7 +57036,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56939,7 +57052,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56955,7 +57068,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56971,7 +57084,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -57048,7 +57161,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57065,7 +57177,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57082,7 +57193,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57099,7 +57209,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57116,7 +57225,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57133,7 +57241,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57183,7 +57290,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57200,7 +57306,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57217,7 +57322,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57234,7 +57338,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57251,7 +57354,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57268,7 +57370,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57448,14 +57549,14 @@ cont {
   element {
     scale: 11
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-s"
       priority: 5050
     }
   }
   element {
     scale: 12
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-s"
       priority: 5050
     }
     caption {
@@ -57471,7 +57572,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57487,7 +57588,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57503,7 +57604,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57519,7 +57620,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57535,7 +57636,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57551,7 +57652,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57567,7 +57668,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57583,7 +57684,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -60092,110 +60193,76 @@ cont {
 }
 cont {
   name: "natural-rock"
+  element {
+    scale: 14
+    symbol {
+      name: "peakt-s"
+      priority: 2850
+    }
+  }
   element {
     scale: 15
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 17
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 19
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 20
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
 }
 cont {
   name: "natural-saddle"
-  element {
-    scale: 11
-    symbol {
-      name: "mountain-pass"
-      priority: 4500
-    }
-  }
-  element {
-    scale: 12
-    symbol {
-      name: "mountain-pass"
-      priority: 4500
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
-  }
   element {
     scale: 13
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
   }
   element {
     scale: 14
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
   }
   element {
     scale: 15
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -60211,7 +60278,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -60227,7 +60294,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -60243,7 +60310,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -60259,7 +60326,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -60275,7 +60342,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -73693,49 +73760,49 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 15
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 16
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
@@ -126382,7 +126449,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -126399,7 +126466,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -127607,6 +127674,23 @@ cont {
 }
 cont {
   name: "tourism-camp_site"
+  element {
+    scale: 13
+    symbol {
+      name: "campsite-s"
+      priority: 3800
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6200
+    }
+  }
   element {
     scale: 14
     symbol {
@@ -127724,12 +127808,29 @@ cont {
 }
 cont {
   name: "tourism-caravan_site"
+  element {
+    scale: 13
+    symbol {
+      name: "caravan_site-s"
+      priority: 3800
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6200
+    }
+  }
   element {
     scale: 14
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 30
+      min_distance: 12
     }
     caption {
       primary {
@@ -127746,7 +127847,7 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 30
+      min_distance: 12
     }
     caption {
       primary {
@@ -127841,6 +127942,22 @@ cont {
 }
 cont {
   name: "tourism-chalet"
+  element {
+    scale: 14
+    symbol {
+      name: "alpine_hut-m"
+      priority: 3800
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6200
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -128308,6 +128425,22 @@ cont {
 }
 cont {
   name: "tourism-information"
+  element {
+    scale: 15
+    symbol {
+      name: "information-m"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -128317,7 +128450,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128334,7 +128467,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128351,7 +128484,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128368,7 +128501,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128385,7 +128518,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128396,6 +128529,22 @@ cont {
 }
 cont {
   name: "tourism-information-board"
+  element {
+    scale: 15
+    symbol {
+      name: "board"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -128405,7 +128554,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128422,7 +128571,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128439,7 +128588,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128456,7 +128605,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128473,7 +128622,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128484,6 +128633,22 @@ cont {
 }
 cont {
   name: "tourism-information-guidepost"
+  element {
+    scale: 15
+    symbol {
+      name: "guidepost"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -128493,7 +128658,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128510,7 +128675,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128527,7 +128692,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128544,7 +128709,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128561,7 +128726,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128572,6 +128737,22 @@ cont {
 }
 cont {
   name: "tourism-information-map"
+  element {
+    scale: 15
+    symbol {
+      name: "map"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -128581,7 +128762,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128598,7 +128779,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128615,7 +128796,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128632,7 +128813,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128649,7 +128830,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128660,6 +128841,29 @@ cont {
 }
 cont {
   name: "tourism-information-office"
+  element {
+    scale: 13
+    symbol {
+      name: "information-office-m"
+      priority: 4400
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "information-office-m"
+      priority: 4400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -128669,7 +128873,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128686,7 +128890,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128703,7 +128907,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128720,7 +128924,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128737,7 +128941,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128754,7 +128958,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128765,6 +128969,29 @@ cont {
 }
 cont {
   name: "tourism-information-visitor_centre"
+  element {
+    scale: 13
+    symbol {
+      name: "information-office-m"
+      priority: 4400
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "information-office-m"
+      priority: 4400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -128774,7 +129001,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128791,7 +129018,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128808,7 +129035,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128825,7 +129052,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128842,7 +129069,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -128859,7 +129086,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index b7dfe2b599714147c575e7c77b4925069ae8ec4b..676b69f9817cdcab935e41ed0e120a20e4819a28 100644
GIT binary patch
delta 3400
zcmc(hZERCj7{_zY?au1i*4}&C-E|#>t?1asy3Gyb<%8RZ2$2NT#J#}AxZ8?rSliKd
zB77M$8jXO7c5o0)48E}-%1a$h=EQA=F(oRRfEeTJ7mY&Vz8Dge`1JN=eYxE?^+VhL
z{r&HK&hy;o?AbZ>s`cA9tY_wyn|?qvPjNdvuE1VLclT~qp%;TS)s;w!e20YUb5=AJ
zJpbS`LWADOn=fIL&TTnW5`1Ap2@o-ZNEw7>5K{&*rx0uC>5cUwnhS>8mJ4-yDY&7%
zM#t*(EFwZud-*!#=QXEsX{ha$4|2AAji@nRLBQ+kcLw~7>5X;+y(@O<a9gekz(fru
zrL$1^@m&mE2)-10Dp51vKZ|v|c|D#lIt4|mPC?PKQ&6<-6cjByfvlm<vBSEJ2Lvj2
zD?Xpg>2q{@eZ5X!SC7{d@Ok^0NuO^wQraE6cK9u$4uA!j(4jX3e;Tg|-97$x&hob~
z72^?|5J~a$IN3^gAw`s>@nGX*nY>ajWw%&%%aq+RYg?tEvB^!j=;a`ql^-aC>Li*U
z@b>q2b$h*mKB#ZDffYi18n{+((7-`uwnVOl{--|ShCne(%x+29EtcIfWw*@QmNoS5
zC%+D&GyF&+x?fnMH}IxmRAsd1QL+;n4jcA$nXTc*Cgd=ruuXi)5USG0Z{+)$kQHs>
zyVKz!{&N$m%#A(ErDnM8Azs~#s?wRVA63rBgBy#(lg+4bXT^C;r9Ri=eS4I>4xiH>
z=u&)6g-P(z3#fj;)#GvXK%Uoa;onZ6i5qxC;G-k>F~JUVqUta%)iFEFhlmQ7AI8sD
zp_BaVM|kCs5duJ3Zp9yf$G;-X2)#-JVmgr00ZRv_bYM;aG%Qe)Tk&*-w@>182p!?l
zG%ia^W?D!~Mg_^qs318R6(lF4g5+dWketl4K#yWtpeA#28c$(-OyKT|*di=}eQ@U@
zw&~a!c!{9aA~Et~=Z7Y+%qK76d!p)gLftnLXS-vnkiRp774#u5xP*uQ`w52W1^&$}
z{vT#%_{~r8?`Zws0=!%ApeLZXJY55d-_I=iJiD11<IoX-Fj&Tyv3i&{nhxJ_6qm^L
zFn2O+H^28Yycj&g0-kXJPt@`{KgYHr$VXbpWDA+5g-o-C8HP3UY(obT&G#sQL7&p^
z@OgW7F%c@ur?~@8Wmf=R6AU5|{zB7<m_eir!ZL^{gAAEd5&a8OLp&e9(%akbga&H$
z!7{QG9IY-yoO;MPvv=TBS!kX<PrQ2aDy~4Q5x;x`=R-F&yE1%J?X+f7VxDGCVxDG8
zVxCq<IC!@3m7DnVYeQpjE*tRfffGO=^37zZl+l7D1k)2{iwt#Yb1@5-vT&Bn8zL*m
z7BD3nN!*;qpS^WRfR8SG>rl=YXZhGLk@<Ix#HOmS*hG+_`bB|C0q>yC<##)J6!$=v
z-xYAOTJ;}1jey8C?7Hi=(tQ5oD6;CnH1KVkNlmzIGg*Wh-WRBOK7vnq0*1O8qyd5y
zQbUh2&yoZ2gIkCdMT7FGd41x~Ed<HGz^+R~?Ni_osjiD2B^G{Q6v+adD0t#3y!H`N
zo1?ppsfnL$B__gFLmRC8P7AT}k{MjWhg(QFpPImhe4>Rci>g}*wW2l724YG^U-I`_
zi7mfQ?PpH6SMl|7aR!(3%dKQ_G{Bu!vLveN+v3VIfpfXL4boIsI~Fr!bdz6cBV{=&
zAfC)?+MyR}VsmZ89=)}qoh*&29SL<bp{~S~tos<#qDYlygIgJ3H4smv0!TGGIG>CB
zkFBIQ8mVO~v|CN&xr7=|s2edQ<7)yh+eU0THt1O~uk9ekgsp-d9@X5~L2Ss#=Q_zM
w{^T}N4sCn5gB0<`PO>zv_a*7-jyPWncIi4?h`#5?J4pGzw?MdZI}z&s0lH1(vH$=8

delta 2775
zcmcJRdu&rx9LICc-OlRS*2nE*UCTz-;&5Y^4TuSnXto)}@rPzXB4f;Px0S83_RjV$
zh*2I!z())*clv|OWC)3oNa9EdH$yNh4>#rr#6L7fB`(JBP&Xz9d?d`%+m5x{?P6kR
z(%$d)`?=?LZtw4&(|&i@b@T&Q|Kt+u+lc0hL4PP9ZxdQtUgRG#@XFGPvgodgH(cnV
zLRasGJy)?a>!{naNV&4w4aaY$x<AsGcQTbVq`3pvW|%8F`qXkWI;~8tU&1*I7UkUr
zTNdwNQ!^2Lr=he~`Ki|z{knG`+uDn$Y5D?XDbVScBhf1#ZsF00vgY_}iHo~Y;8_G?
zPhuBDZ{otN8GGw$nk|`3v+L9C{%a}J9i=CFvhWaA4xV)LMz4v|mR2bwhow#-==@lS
zT0T3Hz3@7s<`yv=4*0`@pFuIy>gUT0W^XPf?V_y2VjgAXIg@fewm`XlMmy#*ZcXI_
z=S<P_vGyGC6OQuJ#bl|ov$;i*<PN^Tkmt41yqQFZIEPnw3=HJ!gJlMzE>K<>aXXh8
zOtWB6E0=`k`JiP!$j=9@^FdoC=!y=FT<b<hpuZYDhE~EvH4^eE&2E!q)`UY2ekJtp
zMioYHYPJTdccOA{YPO1}`GyC~cgBC<oI4Ml+t0<vu7T&a|CjUXV5$a{lf)EIRf}9)
zoxuv*Uq_2`l9OmDssqaoRF;|*s$;dtzS({lQ%gsny<@AmO$hrVa<drri)!%^bm~`p
z8^ibS;dSu$CQQ*O82lOA=&8x6#0#k}y^r52M~8un;fE`Ytg-jL>Q{s}vR<ZpbE=2E
z!?;HMG=@(iv=3f5i%SA&70z(!6*QkxLGzZGikjzVdFw21OL+C4v-mQ`pJTZA1$IKs
z5PncGMxC&I2>UcKkPt=i*AOn&lFDHX*`a+Hi|7Je7{<Hq-}*))@a71<j~j?uH;Qkd
zn(G|R4@%u3Sqy}lyTnL@?Q^+a_CQXDLOgVyT+COog|3ss*a7UeRk6iB8-nE$E@s4-
zk(e?P^IS5PsAkDX_>9Dwk=S%ek-Gdc9$&EIWttZf<?gW9DTJlgExegM(0Mec%P($8
zu5dHkOlK#SISD@}vCc_s=?T5T(I<@4vq!|Xwobo(YkGY8t?BWVJ87<g!m)8|*KbhX
zc%}v=iB5x(M5jU3iE26xN)nw0C5cXhl4Nd!RPzKL?c4Dx&Fzx5vL7}%{>gTVl)dME
z?i}&PpW*1<o_!p9XQ@5=vM(HivRdMRNDV2{l=@K(K}P$JY+se7?r<Oy6k5e#S92sF
z`_<o`Ax|Sbh2hb9QizNYt0xXr454~9c(9%nB(xiD)srd52~3UmN_2?q?*(6JFu~Gi
zi4#0)iBk=%B|^44hN*S>v_NRH6b_1VKnn4z3})zSAU@?plO22wWU(fi<Kp&RJM<=n
z(l?a@R~m?irH+z5Obd022`!QsZsV7;l9x6Rw^j)@kcFD~GA`mJ2T$W1AdSSSxfP9C
z>_9368c7KZHWIIP{+-6;MOAKOB0jKvTJ$A^11a$BM&jnG*n|^Jq);2Tu89<BVsBi;
z#|<QfvQ)@{-<ybor4D=-gXeit#67}p)<KbYVeRAC4*i=*X+r&SPnC)+>)pieXPZcT
Y3DuWWc1-ucpUtH7|JG5z5lL3nzw6<78~^|S

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 38dcbecd84..8bdd6542b3 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -3414,6 +3414,38 @@ cont {
 }
 cont {
   name: "amenity-bbq"
+  element {
+    scale: 16
+    symbol {
+      name: "bbq-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bbq-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
   element {
     scale: 18
     symbol {
@@ -5557,7 +5589,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5574,7 +5605,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5591,7 +5621,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5608,7 +5637,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5625,7 +5653,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -5642,7 +5669,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3500
-      min_distance: 36
     }
     caption {
       primary {
@@ -6979,6 +7005,15 @@ cont {
       priority: 2550
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
   }
   element {
     scale: 18
@@ -6987,6 +7022,15 @@ cont {
       priority: 2550
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
   }
   element {
     scale: 19
@@ -11949,7 +11993,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "shelter-m"
+      name: "shelter-s"
       priority: 1500
       min_distance: 10
     }
@@ -12457,6 +12501,27 @@ cont {
 }
 cont {
   name: "amenity-toilets"
+  element {
+    scale: 15
+    symbol {
+      name: "toilets-m"
+      priority: 470
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "toilets-m"
+      priority: 470
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "toilets-m"
+      priority: 470
+    }
+  }
   element {
     scale: 18
     symbol {
@@ -13784,7 +13849,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13801,7 +13865,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13818,7 +13881,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13835,7 +13897,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13852,7 +13913,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -13869,7 +13929,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -14290,12 +14349,35 @@ cont {
 }
 cont {
   name: "barrier-border_control"
+  element {
+    scale: 12
+    symbol {
+      name: "bcontrol-s"
+      priority: 5800
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bcontrol-s"
+      priority: 5800
+    }
+  }
   element {
     scale: 14
     symbol {
       name: "bcontrol-m"
       priority: 5800
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4200
+    }
   }
   element {
     scale: 15
@@ -14732,7 +14814,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14748,7 +14830,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14764,7 +14846,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14780,7 +14862,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -14796,7 +14878,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "gate-s"
+      name: "barrier-entrance-s"
       priority: 220
     }
     caption {
@@ -15410,7 +15492,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
   }
   element {
@@ -15418,7 +15499,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
   }
   element {
@@ -15426,7 +15506,6 @@ cont {
     symbol {
       name: "toll_booth-s"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15443,7 +15522,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15460,7 +15538,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15477,7 +15554,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15494,7 +15570,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15511,7 +15586,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -15528,7 +15602,6 @@ cont {
     symbol {
       name: "toll_booth-m"
       priority: 6600
-      min_distance: 8
     }
     caption {
       primary {
@@ -24784,7 +24857,7 @@ cont {
       cap: BUTTCAP
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
   }
@@ -24801,7 +24874,7 @@ cont {
       cap: BUTTCAP
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
   }
@@ -24817,7 +24890,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24841,7 +24914,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24865,7 +24938,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24889,7 +24962,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -24913,7 +24986,7 @@ cont {
       priority: 200
     }
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 2850
     }
     path_text {
@@ -33405,6 +33478,13 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 14
+    symbol {
+      name: "picnic-m"
+      priority: 3800
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -53201,6 +53281,11 @@ cont {
       color: 1251584
       priority: -1860
     }
+    symbol {
+      name: "golf-m"
+      priority: 1800
+      min_distance: 10
+    }
   }
   element {
     scale: 16
@@ -53208,6 +53293,11 @@ cont {
       color: 1251584
       priority: -1860
     }
+    symbol {
+      name: "golf-m"
+      priority: 1800
+      min_distance: 10
+    }
   }
   element {
     scale: 17
@@ -56646,49 +56736,49 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 15
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 16
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 850
     }
   }
@@ -56844,49 +56934,49 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 15
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 16
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "mast-m"
       priority: 450
     }
   }
@@ -57146,7 +57236,14 @@ cont {
 cont {
   name: "man_made-survey_point"
   element {
-    scale: 16
+    scale: 14
+    symbol {
+      name: "survey_point-m"
+      priority: -9950
+    }
+  }
+  element {
+    scale: 15
     symbol {
       name: "survey_point-m"
       priority: -9950
@@ -57161,6 +57258,22 @@ cont {
       priority: -10000
     }
   }
+  element {
+    scale: 16
+    symbol {
+      name: "survey_point-m"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 12
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 17
     symbol {
@@ -57169,7 +57282,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -57185,7 +57298,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -57201,7 +57314,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -57217,7 +57330,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -57294,7 +57407,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57311,7 +57423,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57328,7 +57439,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57345,7 +57455,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57362,7 +57471,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57379,7 +57487,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57429,7 +57536,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57446,7 +57552,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57463,7 +57568,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57480,7 +57584,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57497,7 +57600,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57514,7 +57616,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 3050
-      min_distance: 36
     }
     caption {
       primary {
@@ -57694,14 +57795,14 @@ cont {
   element {
     scale: 11
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-s"
       priority: 5050
     }
   }
   element {
     scale: 12
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-s"
       priority: 5050
     }
     caption {
@@ -57717,7 +57818,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57733,7 +57834,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57749,7 +57850,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57765,7 +57866,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57781,7 +57882,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57797,7 +57898,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57813,7 +57914,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -57829,7 +57930,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 5050
     }
     caption {
@@ -60318,110 +60419,76 @@ cont {
 }
 cont {
   name: "natural-rock"
+  element {
+    scale: 14
+    symbol {
+      name: "peakt-s"
+      priority: 2850
+    }
+  }
   element {
     scale: 15
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 17
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 18
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 19
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
   element {
     scale: 20
     symbol {
-      name: "peakt-m"
+      name: "peakt-s"
       priority: 2850
     }
   }
 }
 cont {
   name: "natural-saddle"
-  element {
-    scale: 11
-    symbol {
-      name: "mountain-pass"
-      priority: 4500
-    }
-  }
-  element {
-    scale: 12
-    symbol {
-      name: "mountain-pass"
-      priority: 4500
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
-  }
   element {
     scale: 13
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
   }
   element {
     scale: 14
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5500
-    }
   }
   element {
     scale: 15
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -60437,7 +60504,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -60453,7 +60520,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -60469,7 +60536,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -60485,7 +60552,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -60501,7 +60568,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mountain-pass"
+      name: "mountain-pass-m"
       priority: 4500
     }
     caption {
@@ -73908,49 +73975,49 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 15
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 16
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "power-tower-m"
       priority: 450
     }
   }
@@ -126597,7 +126664,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -126614,7 +126681,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -127822,6 +127889,23 @@ cont {
 }
 cont {
   name: "tourism-camp_site"
+  element {
+    scale: 13
+    symbol {
+      name: "campsite-s"
+      priority: 3800
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6200
+    }
+  }
   element {
     scale: 14
     symbol {
@@ -127939,12 +128023,29 @@ cont {
 }
 cont {
   name: "tourism-caravan_site"
+  element {
+    scale: 13
+    symbol {
+      name: "caravan_site-s"
+      priority: 3800
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6200
+    }
+  }
   element {
     scale: 14
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 30
+      min_distance: 12
     }
     caption {
       primary {
@@ -127961,7 +128062,7 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 30
+      min_distance: 12
     }
     caption {
       primary {
@@ -128056,6 +128157,22 @@ cont {
 }
 cont {
   name: "tourism-chalet"
+  element {
+    scale: 14
+    symbol {
+      name: "alpine_hut-m"
+      priority: 3800
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6200
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -128523,6 +128640,22 @@ cont {
 }
 cont {
   name: "tourism-information"
+  element {
+    scale: 15
+    symbol {
+      name: "information-m"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -128532,7 +128665,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128549,7 +128682,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128566,7 +128699,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128583,7 +128716,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128600,7 +128733,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128611,6 +128744,22 @@ cont {
 }
 cont {
   name: "tourism-information-board"
+  element {
+    scale: 15
+    symbol {
+      name: "board"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -128620,7 +128769,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128637,7 +128786,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128654,7 +128803,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128671,7 +128820,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128688,7 +128837,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128699,6 +128848,22 @@ cont {
 }
 cont {
   name: "tourism-information-guidepost"
+  element {
+    scale: 15
+    symbol {
+      name: "guidepost"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -128708,7 +128873,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128725,7 +128890,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128742,7 +128907,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128759,7 +128924,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128776,7 +128941,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128787,6 +128952,22 @@ cont {
 }
 cont {
   name: "tourism-information-map"
+  element {
+    scale: 15
+    symbol {
+      name: "map"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -128796,7 +128977,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128813,7 +128994,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128830,7 +129011,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128847,7 +129028,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128864,7 +129045,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128875,6 +129056,29 @@ cont {
 }
 cont {
   name: "tourism-information-office"
+  element {
+    scale: 13
+    symbol {
+      name: "information-office-m"
+      priority: 4400
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "information-office-m"
+      priority: 4400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -128884,7 +129088,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128901,7 +129105,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128918,7 +129122,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128935,7 +129139,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128952,7 +129156,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128969,7 +129173,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -128980,6 +129184,29 @@ cont {
 }
 cont {
   name: "tourism-information-visitor_centre"
+  element {
+    scale: 13
+    symbol {
+      name: "information-office-m"
+      priority: 4400
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "information-office-m"
+      priority: 4400
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -128989,7 +129216,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -129006,7 +129233,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -129023,7 +129250,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -129040,7 +129267,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -129057,7 +129284,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -129074,7 +129301,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 5592405
         offset_y: 1
         is_optional: true
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index cafd1edd91673a23265fd1afd82f6d680917308f..d30cbcfda1e0ec1471bc51ebfc4327164de37d33 100644
GIT binary patch
delta 935
zcmaFXD!8{<aD%#=`bkDE{>0qWyv&kH-IDywoYazHAsr4uB|a`rC|5UE;soR5XijNK
z9S$LMaV-fhZVtZ5iJYQ9Sz)}gA~<D5HmkYyv&cPU;u1?rEGo)OEz(WOFG@)*icikZ
zD=Es)5z+<PVd$;5`I46e8)Nb2*8$Z!^^+O7crr56Gs+Vyb<=>#g#<bHlz6$=Ky09!
zw<#!y0EPH5g#<8#1Tlq#FolGXh4>-ni@?O1-`2Ljtz`sartNQQnOWz$9AM-UD9*?)
z&;|OU3>d<xdC93lV!*H!;^IXT0=o4VqmThGY_W(>P85}r07?qulN7-rDZTxZ6pIP7
z+H7DPm*kfgWfte^CKi>H=NDxI;}{y35aC>jf7AQrS!96X&{#wj7uMl`#vfdqV|s%E
zi!{>;#_2KgEb`Pda0%n|xj=)dXW&xC>9-WYUZakebr&&miJ^t3ZgELsNogw89KAhI
Ig=MN70BsHi-v9sr

delta 979
zcmdnnEcmQdaD%$r=Fe_@EOMKexWtkYi;6N+i*%Fni&9dH;*<09N{aGxgmgLhC(rlR
z+x*A-CF|r3L2N8S;vBq_7Y2!LW(kVbsqbOr;>pNN&nQo<)J+5G6cXUzQ{v%bP026O
z&6U`updbPi;l~gWzz`9{5D~%<5ylYV5P=Fczprb5U&jc<OxxerF|*FyzFmgJgjr)F
z6BmC;erZu=ajtG+QAv4zQMQmC&_M!RoG{^BiGLgl(*+e+WJL8i1TbV|rf*bYk>=Cm
z5JZxiJV8(iC?td_B#bE}f-0oQ%(ahcdba|LyvRVi#E5Gb6PE-mAfVx+TacKUSCW~R
qJ_rJ8H`DaHiYzh%9#95cJAhdPJ)nw95=%-`2RxXzt1GiilLG)9>I`%M

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index b07f64624e..c462755e1e 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -5257,6 +5257,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-toilets"
+  element {
+    scale: 17
+    symbol {
+      name: "toilets-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 13
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "toilets-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "toilets-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "toilets-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+}
 cont {
   name: "amenity-university"
   element {
@@ -5577,6 +5644,22 @@ cont {
 }
 cont {
   name: "barrier-border_control"
+  element {
+    scale: 14
+    symbol {
+      name: "bcontrol-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -6015,7 +6098,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "toll_booth-m"
+      name: "toll_booth-s"
       priority: 2850
       min_distance: 8
     }
@@ -9375,7 +9458,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9383,7 +9466,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9391,7 +9474,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9399,7 +9482,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9407,7 +9490,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9415,7 +9498,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9423,7 +9506,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -80213,6 +80296,64 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-convenience"
+  element {
+    scale: 17
+    symbol {
+      name: "convenience-m"
+      priority: 250
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "convenience-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "convenience-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "convenience-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "shop-mall"
   element {
@@ -80491,63 +80632,11 @@ cont {
 }
 cont {
   name: "tourism-artwork"
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 8
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 28
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80564,7 +80653,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80581,7 +80669,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80596,63 +80683,11 @@ cont {
 }
 cont {
   name: "tourism-artwork-architecture"
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 8
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 28
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80669,7 +80704,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80686,7 +80720,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80701,63 +80734,11 @@ cont {
 }
 cont {
   name: "tourism-artwork-painting"
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 8
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 28
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80774,7 +80755,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80791,7 +80771,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80806,63 +80785,11 @@ cont {
 }
 cont {
   name: "tourism-artwork-sculpture"
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 8
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 28
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80879,7 +80806,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80896,7 +80822,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80911,63 +80836,11 @@ cont {
 }
 cont {
   name: "tourism-artwork-statue"
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 8
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 28
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -80984,7 +80857,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81001,7 +80873,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index ac7eb7d5c597ef485c5f6658e27aa4f56c1e2325..c0693109dc8f0a374ec3e188dd0991311d4876c8 100644
GIT binary patch
delta 952
zcmdniF4)^DxM8uY?ny>2{>0qWyv&kH-IDywoYazHAsr4uB|a`rC|5UE;sm3X1Q$04
z?_>i9QDGepA#~Zv2RNlffZBv{Nr+&Pklwu5wU0&aArqHaQesh2W@?dcQhrfNYEgW0
zeqKpYevXhX2j66WFTKrvUJ`7K#hcRu;&kdKGjj1{WTt17CsyjF0hJ30a_}kfa<PHf
zK$mV)P!ItM@nZ@JU<wIh3JGBf2_p;fL(CU}i8cGww)@mF0x{EepIYWS^IQ%vatRb?
z<QM1yeNhGs*VMe^R3R~7hzfD>A_)QA`ioJ>02r27#3$Q}N=X1Eh4D#>;E<Hwt|7x>
z!mKtM7_%k$rA3*=xw?r(CFS`=*}y1*#vMdBSK{Av2W1u+MAV^*1LGPRb8vBv>4qvS
z(#9(oxn$4`2U?Pxky(<OTvA$;N;RAGmoRckpxacCn3-3SnU_vATbPzIP8Wa#1a$(4
VX%XXeKNS{9s=07`yDE#m900)U3B>>a

delta 678
zcmeBe72MV?xM8vD=6tt47RF7J|9QzU@=uob*4td+{gQQZd=MLpkT?hL<bWX2%?*JL
zI`ut_Ts#?>=^5pTmAYy9MJYl89DGVVT&yYiCAzs1+Y}T;fFk@DA_5p9f*2w~7$U+L
zA{-)6p=Q6jcE37CAZFU`SI2y3-uAb$EGEnv8=1KHOY%#LGK+I{6N^g9^NX^D^neZ$
z;NpY{=SuwJP?+wh%px;=sS1lA3y>!>T~Ucediqr$ck*IE`RS~xP=+atkqTkRF>~!>
znto7`MP7uurtV^zo&$6ORZTVK+Relz3G+5IG<1uTOLGcJN{dpd94<SUrtel}k))~*
Lw#TZl7{~zt6}Y(L

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index f97cea8ba4..f5a9474e6d 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -5257,6 +5257,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-toilets"
+  element {
+    scale: 17
+    symbol {
+      name: "toilets-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "toilets-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "toilets-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "toilets-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+}
 cont {
   name: "amenity-university"
   element {
@@ -5577,6 +5644,22 @@ cont {
 }
 cont {
   name: "barrier-border_control"
+  element {
+    scale: 14
+    symbol {
+      name: "bcontrol-m"
+      priority: 1950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8050
+    }
+  }
   element {
     scale: 15
     symbol {
@@ -6015,7 +6098,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "toll_booth-m"
+      name: "toll_booth-s"
       priority: 2850
       min_distance: 8
     }
@@ -9375,7 +9458,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9383,7 +9466,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9391,7 +9474,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9399,7 +9482,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9407,7 +9490,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9415,7 +9498,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -9423,7 +9506,7 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "dot-m"
+      name: "ford-m"
       priority: 4150
       min_distance: 20
     }
@@ -80753,6 +80836,64 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-convenience"
+  element {
+    scale: 17
+    symbol {
+      name: "convenience-m"
+      priority: 250
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "convenience-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "convenience-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "convenience-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "shop-mall"
   element {
@@ -81031,63 +81172,11 @@ cont {
 }
 cont {
   name: "tourism-artwork"
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 8
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 28
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81104,7 +81193,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81121,7 +81209,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81136,63 +81223,11 @@ cont {
 }
 cont {
   name: "tourism-artwork-architecture"
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 8
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 28
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81209,7 +81244,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81226,7 +81260,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81241,63 +81274,11 @@ cont {
 }
 cont {
   name: "tourism-artwork-painting"
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 8
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 28
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81314,7 +81295,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81331,7 +81311,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81346,63 +81325,11 @@ cont {
 }
 cont {
   name: "tourism-artwork-sculpture"
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 8
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 28
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81419,7 +81346,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81436,7 +81362,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81451,63 +81376,11 @@ cont {
 }
 cont {
   name: "tourism-artwork-statue"
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 8
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 28
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 1150
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8850
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81524,7 +81397,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
@@ -81541,7 +81413,6 @@ cont {
     symbol {
       name: "tourism-m"
       priority: 1150
-      min_distance: 24
     }
     caption {
       primary {
diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
index 73c66f6c03..48ff25bc25 100644
--- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
@@ -63,7 +63,7 @@ leisure-track-area                                  # area z15- (also has captio
 aeroway-terminal                                    # area z14- (also has caption z15-)
 === 150
 
-leisure-golf_course                                 # area z12- (also has icon z17-, caption(optional) z17-)
+leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
 === 140
 
 landuse-flowerbed                                   # area z16-
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index efbe87b7b3..90c842655f 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -278,7 +278,7 @@ highway-primary_link-bridge                         # pathtext z11- (also has sh
 highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
 === 6100
 
-barrier-border_control                              # icon z15- (also has caption(optional) z15-)
+barrier-border_control                              # icon z14- (also has caption(optional) z14-)
 railway-halt                                        # icon z13- (also has caption(optional) z13-)
 tourism-alpine_hut                                  # icon z13- (also has caption(optional) z13-)
 waterway-waterfall                                  # icon z11- (also has caption(optional) z11-)
@@ -342,7 +342,7 @@ natural-hot_spring                                  # icon z14- (also has captio
 natural-spring                                      # icon z14- (also has caption(optional) z14-)
 === 4650
 
-natural-saddle                                      # icon z14- (also has caption(optional) z14-)
+natural-saddle                                      # icon z15- (also has caption(optional) z16-)
 place-islet                                         # caption z14- (also has area z10-)
 === 4500
 
@@ -533,7 +533,7 @@ railway-tram_stop                                   # icon z14- (also has captio
 highway-bus_stop                                    # icon z16- (also has caption(optional) z17-)
 === 3600
 
-amenity-drinking_water                              # icon z15- (also has caption(optional) z19-)
+amenity-drinking_water                              # icon z16- (also has caption(optional) z19-)
 === 3500
 
 isoline-step_1000                                   # pathtext z11- (also has line z11-)
@@ -586,7 +586,7 @@ highway-unclassified-bridge                         # pathtext z13- (also has li
 highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
 === 3100
 
-amenity-water_point                                 # icon z15- (also has caption(optional) z19-)
+amenity-water_point                                 # icon z16- (also has caption(optional) z19-)
 highway-raceway                                     # pathtext z16- (also has line z14-)
 historic-aircraft                                   # icon z16- (also has caption(optional) z16-)
 historic-locomotive                                 # icon z16- (also has caption(optional) z16-)
@@ -597,8 +597,8 @@ historic-wreck                                      # icon z16- (also has captio
 landuse-allotments                                  # caption z15- (also has area z12-)
 landuse-cemetery                                    # icon z15- (also has caption(optional) z15-, area z14-)
 landuse-cemetery-christian                          # icon z15- (also has caption(optional) z15-, area z14-)
-man_made-water_tap                                  # icon z15-
-man_made-water_well                                 # icon z15-
+man_made-water_tap                                  # icon z16-
+man_made-water_well                                 # icon z16-
 man_made-windmill                                   # icon z16- (also has caption(optional) z16-)
 === 3050
 
@@ -683,7 +683,7 @@ waterway-weir                                       # pathtext z15- (also has li
 === 2900
 
 highway-ford                                        # icon z16- and pathtext z16- (also has line z13-)
-natural-rock                                        # icon z15-
+natural-rock                                        # icon z16-
 === 2850
 
 highway-bridleway                                   # pathtext z15- (also has line z14-)
@@ -782,7 +782,7 @@ tourism-guest_house                                 # icon z16- (also has captio
 tourism-hostel                                      # icon z16- (also has caption(optional) z16-)
 === 2570
 
-amenity-ice_cream                                   # icon z16- (also has caption(optional) z19-)
+amenity-ice_cream                                   # icon z16- (also has caption(optional) z17-)
 shop-bakery                                         # icon z16- (also has caption(optional) z16-)
 shop-butcher                                        # icon z16- (also has caption(optional) z16-)
 shop-cheese                                         # icon z16- (also has caption(optional) z16-)
@@ -880,7 +880,7 @@ landuse-military-danger_area                        # icon z16- (also has captio
 === 2000
 
 amenity-sanitary_dump_station                       # icon z15- (also has caption(optional) z15-)
-leisure-golf_course                                 # icon z17- (also has caption(optional) z17-, area z12-)
+leisure-golf_course                                 # icon z15- (also has caption(optional) z17-, area z12-)
 natural-wetland                                     # caption z16- (also has area z11-)
 natural-wetland-bog                                 # caption z16- (also has area z11-)
 natural-wetland-marsh                               # caption z16- (also has area z11-)
@@ -1404,7 +1404,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-station-subway-yokohama                   # caption(optional) z14- (also has icon z13-)
 # === -3750
 
-# barrier-border_control                            # caption(optional) z15- (also has icon z15-)
+# barrier-border_control                            # caption(optional) z14- (also has icon z14-)
 # railway-halt                                      # caption(optional) z13- (also has icon z13-)
 # tourism-alpine_hut                                # caption(optional) z13- (also has icon z13-)
 # waterway-waterfall                                # caption(optional) z11- (also has icon z11-)
@@ -1453,7 +1453,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # natural-spring                                    # caption(optional) z14- (also has icon z14-)
 # === -5350
 
-# natural-saddle                                    # caption(optional) z14- (also has icon z14-)
+# natural-saddle                                    # caption(optional) z16- (also has icon z15-)
 # === -5500
 
 # railway-subway_entrance-moscow                    # caption(optional) z15- (also has icon z15-)
@@ -1643,7 +1643,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # highway-bus_stop                                  # caption(optional) z17- (also has icon z16-)
 # === -6400
 
-# amenity-drinking_water                            # caption(optional) z19- (also has icon z15-)
+# amenity-drinking_water                            # caption(optional) z19- (also has icon z16-)
 # === -6500
 
 # leisure-beach_resort                              # caption(optional) z16- (also has icon z16-, area z10-)
@@ -1652,7 +1652,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-supermarket                                  # caption(optional) z16- (also has icon z16-)
 # === -6800
 
-# amenity-water_point                               # caption(optional) z19- (also has icon z15-)
+# amenity-water_point                               # caption(optional) z19- (also has icon z16-)
 # historic-aircraft                                 # caption(optional) z16- (also has icon z16-)
 # historic-locomotive                               # caption(optional) z16- (also has icon z16-)
 # historic-mine                                     # caption(optional) z15- (also has icon z15-)
@@ -1701,7 +1701,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-hostel                                    # caption(optional) z16- (also has icon z16-)
 # === -7430
 
-# amenity-ice_cream                                 # caption(optional) z19- (also has icon z16-)
+# amenity-ice_cream                                 # caption(optional) z17- (also has icon z16-)
 # shop-bakery                                       # caption(optional) z16- (also has icon z16-)
 # shop-butcher                                      # caption(optional) z16- (also has icon z16-)
 # shop-cheese                                       # caption(optional) z16- (also has icon z16-)
@@ -1790,7 +1790,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -8000
 
 # amenity-sanitary_dump_station                     # caption(optional) z15- (also has icon z15-)
-# leisure-golf_course                               # caption(optional) z17- (also has icon z17-, area z12-)
+# leisure-golf_course                               # caption(optional) z17- (also has icon z15-, area z12-)
 # tourism-picnic_site                               # caption(optional) z16- (also has icon z16-)
 # === -8200
 
@@ -2085,7 +2085,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -9900
 
 man_made-cairn                                      # icon z19- (also has caption(optional) z19-)
-man_made-survey_point                               # icon z16- (also has caption(optional) z16-)
+man_made-survey_point                               # icon z18- (also has caption(optional) z18-)
 tourism-information                                 # icon z16- (also has caption(optional) z16-)
 tourism-information-board                           # icon z16- (also has caption(optional) z16-)
 tourism-information-guidepost                       # icon z16- (also has caption(optional) z16-)
@@ -2149,7 +2149,7 @@ amenity-loading_dock                                # icon z19- (also has captio
 entrance-exit                                       # icon z19- (also has caption(optional) z19-)
 # entrance-exit                                     # caption(optional) z19- (also has icon z19-)
 # man_made-cairn                                    # caption(optional) z19- (also has icon z19-)
-# man_made-survey_point                             # caption(optional) z16- (also has icon z16-)
+# man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
 # power-substation                                  # caption(optional) z19- (also has icon z19-)
 # tourism-information                               # caption(optional) z16- (also has icon z16-)
 # tourism-information-board                         # caption(optional) z16- (also has icon z16-)
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 1cb903d84e..fc715dbe34 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
@@ -63,7 +63,7 @@ leisure-track-area                                  # area z15- (also has captio
 aeroway-terminal                                    # area z14- (also has caption z15-)
 === 150
 
-leisure-golf_course                                 # area z12- (also has icon z17-, caption(optional) z17-)
+leisure-golf_course                                 # area z12- (also has icon z15-, caption(optional) z17-)
 === 140
 
 landuse-flowerbed                                   # area z16-
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index bf8e3e7a2b..ea586f644f 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -278,7 +278,7 @@ highway-primary_link-bridge                         # pathtext z11- (also has sh
 highway-primary_link-tunnel                         # pathtext z11- (also has shield::shield z11-, line z11-, line(casing) z14-)
 === 6100
 
-barrier-border_control                              # icon z14- (also has caption(optional) z15-)
+barrier-border_control                              # icon z12- (also has caption(optional) z14-)
 railway-halt                                        # icon z13- (also has caption(optional) z13-)
 tourism-alpine_hut                                  # icon z11- (also has caption(optional) z11-)
 waterway-waterfall                                  # icon z10- (also has caption(optional) z11-)
@@ -342,7 +342,7 @@ natural-hot_spring                                  # icon z12- (also has captio
 natural-spring                                      # icon z12- (also has caption(optional) z14-)
 === 4650
 
-natural-saddle                                      # icon z11- (also has caption(optional) z12-)
+natural-saddle                                      # icon z13- (also has caption(optional) z15-)
 place-islet                                         # caption z14- (also has area z10-)
 === 4500
 
@@ -351,8 +351,8 @@ railway-subway_entrance-spb                         # icon z15- (also has captio
 === 4450
 
 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 z13- (also has caption(optional) z14-)
+tourism-information-visitor_centre                  # icon z13- (also has caption(optional) z14-)
 === 4400
 
 amenity-community_centre                            # icon z15- (also has caption(optional) z15-)
@@ -403,10 +403,10 @@ amenity-pub                                         # icon z15- (also has captio
 tourism-wilderness_hut                              # icon z13- (also has caption(optional) z13-)
 === 3900
 
-highway-rest_area                                   # icon z15- (also has caption(optional) z15-)
-tourism-camp_site                                   # icon z14- (also has caption(optional) z14-)
-tourism-caravan_site                                # icon z14- (also has caption(optional) z14-)
-tourism-chalet                                      # icon z15- (also has caption(optional) z15-)
+highway-rest_area                                   # icon z14- (also has caption(optional) z15-)
+tourism-camp_site                                   # icon z13- (also has caption(optional) z13-)
+tourism-caravan_site                                # icon z13- (also has caption(optional) z13-)
+tourism-chalet                                      # icon z14- (also has caption(optional) z14-)
 === 3800
 
 amenity-charging_station                            # icon z16- (also has caption(optional) z16-)
@@ -683,7 +683,7 @@ waterway-weir                                       # pathtext z15- (also has li
 === 2900
 
 highway-ford                                        # icon z14- and pathtext z16- (also has line z13-)
-natural-rock                                        # icon z15-
+natural-rock                                        # icon z14-
 === 2850
 
 highway-bridleway                                   # pathtext z13- (also has line z11-)
@@ -782,7 +782,7 @@ tourism-guest_house                                 # icon z16- (also has captio
 tourism-hostel                                      # icon z16- (also has caption(optional) z16-)
 === 2570
 
-amenity-ice_cream                                   # icon z16- (also has caption(optional) z19-)
+amenity-ice_cream                                   # icon z16- (also has caption(optional) z17-)
 shop-bakery                                         # icon z16- (also has caption(optional) z16-)
 shop-butcher                                        # icon z16- (also has caption(optional) z16-)
 shop-cheese                                         # icon z16- (also has caption(optional) z16-)
@@ -880,7 +880,7 @@ landuse-military-danger_area                        # icon z16- (also has captio
 === 2000
 
 amenity-sanitary_dump_station                       # icon z15- (also has caption(optional) z15-)
-leisure-golf_course                                 # icon z17- (also has caption(optional) z17-, area z12-)
+leisure-golf_course                                 # icon z15- (also has caption(optional) z17-, area z12-)
 natural-wetland                                     # caption z16- (also has area z11-)
 natural-wetland-bog                                 # caption z16- (also has area z11-)
 natural-wetland-marsh                               # caption z16- (also has area z11-)
@@ -1139,12 +1139,12 @@ shop-wholesale                                      # icon z17- (also has captio
 === 500
 
 amenity-shower                                      # icon z17- (also has caption(optional) z17-)
-amenity-toilets                                     # icon z18- (also has caption(optional) z18-)
+amenity-toilets                                     # icon z15- (also has caption(optional) z18-)
 office                                              # icon z18- (also has caption(optional) z18-)
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470
 
-amenity-bbq                                         # icon z18- (also has caption(optional) z18-)
+amenity-bbq                                         # icon z16- (also has caption(optional) z16-)
 amenity-public_bookcase                             # icon z18- (also has caption(optional) z18-)
 cemetery-grave                                      # icon z17- (also has caption(optional) z17-)
 leisure-outdoor_seating                             # icon z18-
@@ -1404,7 +1404,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-station-subway-yokohama                   # caption(optional) z14- (also has icon z13-)
 # === -3750
 
-# barrier-border_control                            # caption(optional) z15- (also has icon z14-)
+# barrier-border_control                            # caption(optional) z14- (also has icon z12-)
 # railway-halt                                      # caption(optional) z13- (also has icon z13-)
 # tourism-alpine_hut                                # caption(optional) z11- (also has icon z11-)
 # waterway-waterfall                                # caption(optional) z11- (also has icon z10-)
@@ -1453,7 +1453,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # natural-spring                                    # caption(optional) z14- (also has icon z12-)
 # === -5350
 
-# natural-saddle                                    # caption(optional) z12- (also has icon z11-)
+# natural-saddle                                    # caption(optional) z15- (also has icon z13-)
 # === -5500
 
 # railway-subway_entrance-moscow                    # caption(optional) z15- (also has icon z15-)
@@ -1461,8 +1461,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -5550
 
 # 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) z14- (also has icon z13-)
+# tourism-information-visitor_centre                # caption(optional) z14- (also has icon z13-)
 # === -5600
 
 # amenity-community_centre                          # caption(optional) z15- (also has icon z15-)
@@ -1513,10 +1513,10 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-wilderness_hut                            # caption(optional) z13- (also has icon z13-)
 # === -6100
 
-# highway-rest_area                                 # caption(optional) z15- (also has icon z15-)
-# tourism-camp_site                                 # caption(optional) z14- (also has icon z14-)
-# tourism-caravan_site                              # caption(optional) z14- (also has icon z14-)
-# tourism-chalet                                    # caption(optional) z15- (also has icon z15-)
+# highway-rest_area                                 # caption(optional) z15- (also has icon z14-)
+# tourism-camp_site                                 # caption(optional) z13- (also has icon z13-)
+# tourism-caravan_site                              # caption(optional) z13- (also has icon z13-)
+# tourism-chalet                                    # caption(optional) z14- (also has icon z14-)
 # === -6200
 
 # amenity-charging_station                          # caption(optional) z16- (also has icon z16-)
@@ -1703,7 +1703,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-hostel                                    # caption(optional) z16- (also has icon z16-)
 # === -7430
 
-# amenity-ice_cream                                 # caption(optional) z19- (also has icon z16-)
+# amenity-ice_cream                                 # caption(optional) z17- (also has icon z16-)
 # shop-bakery                                       # caption(optional) z16- (also has icon z16-)
 # shop-butcher                                      # caption(optional) z16- (also has icon z16-)
 # shop-cheese                                       # caption(optional) z16- (also has icon z16-)
@@ -1792,7 +1792,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -8000
 
 # amenity-sanitary_dump_station                     # caption(optional) z15- (also has icon z15-)
-# leisure-golf_course                               # caption(optional) z17- (also has icon z17-, area z12-)
+# leisure-golf_course                               # caption(optional) z17- (also has icon z15-, area z12-)
 # tourism-picnic_site                               # caption(optional) z14- (also has icon z14-)
 # === -8200
 
@@ -2020,12 +2020,12 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -9500
 
 # amenity-shower                                    # caption(optional) z17- (also has icon z17-)
-# amenity-toilets                                   # caption(optional) z18- (also has icon z18-)
+# amenity-toilets                                   # caption(optional) z18- (also has icon z15-)
 # office                                            # caption(optional) z18- (also has icon z18-)
 # shop                                              # caption(optional) z18- (also has icon z18-)
 # === -9530
 
-# amenity-bbq                                       # caption(optional) z18- (also has icon z18-)
+# amenity-bbq                                       # caption(optional) z16- (also has icon z16-)
 # amenity-public_bookcase                           # caption(optional) z18- (also has icon z18-)
 # cemetery-grave                                    # caption(optional) z17- (also has icon z17-)
 # man_made-silo                                     # caption(optional) z18- (also has icon z16-)
@@ -2087,11 +2087,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -9900
 
 man_made-cairn                                      # icon z18- (also has caption(optional) z18-)
-man_made-survey_point                               # icon z16- (also has caption(optional) z16-)
-tourism-information                                 # icon z16- (also has caption(optional) z16-)
-tourism-information-board                           # icon z16- (also has caption(optional) z16-)
-tourism-information-guidepost                       # icon z16- (also has caption(optional) z16-)
-tourism-information-map                             # icon z16- (also has caption(optional) z16-)
+man_made-survey_point                               # icon z14- (also has caption(optional) z15-)
+tourism-information                                 # icon z15- (also has caption(optional) z15-)
+tourism-information-board                           # icon z15- (also has caption(optional) z15-)
+tourism-information-guidepost                       # icon z15- (also has caption(optional) z15-)
+tourism-information-map                             # icon z15- (also has caption(optional) z15-)
 === -9950
 
 amenity                                             # caption z19-
@@ -2151,10 +2151,10 @@ amenity-loading_dock                                # icon z19- (also has captio
 entrance-exit                                       # icon z19- (also has caption(optional) z19-)
 # entrance-exit                                     # caption(optional) z19- (also has icon z19-)
 # man_made-cairn                                    # caption(optional) z18- (also has icon z18-)
-# man_made-survey_point                             # caption(optional) z16- (also has icon z16-)
+# man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
 # power-substation                                  # caption(optional) z19- (also has icon z19-)
-# tourism-information                               # caption(optional) z16- (also has icon z16-)
-# tourism-information-board                         # caption(optional) z16- (also has icon z16-)
-# tourism-information-guidepost                     # caption(optional) z16- (also has icon z16-)
-# tourism-information-map                           # caption(optional) z16- (also has icon z16-)
+# tourism-information                               # caption(optional) z15- (also has icon z15-)
+# tourism-information-board                         # caption(optional) z15- (also has icon z15-)
+# tourism-information-guidepost                     # caption(optional) z15- (also has icon z15-)
+# tourism-information-map                           # caption(optional) z15- (also has icon z15-)
 === -10000
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index ab727fd101..472884ecc0 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -423,7 +423,7 @@ railway-station-subway-yerevan                      # icon z13- (also has captio
 railway-station-subway-yokohama                     # icon z13- (also has caption(optional) z15-)
 === 2000
 
-barrier-border_control                              # icon z15- (also has caption(optional) z15-)
+barrier-border_control                              # icon z14- (also has caption(optional) z14-)
 historic-city_gate                                  # icon z13- (also has caption(optional) z15-)
 historic-monument                                   # icon z13- (also has caption(optional) z15-)
 === 1950
@@ -488,11 +488,11 @@ tourism-attraction-specified                        # icon z15- (also has captio
 === 1200
 
 amenity-community_centre                            # icon z16- (also has caption(optional) z16-)
-tourism-artwork                                     # icon z15- (also has caption(optional) z15-)
-tourism-artwork-architecture                        # icon z15- (also has caption(optional) z15-)
-tourism-artwork-painting                            # icon z15- (also has caption(optional) z15-)
-tourism-artwork-sculpture                           # icon z15- (also has caption(optional) z15-)
-tourism-artwork-statue                              # icon z15- (also has caption(optional) z15-)
+tourism-artwork                                     # icon z18- (also has caption(optional) z18-)
+tourism-artwork-architecture                        # icon z18- (also has caption(optional) z18-)
+tourism-artwork-painting                            # icon z18- (also has caption(optional) z18-)
+tourism-artwork-sculpture                           # icon z18- (also has caption(optional) z18-)
+tourism-artwork-statue                              # icon z18- (also has caption(optional) z18-)
 === 1150
 
 amenity-cafe                                        # icon z15- (also has caption(optional) z15-)
@@ -699,14 +699,14 @@ historic-ruins                                      # icon z17- (also has captio
 === 300
 
 amenity-fast_food                                   # icon z17- (also has caption(optional) z17-)
-shop-convenience
+shop-convenience                                    # icon z17- (also has caption(optional) z18-)
 === 250
 
-amenity-toilets
 amenity-bank                                        # icon z17- (also has caption(optional) z17-)
 amenity-parcel_locker                               # icon z17- (also has caption(optional) z17-)
 amenity-police                                      # icon z17-
 amenity-post_office                                 # icon z17- (also has caption(optional) z17-)
+amenity-toilets                                     # icon z17- (also has caption(optional) z17-)
 shop-motorcycle                                     # icon z17-
 === 200
 
@@ -945,7 +945,7 @@ entrance-main                                       # icon z18- (also has captio
 # railway-station-subway-yokohama                   # caption(optional) z15- (also has icon z13-)
 # === -8000
 
-# barrier-border_control                            # caption(optional) z15- (also has icon z15-)
+# barrier-border_control                            # caption(optional) z14- (also has icon z14-)
 # historic-city_gate                                # caption(optional) z15- (also has icon z13-)
 # historic-monument                                 # caption(optional) z15- (also has icon z13-)
 # === -8050
@@ -986,11 +986,11 @@ entrance-main                                       # icon z18- (also has captio
 # === -8800
 
 # amenity-community_centre                          # caption(optional) z16- (also has icon z16-)
-# tourism-artwork                                   # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-architecture                      # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-painting                          # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-sculpture                         # caption(optional) z15- (also has icon z15-)
-# tourism-artwork-statue                            # caption(optional) z15- (also has icon z15-)
+# tourism-artwork                                   # caption(optional) z18- (also has icon z18-)
+# tourism-artwork-architecture                      # caption(optional) z18- (also has icon z18-)
+# tourism-artwork-painting                          # caption(optional) z18- (also has icon z18-)
+# tourism-artwork-sculpture                         # caption(optional) z18- (also has icon z18-)
+# tourism-artwork-statue                            # caption(optional) z18- (also has icon z18-)
 # === -8850
 
 # amenity-cafe                                      # caption(optional) z15- (also has icon z15-)
@@ -1169,11 +1169,13 @@ entrance-main                                       # icon z18- (also has captio
 # === -9700
 
 # amenity-fast_food                                 # caption(optional) z17- (also has icon z17-)
+# shop-convenience                                  # caption(optional) z18- (also has icon z17-)
 # === -9750
 
 # amenity-bank                                      # caption(optional) z17- (also has icon z17-)
 # amenity-parcel_locker                             # caption(optional) z17- (also has icon z17-)
 # amenity-post_office                               # caption(optional) z17- (also has icon z17-)
+# amenity-toilets                                   # caption(optional) z17- (also has icon z17-)
 # === -9800
 
 # leisure-park-no-access                            # caption(optional) z14- (also has icon z14-, area z10-)
diff --git a/data/visibility.txt b/data/visibility.txt
index 8a24bca021..28fb52e635 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -155,7 +155,7 @@ world  000000000000000000000  +
         taxi  000000000000000000000  -
         telephone  000000000000000000000  -
         theatre  000000000000000111111  -
-        toilets  000000000000000000000  -
+        toilets  000000000000000001111  -
         townhall  000000000000000000000  -
         university  000000000000000111111  -
         vehicle_inspection  000000000000000001111  -
@@ -198,7 +198,7 @@ world  000000000000000000000  +
     barrier  000000000000000000000  +
         block  000000000000000000000  -
         bollard  000000000000000000000  -
-        border_control  000000000000000111111  -
+        border_control  000000000000001111111  -
         cattle_grid  000000000000000000000  -
         chain  000000000000000000000  -
         city_wall  000000000000000111111  -
@@ -1248,7 +1248,7 @@ world  000000000000000000000  +
         collector  000000000000000000000  -
         computer  000000000000000000000  -
         confectionery  000000000000000000000  -
-        convenience  000000000000000000000  -
+        convenience  000000000000000001111  -
         copyshop  000000000000000000000  -
         cosmetics  000000000000000000000  -
         craft  000000000000000000000  -
@@ -1374,11 +1374,11 @@ world  000000000000000000000  +
         alpine_hut  000000000000000000000  -
         apartment  000000000000000000000  -
         aquarium  000000000000000000000  -
-        artwork  000000000000000111111  +
-            architecture  000000000000000111111  -
-            painting  000000000000000111111  -
-            sculpture  000000000000000111111  -
-            statue  000000000000000111111  -
+        artwork  000000000000000000111  +
+            architecture  000000000000000000111  -
+            painting  000000000000000000111  -
+            sculpture  000000000000000000111  -
+            statue  000000000000000000111  -
             {}
         attraction  000000000000000111111  +
             animal  000000000000000111111  -