From 3c52bf59fda335ec8fa431fd2a51e9da00f30aeb Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 29 Jan 2025 11:22:56 +0300
Subject: [PATCH] [styles] Regenerated for outdoors visibility changes

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/drules_proto.bin                         | Bin 428430 -> 428983 bytes
 data/drules_proto.txt                         | 179 ++++++
 data/drules_proto_outdoors_dark.bin           | Bin 429741 -> 431122 bytes
 data/drules_proto_outdoors_dark.txt           | 600 +++++++++++++++---
 data/drules_proto_outdoors_light.bin          | Bin 431209 -> 432590 bytes
 data/drules_proto_outdoors_light.txt          | 600 +++++++++++++++---
 .../include/priorities_4_overlays.prio.txt    |  50 +-
 7 files changed, 1249 insertions(+), 180 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index be8330f68e46dd25248ed3446bcdf36e3f516f60..57a462b1a77af5dd843e325fad5d9170c28a2b1c 100644
GIT binary patch
delta 396
zcmeC1EVX^Q)P}ziOwG)b|3^qM@=f-OG-l)nlLBB;5KIbz$j!cy`mW;ZnYs8Ab5rv&
zODc7XGg5O(Qj3IiICv%>oTs~a(!4xI#w(K<7sxa6OjcZAFg?VZO<=RZf-*+N?UR=;
zlm&?{(rrGnu>HtF#^pyAGVzH$VC3S<P0WkWO-xDEO-{@#$`dl;5S-4pfytOr2uy9~
z-N1B`U34lF7cX34ab`}wkSGW5^oa+U#HN4V!Sq&kE)$n1LcS!wC^0=Xz9ca(8?J6U
zP~8$H<!8t?mgJWM-Ota#tHjO4mYY~yqMIvmiEVoS9;RcAU#1uAVN&8lmD&!JI?v2F
zXL|erCMiZF2ehXhWCCJlAZFQ~c98Y%I=PF?Tw*2prA3*=xw_?<IVq_{d8x(4@foEh
RLi)fEg9Xs`f&w-<NdUj9i8cTL

delta 279
zcmdl!U8--g)P}ziOq&@e|BsMj6q@W8X*_xUCDzSKQChCTjm%v9iMgqHnI)CF#TltN
zC8<T5d*>H2GA^F{e}OzB@8rgX2AdlehB8WbGINQesnpF$P0Wig$#0fh+%C76al71N
zCT2ddHH=(*xj^yU#FSLs<iyOPJRu_vq3QECG8u25w~^^2yWl@YE?&5b;>?`<>HRyI
zJ}|aTZ`j2oy?xUzrX@^5SCLIA$uCbWnqIJv=@{eV=??ptl(rY|V>-jk*gD<e5R=sO
yNjsU|w#OZ20%B$$X4xKhnDy>D#s$-Dir8czewf^_@b2`V#cZP6*A%mHO8@|i5NkRB

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 30c802ff82..d4e50b4b90 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -6996,6 +6996,70 @@ cont {
 }
 cont {
   name: "amenity-hunting_stand"
+  element {
+    scale: 14
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7700
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7700
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7700
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7700
+    }
+  }
   element {
     scale: 18
     symbol {
@@ -12190,6 +12254,22 @@ cont {
 }
 cont {
   name: "amenity-shelter"
+  element {
+    scale: 12
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
   element {
     scale: 13
     symbol {
@@ -12321,6 +12401,22 @@ cont {
 }
 cont {
   name: "amenity-shelter-basic_hut"
+  element {
+    scale: 12
+    symbol {
+      name: "alpine_hut-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
   element {
     scale: 13
     symbol {
@@ -12452,6 +12548,22 @@ cont {
 }
 cont {
   name: "amenity-shelter-lean_to"
+  element {
+    scale: 12
+    symbol {
+      name: "shelter-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
   element {
     scale: 13
     symbol {
@@ -55082,6 +55194,22 @@ cont {
 }
 cont {
   name: "man_made-cairn"
+  element {
+    scale: 17
+    symbol {
+      name: "cairn-m"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 18
     symbol {
@@ -55764,6 +55892,13 @@ cont {
 }
 cont {
   name: "man_made-silo"
+  element {
+    scale: 13
+    symbol {
+      name: "storage-tank"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
@@ -55843,6 +55978,13 @@ cont {
 }
 cont {
   name: "man_made-storage_tank"
+  element {
+    scale: 13
+    symbol {
+      name: "storage-tank"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
@@ -56037,6 +56179,13 @@ cont {
 }
 cont {
   name: "man_made-tower"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
   element {
     scale: 14
     symbol {
@@ -56116,6 +56265,13 @@ cont {
 }
 cont {
   name: "man_made-tower-communication"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
   element {
     scale: 14
     symbol {
@@ -56403,6 +56559,13 @@ cont {
 }
 cont {
   name: "man_made-water_tower"
+  element {
+    scale: 13
+    symbol {
+      name: "storage-tank"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
@@ -129649,6 +129812,22 @@ cont {
 }
 cont {
   name: "tourism-wilderness_hut"
+  element {
+    scale: 12
+    symbol {
+      name: "alpine_hut-m"
+      priority: 3900
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6100
+    }
+  }
   element {
     scale: 13
     symbol {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index acc91be3a14d1812bcfe0a8df3fbf910bbfc520a..72fd33c84a5dd405bb07d4c0b7af3c405ec4f8ef 100644
GIT binary patch
delta 1335
zcmdT^L2DC16lUJ0VV$Je?7C^TX)I|dLTi@<6>=B6=pQhrux*!iYqOEvEukJNMX(Ws
zs)NkMG$%m}RZA*cB%t<OisV?NwCKejAod{EF=^|%7Ck9=7~c1N^JZq>d~bHSnz;Ws
z@%+=3+(*DMt*D!ZGpkO{n2upi6l_N`$0dc2q-87|h^kX6>y}znzKGIUULe==*#HAk
z2KrE#>~6-9_yd!>n_Z+QAMebNi}_?5CCOY{o8O2v>iIhthN>JE4o|ly^=U`9B$*GV
zqxi%DRc+;6D1{rB9+uI-I){6G>FTIv8)JpZ8ApoqVLCq*lo4)hR~Hd_M9f-W?3eAD
z{V9C2Qd_9hkXxxiE7Y@taHOc2g`zgDt7DpBnXEFAUaP}7w^Rq4gB_qBp2B%<h>uWV
z4Th1>3DHgv+kw7!;fA~T3|=DG0D5@^QX#e=9m2t)W;>)X@|_Dl9`$k2$0aYPr(KAU
z(UDU$x7G$pcXtJnXz(-O?xPZHW4a^>eD~o>=Gr<ZWoWbkG5Wd*31B3<dO!kFhL6&>
z4Ny>+zF7rk<WEfUGP=}&-cDY&6J)^qbf2mJ?nF2E0+vv24?MQD+tc?6tspBck`{5;
zc1o5up{uO1uaXSuKbc`Z9HS@MRrqzK6&zM@h!2x{V=<N>{wYEFZ33Nbg3NpOq)&W`
z%;8%copWIz?e*}#EyvZ?z~at)1uP%+Xjx-#y>Ogsf3Z~;wwk~O$40>2YIfaT?tjJM
g9;Y;88Fo=E8`I;uW$L!={h!3hc2#j7Oa+y}Z?#C2s{jB1

delta 948
zcmbQVLTc??sSRHvWH&Q%i6-Wz=4F;t>SmPYm1O3n#}}6*=A{T3aR^OLh?JgOeNt@l
z-t+8}qQt>W-6*-q)n~;vCr0%+3AZzI@xyc%XQbwoq!w)!n_JGvxN>seJlV}h=Jhd3
z_cL>eqp8u&Nlna)FUfCiUeMmWfN^{C0;WscLTebg_;P{bxrr&My2*)|MS0t2uVE@<
zW?IEKU3deNNj*OYpAt70TW(@;iEggMB{m^`4t{h20dxUDbO9lB0bz6j5flNg?aW-l
zAa`xA*~qksk!c#^bc4-I3TUo5#Ej+|umG}azyipw0Sh3z1}uQ=8n6JeYYs7U&0yl<
z1-qto3zIOT@IOWf7aVBCnK}7FqSG%PU=n2!66N5Z9=MH3m<cH2xQ9uY1!x*jZab6c
z^o4tvM5k?IlArFgn@I@F_;HX)a=OexCQ%u#HYP4ncr+B3<QFBTr^W+QL^g#cZ=bw_
zX&z(LRpeMM$uCbW0tOuA@v6xoG+l8clh$;FjZ7g-j~S=0+s&ltN@a7mo9<;QWR_}W
y;u3*}P<bLS(F4;m$Rm^meY@HrCLm@8VwUY{hgdt;GA^6GA)ifZ`{R5zeH8#^BpBZS

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index e01e0e1d16..5e151386dc 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -6999,7 +6999,14 @@ cont {
 cont {
   name: "amenity-hunting_stand"
   element {
-    scale: 18
+    scale: 14
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+  }
+  element {
+    scale: 15
     symbol {
       name: "hunting-tower-m"
       priority: 2300
@@ -7014,6 +7021,54 @@ cont {
       priority: -7700
     }
   }
+  element {
+    scale: 16
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7700
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7700
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7700
+    }
+  }
   element {
     scale: 19
     symbol {
@@ -7022,7 +7077,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -7038,7 +7093,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -12048,6 +12103,14 @@ cont {
 }
 cont {
   name: "amenity-shelter"
+  element {
+    scale: 12
+    symbol {
+      name: "shelter-s"
+      priority: 1500
+      min_distance: 10
+    }
+  }
   element {
     scale: 13
     symbol {
@@ -12182,6 +12245,14 @@ cont {
 }
 cont {
   name: "amenity-shelter-basic_hut"
+  element {
+    scale: 12
+    symbol {
+      name: "alpine_hut-s"
+      priority: 3900
+      min_distance: 10
+    }
+  }
   element {
     scale: 13
     symbol {
@@ -12316,6 +12387,14 @@ cont {
 }
 cont {
   name: "amenity-shelter-lean_to"
+  element {
+    scale: 12
+    symbol {
+      name: "shelter-s"
+      priority: 3900
+      min_distance: 10
+    }
+  }
   element {
     scale: 13
     symbol {
@@ -55143,6 +55222,22 @@ cont {
 }
 cont {
   name: "man_made-cairn"
+  element {
+    scale: 17
+    symbol {
+      name: "cairn-m"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 18
     symbol {
@@ -55422,6 +55517,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 15
@@ -55429,6 +55533,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 16
@@ -55436,6 +55549,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 17
@@ -55443,6 +55565,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 18
@@ -55450,6 +55581,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 19
@@ -55457,6 +55597,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 20
@@ -55464,6 +55613,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
 }
 cont {
@@ -55620,6 +55778,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 15
@@ -55627,6 +55794,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 16
@@ -55634,6 +55810,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 17
@@ -55641,6 +55826,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 18
@@ -55648,6 +55842,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 19
@@ -55655,6 +55858,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 20
@@ -55662,6 +55874,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
 }
 cont {
@@ -55788,12 +56009,28 @@ cont {
 }
 cont {
   name: "man_made-silo"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 15
@@ -55801,6 +56038,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 16
@@ -55808,6 +56054,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 17
@@ -55815,6 +56070,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 18
@@ -55824,7 +56088,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55840,7 +56104,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55856,7 +56120,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55867,12 +56131,28 @@ cont {
 }
 cont {
   name: "man_made-storage_tank"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 15
@@ -55880,6 +56160,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 16
@@ -55887,6 +56176,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 17
@@ -55894,6 +56192,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 18
@@ -55903,7 +56210,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55919,7 +56226,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55935,7 +56242,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -56052,38 +56359,17 @@ cont {
 }
 cont {
   name: "man_made-tower"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
   element {
     scale: 14
     symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
@@ -56096,15 +56382,79 @@ cont {
       priority: -9150
     }
   }
+  element {
+    scale: 15
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
   element {
     scale: 19
     symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -56115,12 +56465,12 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -56131,38 +56481,17 @@ cont {
 }
 cont {
   name: "man_made-tower-communication"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
   element {
     scale: 14
     symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
@@ -56175,15 +56504,79 @@ cont {
       priority: -9150
     }
   }
+  element {
+    scale: 15
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
   element {
     scale: 19
     symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -56194,12 +56587,12 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -56454,12 +56847,28 @@ cont {
 }
 cont {
   name: "man_made-water_tower"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 15
@@ -56467,6 +56876,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 16
@@ -56474,6 +56892,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 17
@@ -56481,6 +56908,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 18
@@ -56490,7 +56926,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -56506,7 +56942,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -56522,7 +56958,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -130075,6 +130511,14 @@ cont {
 }
 cont {
   name: "tourism-wilderness_hut"
+  element {
+    scale: 12
+    symbol {
+      name: "alpine_hut-s"
+      priority: 3900
+      min_distance: 24
+    }
+  }
   element {
     scale: 13
     symbol {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index b7666e9c3b00070ae85cfbab7e12ca845be1c441..586aad0bae959b43d4dd1c39379a628abf8b94f8 100644
GIT binary patch
delta 1299
zcmdT^&ui0A9Or%0*6g)SlQdmJS4%CTR2n)&5az+*ZQwzVJ=JUruGlu(MvAwg;Eoj{
zK16Ntph#gbjcZ^P#T`Xf=~-llBJ3Y<p48W_3pGwpdhqbb=kvaweBbxidppl!TUKn%
zpMxDRgE^UzS<bwZoAih$*$@TO1He--g#zZ|t+;tN7agJ~5}n<sne2MaOZyhHo{Lk>
zwQj_Eo9mrRKVoo5EotR~aYLytX+=Y;h!Pt}@pxiHm8$&FpTySFhc$#Y%|zp{9HoLV
z4yeVeg|e1kx^7U-s|3}|H0lUFG2b<(BEL8p2yXS8EBz+2`%U;XF}aN}S5nLQlDeoV
z3u>WKruhhDwgtn?#33Tfs_&2;YQY%>wt<{qg;PwL<w&;;$30@24LOK+kT67~z799-
z-Bs8?%6q^;=ctleHAIdLrZDy{>V{I1HyP@QOZl;HU^DZXq@Q|rao)uR7Z+VTJkH7I
zb>PhTOx&JZgE@3;cRZkKp{R=?8qg?!y@;|jOQ8ePC^Y<#=NllA3l?~3|7J50CQEBY
z?eZSI_W}lEKn;ZJIPmN~l(P6c;D}R$s-aiZ%Ua%0%UAyO(e?ui8tC*_7;Cqo*XX4E
zoO917(wtKQ4veBx2GNn%El7m3v>gW-;#rn=8|0qvgpB=cz`VE+p#tHL0$MnU9sh&O
zSni#9mqudnZH9!~a3nR}wErjp`%4=tjPebz<jh1(rMEwSP-p1<_`B1%qIZBUhAxk-
Ycf9;d^oA_!zS!^H7TLb9`#v1~0Wo=PuK)l5

delta 1031
zcmX@NS?c8qsSVtbOq&@e^F~Tcz8xtyITlC@M#+F_{|l^>y`sc{Y|+hSQJ0;B+nKre
z6LVAZGD|9Ti!)MlN>Yn97tJkaWL!D<)jZkhP62Epn@#3dF*5c~UcW%P`N4wr2MZXt
zKUlzYms4yFBNtz8VqSc1VoIuRa$;sto{$lT(DeM(Oa|M{S2H;=Gp%BrUcHXVq@JIH
zPl=n0EjO{aL^oIB5}Ob|2S2)i0J?x6x_}V6fH1m%2#NsLc4jVNkOQ|rS<keIk!c#^
z^cfqO6wq9Ah#Ac_U;$*;fCZ3U0~SDb4Ojr#HDCc`*BoNzI?BYw3wF)hO-v4q!v7c{
zTyW?WXXfM!iB1pP!X)Y`Bnk{1K`x%+lKi5?^i<uF#Jp??pn;+s0@#HGu?gz~W1{Z>
zlf?9f{Xin-0Fxwy)eB{b%5b$Yaf!m?4{BRH$Tm8=WV^<8rg@BESCNxbNq%{15invX
zPB+t|)-yFRJ!YKlyo*WEkvhh0Ked~wkeRV{x(zUF8R;8s?Yj>!0WmWWvuxjefK^}%
U<Fe^zO4y{pd3C#RDcf!p09@%UcmMzZ

diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 13d2f1dd5b..76898356ff 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -6999,7 +6999,14 @@ cont {
 cont {
   name: "amenity-hunting_stand"
   element {
-    scale: 18
+    scale: 14
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+  }
+  element {
+    scale: 15
     symbol {
       name: "hunting-tower-m"
       priority: 2300
@@ -7014,6 +7021,54 @@ cont {
       priority: -7700
     }
   }
+  element {
+    scale: 16
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7700
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7700
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hunting-tower-m"
+      priority: 2300
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7700
+    }
+  }
   element {
     scale: 19
     symbol {
@@ -7022,7 +7077,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -7038,7 +7093,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -12048,6 +12103,14 @@ cont {
 }
 cont {
   name: "amenity-shelter"
+  element {
+    scale: 12
+    symbol {
+      name: "shelter-s"
+      priority: 1500
+      min_distance: 10
+    }
+  }
   element {
     scale: 13
     symbol {
@@ -12182,6 +12245,14 @@ cont {
 }
 cont {
   name: "amenity-shelter-basic_hut"
+  element {
+    scale: 12
+    symbol {
+      name: "alpine_hut-s"
+      priority: 3900
+      min_distance: 10
+    }
+  }
   element {
     scale: 13
     symbol {
@@ -12316,6 +12387,14 @@ cont {
 }
 cont {
   name: "amenity-shelter-lean_to"
+  element {
+    scale: 12
+    symbol {
+      name: "shelter-s"
+      priority: 3900
+      min_distance: 10
+    }
+  }
   element {
     scale: 13
     symbol {
@@ -54888,6 +54967,22 @@ cont {
 }
 cont {
   name: "man_made-cairn"
+  element {
+    scale: 17
+    symbol {
+      name: "cairn-m"
+      priority: -9950
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
   element {
     scale: 18
     symbol {
@@ -55167,6 +55262,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 15
@@ -55174,6 +55278,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 16
@@ -55181,6 +55294,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 17
@@ -55188,6 +55310,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 18
@@ -55195,6 +55326,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 19
@@ -55202,6 +55342,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
   element {
     scale: 20
@@ -55209,6 +55358,15 @@ cont {
       name: "mast-m"
       priority: 850
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
   }
 }
 cont {
@@ -55365,6 +55523,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 15
@@ -55372,6 +55539,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 16
@@ -55379,6 +55555,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 17
@@ -55386,6 +55571,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 18
@@ -55393,6 +55587,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 19
@@ -55400,6 +55603,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 20
@@ -55407,6 +55619,15 @@ cont {
       name: "mast-m"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
 }
 cont {
@@ -55542,12 +55763,28 @@ cont {
 }
 cont {
   name: "man_made-silo"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 15
@@ -55555,6 +55792,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 16
@@ -55562,6 +55808,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 17
@@ -55569,6 +55824,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 18
@@ -55578,7 +55842,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55594,7 +55858,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55610,7 +55874,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55621,12 +55885,28 @@ cont {
 }
 cont {
   name: "man_made-storage_tank"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 15
@@ -55634,6 +55914,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 16
@@ -55641,6 +55930,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 17
@@ -55648,6 +55946,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 18
@@ -55657,7 +55964,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55673,7 +55980,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55689,7 +55996,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55806,38 +56113,17 @@ cont {
 }
 cont {
   name: "man_made-tower"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
   element {
     scale: 14
     symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
@@ -55850,15 +56136,79 @@ cont {
       priority: -9150
     }
   }
+  element {
+    scale: 15
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
   element {
     scale: 19
     symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55869,12 +56219,12 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55885,38 +56235,17 @@ cont {
 }
 cont {
   name: "man_made-tower-communication"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 850
+    }
+  }
   element {
     scale: 14
     symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "mast-m"
-      priority: 850
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
@@ -55929,15 +56258,79 @@ cont {
       priority: -9150
     }
   }
+  element {
+    scale: 15
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "storage-tank"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
   element {
     scale: 19
     symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55948,12 +56341,12 @@ cont {
   element {
     scale: 20
     symbol {
-      name: "mast-m"
+      name: "storage-tank"
       priority: 850
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56208,12 +56601,28 @@ cont {
 }
 cont {
   name: "man_made-water_tower"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 15
@@ -56221,6 +56630,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 16
@@ -56228,6 +56646,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 17
@@ -56235,6 +56662,15 @@ cont {
       name: "storage-tank"
       priority: 450
     }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
   }
   element {
     scale: 18
@@ -56244,7 +56680,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56260,7 +56696,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56276,7 +56712,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -129860,6 +130296,14 @@ cont {
 }
 cont {
   name: "tourism-wilderness_hut"
+  element {
+    scale: 12
+    symbol {
+      name: "alpine_hut-s"
+      priority: 3900
+      min_distance: 24
+    }
+  }
   element {
     scale: 13
     symbol {
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 4280315246..49a56b6c68 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -405,9 +405,9 @@ amenity-biergarten                                  # icon z15- (also has captio
 amenity-pub                                         # icon z15- (also has caption(optional) z15-)
 === 3950
 
-amenity-shelter-basic_hut                           # icon z13- (also has caption(optional) z13-)
-amenity-shelter-lean_to                             # icon z13- (also has caption(optional) z13-)
-tourism-wilderness_hut                              # icon z13- (also has caption(optional) z13-)
+amenity-shelter-basic_hut                           # icon z12- (also has caption(optional) z13-)
+amenity-shelter-lean_to                             # icon z12- (also has caption(optional) z13-)
+tourism-wilderness_hut                              # icon z12- (also has caption(optional) z13-)
 === 3900
 
 highway-rest_area                                   # icon z14- (also has caption(optional) z15-)
@@ -852,7 +852,7 @@ shop-travel_agency                                  # icon z18- (also has captio
 shop-wine                                           # icon z16- (also has caption(optional) z16-)
 === 2400
 
-amenity-hunting_stand                               # icon z18- (also has caption(optional) z18-)
+amenity-hunting_stand                               # icon z14- (also has caption(optional) z15-)
 barrier-block                                       # icon z16- (also has caption(optional) z16-)
 barrier-bollard                                     # icon z16- (also has caption(optional) z16-)
 barrier-chain                                       # icon z16- (also has caption(optional) z16-)
@@ -990,7 +990,7 @@ tourism-artwork-architecture                        # icon z15- (also has captio
 tourism-artwork-painting                            # icon z15- (also has caption(optional) z15-)
 === 1550
 
-amenity-shelter                                     # icon z13- (also has caption(optional) z13-)
+amenity-shelter                                     # icon z12- (also has caption(optional) z13-)
 amenity-shelter-public_transport                    # icon z14- (also has caption(optional) z14-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
@@ -1079,9 +1079,9 @@ landuse-vineyard                                    # caption z15- (also has are
 leisure-ice_rink                                    # icon z17- (also has caption(optional) z17-)
 leisure-pitch                                       # icon z17- (also has caption(optional) z17-, area z15-)
 man_made-chimney                                    # icon z16- (also has caption(optional) z18-)
-man_made-flagpole                                   # icon z12-
-man_made-tower                                      # icon z14- (also has caption(optional) z18-)
-man_made-tower-communication                        # icon z14- (also has caption(optional) z18-)
+man_made-flagpole                                   # icon z12- (also has caption(optional) z14-)
+man_made-tower                                      # icon z13- (also has caption(optional) z14-)
+man_made-tower-communication                        # icon z13- (also has caption(optional) z14-)
 === 850
 
 junction                                            # caption z17-
@@ -1159,10 +1159,10 @@ amenity-bbq                                         # icon z16- (also has captio
 amenity-public_bookcase                             # icon z18- (also has caption(optional) z18-)
 cemetery-grave                                      # icon z17- (also has caption(optional) z17-)
 leisure-outdoor_seating                             # icon z18-
-man_made-mast                                       # icon z13-
-man_made-silo                                       # icon z14- (also has caption(optional) z18-)
-man_made-storage_tank                               # icon z14- (also has caption(optional) z18-)
-man_made-water_tower                                # icon z14- (also has caption(optional) z18-)
+man_made-mast                                       # icon z13- (also has caption(optional) z14-)
+man_made-silo                                       # icon z13- (also has caption(optional) z14-)
+man_made-storage_tank                               # icon z13- (also has caption(optional) z14-)
+man_made-water_tower                                # icon z13- (also has caption(optional) z14-)
 power-tower                                         # icon z14-
 === 450
 
@@ -1529,9 +1529,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-pub                                       # caption(optional) z15- (also has icon z15-)
 # === -6050
 
-# amenity-shelter-basic_hut                         # caption(optional) z13- (also has icon z13-)
-# amenity-shelter-lean_to                           # caption(optional) z13- (also has icon z13-)
-# tourism-wilderness_hut                            # caption(optional) z13- (also has icon z13-)
+# amenity-shelter-basic_hut                         # caption(optional) z13- (also has icon z12-)
+# amenity-shelter-lean_to                           # caption(optional) z13- (also has icon z12-)
+# tourism-wilderness_hut                            # caption(optional) z13- (also has icon z12-)
 # === -6100
 
 # highway-rest_area                                 # caption(optional) z15- (also has icon z14-)
@@ -1802,7 +1802,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-wine                                         # caption(optional) z16- (also has icon z16-)
 # === -7600
 
-# amenity-hunting_stand                             # caption(optional) z18- (also has icon z18-)
+# amenity-hunting_stand                             # caption(optional) z15- (also has icon z14-)
 # barrier-block                                     # caption(optional) z16- (also has icon z16-)
 # barrier-bollard                                   # caption(optional) z16- (also has icon z16-)
 # barrier-chain                                     # caption(optional) z16- (also has icon z16-)
@@ -1924,7 +1924,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-artwork-painting                          # caption(optional) z15- (also has icon z15-)
 # === -8450
 
-# amenity-shelter                                   # caption(optional) z13- (also has icon z13-)
+# amenity-shelter                                   # caption(optional) z13- (also has icon z12-)
 # amenity-shelter-public_transport                  # caption(optional) z14- (also has icon z14-)
 # leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
 # leisure-playground                                # caption(optional) z17- (also has icon z17-, area z16-)
@@ -2002,8 +2002,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
 # man_made-chimney                                  # caption(optional) z18- (also has icon z16-)
-# man_made-tower                                    # caption(optional) z18- (also has icon z14-)
-# man_made-tower-communication                      # caption(optional) z18- (also has icon z14-)
+# man_made-flagpole                                 # caption(optional) z14- (also has icon z12-)
+# man_made-tower                                    # caption(optional) z14- (also has icon z13-)
+# man_made-tower-communication                      # caption(optional) z14- (also has icon z13-)
 # === -9150
 
 # man_made-works                                    # caption(optional) z17- (also has icon z16-)
@@ -2073,9 +2074,10 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # 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 z14-)
-# man_made-storage_tank                             # caption(optional) z18- (also has icon z14-)
-# man_made-water_tower                              # caption(optional) z18- (also has icon z14-)
+# man_made-mast                                     # caption(optional) z14- (also has icon z13-)
+# man_made-silo                                     # caption(optional) z14- (also has icon z13-)
+# man_made-storage_tank                             # caption(optional) z14- (also has icon z13-)
+# man_made-water_tower                              # caption(optional) z14- (also has icon z13-)
 # === -9550
 
 # amenity-parking                                   # caption(optional) z18- (also has icon z16-, area z15-)
@@ -2137,7 +2139,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-swimming_pool-private                     # caption(optional) z17- (also has icon z17-, area z13-)
 # === -9900
 
-man_made-cairn                                      # icon z18- (also has caption(optional) z18-)
+man_made-cairn                                      # icon z17- (also has caption(optional) z17-)
 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-)
@@ -2201,7 +2203,7 @@ amenity-loading_dock                                # icon z19- (also has captio
 # entrance                                          # caption(optional) z19- (also has icon z19-)
 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-cairn                                    # caption(optional) z17- (also has icon z17-)
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
 # power-substation                                  # caption(optional) z19- (also has icon z19-)
 # tourism-information                               # caption(optional) z15- (also has icon z15-)