diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index be8330f68e..57a462b1a7 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 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 acc91be3a1..72fd33c84a 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 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 b7666e9c3b..586aad0bae 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 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-)