diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index ba8d7686d0..46c39bc38a 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 e88cf0bfa5..d61df1f584 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -5602,6 +5602,15 @@ cont {
       name: "drinking-water-s"
       priority: 3500
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6500
+    }
   }
   element {
     scale: 19
@@ -12128,7 +12137,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -12145,7 +12153,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -12162,7 +12169,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -12179,7 +12185,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -12196,7 +12201,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -12213,7 +12217,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -12230,7 +12233,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -12247,7 +12249,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -14043,6 +14044,15 @@ cont {
       name: "drinking-water-s"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 19
@@ -16015,7 +16025,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -16030,7 +16040,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -16045,7 +16055,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -16060,7 +16070,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -16553,10 +16563,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -16577,7 +16588,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16598,7 +16609,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16619,7 +16630,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16640,7 +16651,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16661,7 +16672,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16682,7 +16693,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16751,10 +16762,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -16771,7 +16783,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16788,7 +16800,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16805,7 +16817,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16822,7 +16834,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16839,7 +16851,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16856,7 +16868,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16940,10 +16952,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -16964,7 +16977,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16985,7 +16998,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17006,7 +17019,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17027,7 +17040,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17048,7 +17061,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17069,7 +17082,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17138,10 +17151,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -17158,7 +17172,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17175,7 +17189,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17192,7 +17206,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17209,7 +17223,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17226,7 +17240,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17243,7 +17257,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17312,10 +17326,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -17332,7 +17347,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17349,7 +17364,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17366,7 +17381,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17383,7 +17398,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17400,7 +17415,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17417,7 +17432,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17486,10 +17501,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -17506,7 +17522,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17523,7 +17539,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17540,7 +17556,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17557,7 +17573,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17574,7 +17590,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17591,7 +17607,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17660,10 +17676,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -17680,7 +17697,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17697,7 +17714,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17714,7 +17731,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17731,7 +17748,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17748,7 +17765,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17765,7 +17782,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17834,10 +17851,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -17854,7 +17872,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17871,7 +17889,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17888,7 +17906,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17905,7 +17923,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17922,7 +17940,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17939,7 +17957,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -48614,20 +48632,6 @@ cont {
       color: 12372094
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 12372094
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -48638,17 +48642,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -48673,7 +48666,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -48704,7 +48697,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -48735,7 +48728,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -48773,7 +48766,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -48811,7 +48804,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -48853,7 +48846,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -48895,7 +48888,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -48947,20 +48940,6 @@ cont {
       color: 12372094
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 12372094
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -48971,17 +48950,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -49006,7 +48974,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -49037,7 +49005,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49068,7 +49036,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49106,7 +49074,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49144,7 +49112,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49186,7 +49154,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49228,7 +49196,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49280,20 +49248,6 @@ cont {
       color: 12372094
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 12372094
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -49304,17 +49258,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -49339,7 +49282,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -49370,7 +49313,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49401,7 +49344,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49439,7 +49382,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49477,7 +49420,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49519,7 +49462,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49561,7 +49504,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49613,20 +49556,6 @@ cont {
       color: 12372094
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 12372094
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -49637,17 +49566,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -49672,7 +49590,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -49703,7 +49621,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49734,7 +49652,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49772,7 +49690,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49810,7 +49728,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49852,7 +49770,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49894,7 +49812,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -53141,10 +53059,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -53165,7 +53084,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -53186,7 +53105,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -53207,7 +53126,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -53228,7 +53147,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -53249,7 +53168,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -53270,7 +53189,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -53287,7 +53206,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
   element {
@@ -53295,7 +53213,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
   element {
@@ -53303,7 +53220,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
 }
@@ -54494,7 +54410,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -54511,7 +54426,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -54528,7 +54442,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -54545,7 +54458,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -54562,7 +54474,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -54579,7 +54490,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -56880,6 +56790,15 @@ cont {
       name: "drinking-water-s"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 19
@@ -56887,6 +56806,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 20
@@ -56894,6 +56822,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
 }
 cont {
@@ -56946,6 +56883,15 @@ cont {
       name: "drinking-water-s"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 19
@@ -56953,6 +56899,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 20
@@ -56960,6 +56915,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
 }
 cont {
@@ -57132,15 +57096,6 @@ cont {
       name: "mountain-pass-s"
       priority: 5050
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4950
-    }
   }
   element {
     scale: 12
@@ -57148,15 +57103,6 @@ cont {
       name: "mountain-pass-s"
       priority: 5050
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4950
-    }
   }
   element {
     scale: 13
@@ -57164,15 +57110,6 @@ cont {
       name: "mountain-pass-s"
       priority: 5050
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4950
-    }
   }
   element {
     scale: 14
@@ -57180,15 +57117,6 @@ cont {
       name: "mountain-pass-s"
       priority: 5050
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4950
-    }
   }
   element {
     scale: 15
@@ -57230,7 +57158,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -57246,7 +57174,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -57262,7 +57190,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -57278,7 +57206,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -57944,15 +57872,6 @@ cont {
       name: "cave-s"
       priority: 4650
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5350
-    }
   }
   element {
     scale: 11
@@ -57960,15 +57879,6 @@ cont {
       name: "cave-s"
       priority: 4650
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5350
-    }
   }
   element {
     scale: 12
@@ -57976,15 +57886,6 @@ cont {
       name: "cave-s"
       priority: 4650
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5350
-    }
   }
   element {
     scale: 13
@@ -57992,15 +57893,6 @@ cont {
       name: "cave-s"
       priority: 4650
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5350
-    }
   }
   element {
     scale: 14
@@ -58008,15 +57900,6 @@ cont {
       name: "cave-s"
       priority: 4650
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5350
-    }
   }
   element {
     scale: 15
@@ -58707,13 +58590,12 @@ cont {
     symbol {
       name: "geyser-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -58724,13 +58606,12 @@ cont {
     symbol {
       name: "geyser-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -58741,13 +58622,12 @@ cont {
     symbol {
       name: "geyser-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -58758,13 +58638,12 @@ cont {
     symbol {
       name: "geyser-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -58775,13 +58654,12 @@ cont {
     symbol {
       name: "geyser-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -58792,13 +58670,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -58809,13 +58686,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -58826,13 +58702,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -58843,13 +58718,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -58860,13 +58734,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -58877,13 +58750,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -59172,16 +59044,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -59189,16 +59051,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -59206,16 +59058,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -59223,13 +59065,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -59240,13 +59081,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -59255,15 +59095,14 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-s"
+      name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -59274,13 +59113,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -59291,13 +59129,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -59308,13 +59145,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -59471,7 +59307,15 @@ cont {
     symbol {
       name: "peakt-s"
       priority: 5400
-      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
     }
     apply_if: "name"
   }
@@ -59480,7 +59324,15 @@ cont {
     symbol {
       name: "peakt-s"
       priority: 5400
-      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
     }
     apply_if: "name"
   }
@@ -59489,7 +59341,15 @@ cont {
     symbol {
       name: "peakt-s"
       priority: 5400
-      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 9
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -4600
     }
     apply_if: "name"
   }
@@ -59585,7 +59445,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -59610,7 +59470,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -59635,7 +59495,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -59660,7 +59520,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -59686,6 +59546,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 15
@@ -59693,6 +59562,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 16
@@ -59700,6 +59578,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 17
@@ -59707,6 +59594,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 18
@@ -59714,6 +59610,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 19
@@ -59721,6 +59626,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 20
@@ -59728,6 +59642,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
 }
 cont {
@@ -59777,7 +59700,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -59793,7 +59716,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -59809,7 +59732,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -59825,7 +59748,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -59907,16 +59830,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -59924,16 +59837,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -59941,16 +59844,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -59958,13 +59851,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -59975,13 +59867,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -59990,15 +59881,14 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-s"
+      name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -60009,13 +59899,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -60026,13 +59915,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -60043,13 +59931,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -60222,15 +60109,6 @@ cont {
       name: "volcano-s"
       priority: 5400
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
   }
   element {
     scale: 11
@@ -60238,15 +60116,6 @@ cont {
       name: "volcano-s"
       priority: 5400
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
   }
   element {
     scale: 12
@@ -60254,15 +60123,6 @@ cont {
       name: "volcano-s"
       priority: 5400
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
   }
   element {
     scale: 13
@@ -60336,7 +60196,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -60352,7 +60212,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -60368,7 +60228,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -60384,7 +60244,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -125803,7 +125663,6 @@ cont {
     symbol {
       name: "alpine_hut-s"
       priority: 5800
-      min_distance: 8
     }
     caption {
       primary {
@@ -125820,7 +125679,6 @@ cont {
     symbol {
       name: "alpine_hut-s"
       priority: 5800
-      min_distance: 8
     }
     caption {
       primary {
@@ -125837,7 +125695,6 @@ cont {
     symbol {
       name: "alpine_hut-s"
       priority: 5800
-      min_distance: 8
     }
     caption {
       primary {
@@ -125854,7 +125711,6 @@ cont {
     symbol {
       name: "alpine_hut-s"
       priority: 5800
-      min_distance: 8
     }
     caption {
       primary {
@@ -125871,7 +125727,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 24
     }
     caption {
       primary {
@@ -125888,7 +125743,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 24
     }
     caption {
       primary {
@@ -125905,7 +125759,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -125922,7 +125775,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -125939,7 +125791,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -125956,7 +125807,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -127042,7 +126892,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -127059,7 +126908,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -127076,7 +126924,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -127093,7 +126940,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -127110,7 +126956,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -127127,7 +126972,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -127144,7 +126988,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -127161,7 +127004,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -127181,7 +127023,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 30
     }
     caption {
       primary {
@@ -127198,7 +127039,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 30
     }
     caption {
       primary {
@@ -127215,7 +127055,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 30
     }
     caption {
       primary {
@@ -127232,7 +127071,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 30
     }
     caption {
       primary {
@@ -127249,7 +127087,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -127266,7 +127103,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -127283,7 +127119,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -127300,7 +127135,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -127320,7 +127154,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 24
     }
     caption {
       primary {
@@ -127337,7 +127170,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 24
     }
     caption {
       primary {
@@ -127354,7 +127186,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 24
     }
     caption {
       primary {
@@ -127371,7 +127202,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -127388,7 +127218,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -127405,7 +127234,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -127422,7 +127250,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -128735,7 +128562,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -128752,7 +128578,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -128769,7 +128594,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -128786,7 +128610,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -128803,7 +128626,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -128820,7 +128642,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -128837,7 +128658,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -129240,7 +129060,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 24
     }
     caption {
       primary {
@@ -129257,7 +129076,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 24
     }
     caption {
       primary {
@@ -129274,7 +129092,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 24
     }
     caption {
       primary {
@@ -129291,7 +129108,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 24
     }
     caption {
       primary {
@@ -129308,7 +129124,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -129325,7 +129140,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -129342,7 +129156,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -129359,7 +129172,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -131300,16 +131112,6 @@ cont {
     symbol {
       name: "waterfall-s"
       priority: 5800
-      min_distance: 15
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4200
     }
   }
   element {
@@ -131317,16 +131119,6 @@ cont {
     symbol {
       name: "waterfall-s"
       priority: 5800
-      min_distance: 15
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4200
     }
   }
   element {
@@ -131335,15 +131127,6 @@ cont {
       name: "waterfall-s"
       priority: 5800
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4200
-    }
   }
   element {
     scale: 13
@@ -131351,15 +131134,6 @@ cont {
       name: "waterfall-s"
       priority: 5800
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4200
-    }
   }
   element {
     scale: 14
@@ -131417,7 +131191,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -131433,7 +131207,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -131449,7 +131223,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -131465,7 +131239,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index d08bc2de25..d6921240ca 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index e2af96d6fb..7b3146f436 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -5542,6 +5542,15 @@ cont {
       name: "drinking-water-s"
       priority: 3500
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6500
+    }
   }
   element {
     scale: 19
@@ -11885,29 +11894,11 @@ cont {
 }
 cont {
   name: "amenity-shelter"
-  element {
-    scale: 16
-    symbol {
-      name: "shelter-m"
-      priority: 1500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8500
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -11924,7 +11915,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -11941,7 +11931,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -11958,7 +11947,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -13662,6 +13650,15 @@ cont {
       name: "drinking-water-s"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 19
@@ -15574,7 +15571,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -15589,7 +15586,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -15604,7 +15601,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -15619,7 +15616,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -16112,10 +16109,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -16136,7 +16134,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16157,7 +16155,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16178,7 +16176,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16199,7 +16197,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16220,7 +16218,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16241,7 +16239,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16302,10 +16300,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -16322,7 +16321,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16339,7 +16338,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16356,7 +16355,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16373,7 +16372,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16390,7 +16389,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16407,7 +16406,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16491,10 +16490,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -16515,7 +16515,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16536,7 +16536,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16557,7 +16557,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16578,7 +16578,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16599,7 +16599,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16620,7 +16620,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16681,10 +16681,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -16701,7 +16702,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16718,7 +16719,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16735,7 +16736,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16752,7 +16753,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16769,7 +16770,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16786,7 +16787,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16847,10 +16848,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -16867,7 +16869,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16884,7 +16886,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16901,7 +16903,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16918,7 +16920,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16935,7 +16937,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -16952,7 +16954,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17013,10 +17015,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -17033,7 +17036,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17050,7 +17053,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17067,7 +17070,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17084,7 +17087,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17101,7 +17104,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17118,7 +17121,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17179,10 +17182,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -17199,7 +17203,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17216,7 +17220,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17233,7 +17237,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17250,7 +17254,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17267,7 +17271,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17284,7 +17288,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17345,10 +17349,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -17365,7 +17370,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17382,7 +17387,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17399,7 +17404,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17416,7 +17421,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17433,7 +17438,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -17450,7 +17455,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46197,20 +46202,6 @@ cont {
       color: 12372094
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 12372094
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -46221,17 +46212,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -46256,7 +46236,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -46287,7 +46267,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46318,7 +46298,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46356,7 +46336,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46394,7 +46374,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46436,7 +46416,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46478,7 +46458,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46530,20 +46510,6 @@ cont {
       color: 12372094
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 12372094
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -46554,17 +46520,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -46589,7 +46544,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -46620,7 +46575,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46651,7 +46606,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46689,7 +46644,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46727,7 +46682,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46769,7 +46724,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46811,7 +46766,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46863,20 +46818,6 @@ cont {
       color: 12372094
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 12372094
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -46887,17 +46828,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -46922,7 +46852,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -46953,7 +46883,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -46984,7 +46914,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -47022,7 +46952,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -47060,7 +46990,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -47102,7 +47032,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -47144,7 +47074,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -47196,20 +47126,6 @@ cont {
       color: 12372094
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 12372094
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -47220,17 +47136,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -47255,7 +47160,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -47286,7 +47191,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -47317,7 +47222,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -47355,7 +47260,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -47393,7 +47298,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -47435,7 +47340,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -47477,7 +47382,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -50724,10 +50629,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3832097
         stroke_color: 872415231
         offset_y: 1
@@ -50748,7 +50654,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -50769,7 +50675,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -50790,7 +50696,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -50811,7 +50717,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -50832,7 +50738,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -50853,7 +50759,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -50870,7 +50776,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
   element {
@@ -50878,7 +50783,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
   element {
@@ -50886,7 +50790,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
 }
@@ -52072,29 +51975,11 @@ cont {
 }
 cont {
   name: "leisure-picnic_table"
-  element {
-    scale: 16
-    symbol {
-      name: "picnic_table-m"
-      priority: 1200
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8800
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -52111,7 +51996,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -52128,7 +52012,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -52145,7 +52028,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -54236,6 +54118,15 @@ cont {
       name: "drinking-water-s"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 19
@@ -54243,6 +54134,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 20
@@ -54250,6 +54150,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
 }
 cont {
@@ -54274,6 +54183,15 @@ cont {
       name: "drinking-water-s"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 19
@@ -54281,6 +54199,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 20
@@ -54288,6 +54215,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
 }
 cont {
@@ -54460,15 +54396,6 @@ cont {
       name: "mountain-pass-s"
       priority: 5050
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4950
-    }
   }
   element {
     scale: 15
@@ -54510,7 +54437,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -54526,7 +54453,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -54542,7 +54469,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -54558,7 +54485,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -55218,53 +55145,12 @@ cont {
 }
 cont {
   name: "natural-cave_entrance"
-  element {
-    scale: 12
-    symbol {
-      name: "cave-s"
-      priority: 4650
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5350
-    }
-  }
-  element {
-    scale: 13
-    symbol {
-      name: "cave-s"
-      priority: 4650
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5350
-    }
-  }
   element {
     scale: 14
     symbol {
       name: "cave-s"
       priority: 4650
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5350
-    }
   }
   element {
     scale: 15
@@ -55903,13 +55789,12 @@ cont {
     symbol {
       name: "geyser-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -55920,13 +55805,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -55937,13 +55821,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -55954,13 +55837,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -55971,13 +55853,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -55988,13 +55869,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56005,13 +55885,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56300,16 +56179,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -56317,13 +56186,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56334,13 +56202,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56349,15 +56216,14 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-s"
+      name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56368,13 +56234,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56385,13 +56250,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56402,13 +56266,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56560,15 +56423,6 @@ cont {
 }
 cont {
   name: "natural-peak"
-  element {
-    scale: 12
-    symbol {
-      name: "peakt-s"
-      priority: 5400
-      min_distance: 10
-    }
-    apply_if: "name"
-  }
   element {
     scale: 13
     symbol {
@@ -56661,7 +56515,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56686,7 +56540,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56711,7 +56565,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56736,7 +56590,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56756,19 +56610,21 @@ cont {
 }
 cont {
   name: "natural-rock"
-  element {
-    scale: 16
-    symbol {
-      name: "peakt-s"
-      priority: 2850
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 18
@@ -56776,6 +56632,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 19
@@ -56783,6 +56648,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 20
@@ -56790,6 +56664,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
 }
 cont {
@@ -56825,7 +56708,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56841,7 +56724,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56857,7 +56740,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56873,7 +56756,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -56955,16 +56838,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -56972,13 +56845,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56989,13 +56861,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -57004,15 +56875,14 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-s"
+      name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -57023,13 +56893,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -57040,13 +56909,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -57057,13 +56925,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -57198,53 +57065,12 @@ cont {
 }
 cont {
   name: "natural-volcano"
-  element {
-    scale: 10
-    symbol {
-      name: "volcano-s"
-      priority: 5400
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
-  }
-  element {
-    scale: 11
-    symbol {
-      name: "volcano-s"
-      priority: 5400
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
-  }
   element {
     scale: 12
     symbol {
       name: "volcano-s"
       priority: 5400
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
   }
   element {
     scale: 13
@@ -57318,7 +57144,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -57334,7 +57160,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -57350,7 +57176,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -57366,7 +57192,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -69575,27 +69401,6 @@ cont {
 }
 cont {
   name: "power-tower"
-  element {
-    scale: 16
-    symbol {
-      name: "dot-m"
-      priority: 450
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "dot-m"
-      priority: 450
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "dot-m"
-      priority: 450
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -121586,7 +121391,6 @@ cont {
     symbol {
       name: "alpine_hut-s"
       priority: 5800
-      min_distance: 8
     }
     caption {
       primary {
@@ -121603,7 +121407,6 @@ cont {
     symbol {
       name: "alpine_hut-s"
       priority: 5800
-      min_distance: 8
     }
     caption {
       primary {
@@ -121620,7 +121423,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 24
     }
     caption {
       primary {
@@ -121637,7 +121439,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 24
     }
     caption {
       primary {
@@ -121654,7 +121455,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -121671,7 +121471,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -121688,7 +121487,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -121705,7 +121503,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -122786,29 +122583,11 @@ cont {
 }
 cont {
   name: "tourism-camp_site"
-  element {
-    scale: 15
-    symbol {
-      name: "campsite-m"
-      priority: 3800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6200
-    }
-  }
   element {
     scale: 16
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -122825,7 +122604,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -122842,7 +122620,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -122859,7 +122636,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -122876,7 +122652,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -122896,7 +122671,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 30
     }
     caption {
       primary {
@@ -122913,7 +122687,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -122930,7 +122703,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -122947,7 +122719,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -122964,7 +122735,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -122984,7 +122754,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 24
     }
     caption {
       primary {
@@ -123001,7 +122770,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -123018,7 +122786,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -123035,7 +122802,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -123052,7 +122818,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -124229,7 +123994,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -124246,7 +124010,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -124263,7 +124026,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -124280,7 +124042,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -124297,7 +124058,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -124649,7 +124409,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 24
     }
     caption {
       primary {
@@ -124666,7 +124425,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -124683,7 +124441,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -124700,7 +124457,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -124717,7 +124473,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -126621,54 +126376,12 @@ cont {
 }
 cont {
   name: "waterway-waterfall"
-  element {
-    scale: 11
-    symbol {
-      name: "waterfall-s"
-      priority: 5800
-      min_distance: 15
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4200
-    }
-  }
-  element {
-    scale: 12
-    symbol {
-      name: "waterfall-s"
-      priority: 5800
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4200
-    }
-  }
   element {
     scale: 13
     symbol {
       name: "waterfall-s"
       priority: 5800
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4200
-    }
   }
   element {
     scale: 14
@@ -126726,7 +126439,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -126742,7 +126455,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -126758,7 +126471,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -126774,7 +126487,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 8f10909dd5..1bfd6522ab 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index ff74d060de..56d9e146e6 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5542,6 +5542,15 @@ cont {
       name: "drinking-water-s"
       priority: 3500
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6500
+    }
   }
   element {
     scale: 19
@@ -11885,29 +11894,11 @@ cont {
 }
 cont {
   name: "amenity-shelter"
-  element {
-    scale: 16
-    symbol {
-      name: "shelter-m"
-      priority: 1500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8500
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -11924,7 +11915,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -11941,7 +11931,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -11958,7 +11947,6 @@ cont {
     symbol {
       name: "shelter-m"
       priority: 1500
-      min_distance: 10
     }
     caption {
       primary {
@@ -13662,6 +13650,15 @@ cont {
       name: "drinking-water-s"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 19
@@ -15574,7 +15571,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 856032768
       }
@@ -15589,7 +15586,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 856032768
       }
@@ -15604,7 +15601,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 856032768
       }
@@ -15619,7 +15616,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 856032768
       }
@@ -16112,10 +16109,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -16136,7 +16134,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16157,7 +16155,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16178,7 +16176,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16199,7 +16197,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16220,7 +16218,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16241,7 +16239,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16302,10 +16300,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -16322,7 +16321,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16339,7 +16338,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16356,7 +16355,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16373,7 +16372,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16390,7 +16389,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16407,7 +16406,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16491,10 +16490,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -16515,7 +16515,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16536,7 +16536,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16557,7 +16557,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16578,7 +16578,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16599,7 +16599,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16620,7 +16620,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16681,10 +16681,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -16701,7 +16702,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16718,7 +16719,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16735,7 +16736,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16752,7 +16753,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16769,7 +16770,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16786,7 +16787,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16847,10 +16848,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -16867,7 +16869,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16884,7 +16886,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16901,7 +16903,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16918,7 +16920,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16935,7 +16937,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -16952,7 +16954,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17013,10 +17015,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -17033,7 +17036,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17050,7 +17053,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17067,7 +17070,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17084,7 +17087,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17101,7 +17104,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17118,7 +17121,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17179,10 +17182,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -17199,7 +17203,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17216,7 +17220,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17233,7 +17237,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17250,7 +17254,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17267,7 +17271,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17284,7 +17288,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17345,10 +17349,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -17365,7 +17370,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17382,7 +17387,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17399,7 +17404,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17416,7 +17421,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17433,7 +17438,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -17450,7 +17455,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -46461,20 +46466,6 @@ cont {
       color: 1317888
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 1317888
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -46485,17 +46476,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 2836760
-        stroke_color: 856032768
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -46520,7 +46500,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -46551,7 +46531,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -46582,7 +46562,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -46620,7 +46600,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -46658,7 +46638,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -46700,7 +46680,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -46742,7 +46722,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -46794,20 +46774,6 @@ cont {
       color: 1317888
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 1317888
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -46818,17 +46784,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 2836760
-        stroke_color: 856032768
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -46853,7 +46808,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -46884,7 +46839,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -46915,7 +46870,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -46953,7 +46908,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -46991,7 +46946,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47033,7 +46988,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47075,7 +47030,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47127,20 +47082,6 @@ cont {
       color: 1317888
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 1317888
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -47151,17 +47092,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 2836760
-        stroke_color: 856032768
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -47186,7 +47116,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -47217,7 +47147,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47248,7 +47178,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47286,7 +47216,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47324,7 +47254,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47366,7 +47296,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47408,7 +47338,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47460,20 +47390,6 @@ cont {
       color: 1317888
       priority: -1940
     }
-    symbol {
-      name: "nparkf-outline-s"
-      priority: 4800
-      min_distance: 12
-    }
-    apply_if: "name"
-  }
-  element {
-    scale: 12
-    area {
-      color: 1317888
-      priority: -1940
-    }
-    apply_if: "!name"
   }
   element {
     scale: 13
@@ -47484,17 +47400,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 2836760
-        stroke_color: 856032768
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5200
     }
     apply_if: "name"
   }
@@ -47519,7 +47424,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -47550,7 +47455,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47581,7 +47486,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47619,7 +47524,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47657,7 +47562,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47699,7 +47604,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -47741,7 +47646,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -50988,10 +50893,11 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 2836760
         stroke_color: 856032768
         offset_y: 1
@@ -51012,7 +50918,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -51033,7 +50939,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -51054,7 +50960,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -51075,7 +50981,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -51096,7 +51002,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -51117,7 +51023,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -51134,7 +51040,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
   element {
@@ -51142,7 +51047,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
   element {
@@ -51150,7 +51054,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
 }
@@ -52336,29 +52239,11 @@ cont {
 }
 cont {
   name: "leisure-picnic_table"
-  element {
-    scale: 16
-    symbol {
-      name: "picnic_table-m"
-      priority: 1200
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -8800
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -52375,7 +52260,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -52392,7 +52276,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -52409,7 +52292,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -54482,6 +54364,15 @@ cont {
       name: "drinking-water-s"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 19
@@ -54489,6 +54380,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 20
@@ -54496,6 +54396,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
 }
 cont {
@@ -54520,6 +54429,15 @@ cont {
       name: "drinking-water-s"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 19
@@ -54527,6 +54445,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
   element {
     scale: 20
@@ -54534,6 +54461,15 @@ cont {
       name: "drinking-water-m"
       priority: 3050
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6950
+    }
   }
 }
 cont {
@@ -54706,15 +54642,6 @@ cont {
       name: "mountain-pass-s"
       priority: 5050
     }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4950
-    }
   }
   element {
     scale: 15
@@ -54756,7 +54683,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -54772,7 +54699,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -54788,7 +54715,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -54804,7 +54731,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -55464,53 +55391,12 @@ cont {
 }
 cont {
   name: "natural-cave_entrance"
-  element {
-    scale: 12
-    symbol {
-      name: "cave-s"
-      priority: 4650
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5350
-    }
-  }
-  element {
-    scale: 13
-    symbol {
-      name: "cave-s"
-      priority: 4650
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5350
-    }
-  }
   element {
     scale: 14
     symbol {
       name: "cave-s"
       priority: 4650
     }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5350
-    }
   }
   element {
     scale: 15
@@ -56149,13 +56035,12 @@ cont {
     symbol {
       name: "geyser-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 9211020
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56166,13 +56051,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56183,13 +56067,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56200,13 +56083,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56217,13 +56099,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56234,13 +56115,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56251,13 +56131,12 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56546,16 +56425,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -56563,13 +56432,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 9211020
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56580,13 +56448,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 9211020
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56595,15 +56462,14 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-s"
+      name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56614,13 +56480,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56631,13 +56496,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56648,13 +56512,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -56786,15 +56649,6 @@ cont {
 }
 cont {
   name: "natural-peak"
-  element {
-    scale: 12
-    symbol {
-      name: "peakt-s"
-      priority: 5400
-      min_distance: 10
-    }
-    apply_if: "name"
-  }
   element {
     scale: 13
     symbol {
@@ -56887,7 +56741,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -56912,7 +56766,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -56937,7 +56791,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -56962,7 +56816,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -56982,19 +56836,21 @@ cont {
 }
 cont {
   name: "natural-rock"
-  element {
-    scale: 16
-    symbol {
-      name: "peakt-s"
-      priority: 2850
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 18
@@ -57002,6 +56858,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 19
@@ -57009,6 +56874,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 20
@@ -57016,6 +56890,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
 }
 cont {
@@ -57051,7 +56934,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -57067,7 +56950,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -57083,7 +56966,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -57099,7 +56982,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -57181,16 +57064,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -57198,13 +57071,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 9211020
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -57215,13 +57087,12 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
         height: 10
         color: 9211020
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -57230,15 +57101,14 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "drinking-water-s"
+      name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 6
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -57249,13 +57119,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -57266,13 +57135,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -57283,13 +57151,12 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
-        offset_y: 8
+        offset_y: 1
         is_optional: true
       }
       priority: -5350
@@ -57424,53 +57291,12 @@ cont {
 }
 cont {
   name: "natural-volcano"
-  element {
-    scale: 10
-    symbol {
-      name: "volcano-s"
-      priority: 5400
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
-  }
-  element {
-    scale: 11
-    symbol {
-      name: "volcano-s"
-      priority: 5400
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
-  }
   element {
     scale: 12
     symbol {
       name: "volcano-s"
       priority: 5400
     }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
   }
   element {
     scale: 13
@@ -57544,7 +57370,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -57560,7 +57386,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -57576,7 +57402,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -57592,7 +57418,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -69790,27 +69616,6 @@ cont {
 }
 cont {
   name: "power-tower"
-  element {
-    scale: 16
-    symbol {
-      name: "dot-m"
-      priority: 450
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "dot-m"
-      priority: 450
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "dot-m"
-      priority: 450
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -121801,7 +121606,6 @@ cont {
     symbol {
       name: "alpine_hut-s"
       priority: 5800
-      min_distance: 8
     }
     caption {
       primary {
@@ -121818,7 +121622,6 @@ cont {
     symbol {
       name: "alpine_hut-s"
       priority: 5800
-      min_distance: 8
     }
     caption {
       primary {
@@ -121835,7 +121638,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 24
     }
     caption {
       primary {
@@ -121852,7 +121654,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 24
     }
     caption {
       primary {
@@ -121869,7 +121670,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -121886,7 +121686,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -121903,7 +121702,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -121920,7 +121718,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 5800
-      min_distance: 16
     }
     caption {
       primary {
@@ -123001,29 +122798,11 @@ cont {
 }
 cont {
   name: "tourism-camp_site"
-  element {
-    scale: 15
-    symbol {
-      name: "campsite-m"
-      priority: 3800
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6200
-    }
-  }
   element {
     scale: 16
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -123040,7 +122819,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -123057,7 +122835,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -123074,7 +122851,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -123091,7 +122867,6 @@ cont {
     symbol {
       name: "campsite-m"
       priority: 3800
-      min_distance: 12
     }
     caption {
       primary {
@@ -123111,7 +122886,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 30
     }
     caption {
       primary {
@@ -123128,7 +122902,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -123145,7 +122918,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -123162,7 +122934,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -123179,7 +122950,6 @@ cont {
     symbol {
       name: "caravan_site-m"
       priority: 3800
-      min_distance: 20
     }
     caption {
       primary {
@@ -123199,7 +122969,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 24
     }
     caption {
       primary {
@@ -123216,7 +122985,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -123233,7 +123001,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -123250,7 +123017,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -123267,7 +123033,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3800
-      min_distance: 16
     }
     caption {
       primary {
@@ -124444,7 +124209,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -124461,7 +124225,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -124478,7 +124241,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -124495,7 +124257,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -124512,7 +124273,6 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 1800
-      min_distance: 10
     }
     caption {
       primary {
@@ -124864,7 +124624,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 24
     }
     caption {
       primary {
@@ -124881,7 +124640,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -124898,7 +124656,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -124915,7 +124672,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -124932,7 +124688,6 @@ cont {
     symbol {
       name: "alpine_hut-m"
       priority: 3900
-      min_distance: 16
     }
     caption {
       primary {
@@ -126836,54 +126591,12 @@ cont {
 }
 cont {
   name: "waterway-waterfall"
-  element {
-    scale: 11
-    symbol {
-      name: "waterfall-s"
-      priority: 5800
-      min_distance: 15
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4200
-    }
-  }
-  element {
-    scale: 12
-    symbol {
-      name: "waterfall-s"
-      priority: 5800
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4200
-    }
-  }
   element {
     scale: 13
     symbol {
       name: "waterfall-s"
       priority: 5800
     }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4200
-    }
   }
   element {
     scale: 14
@@ -126941,7 +126654,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -126957,7 +126670,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -126973,7 +126686,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
@@ -126989,7 +126702,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 9211020
         offset_y: 1
         is_optional: true
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index f258765ba3..2720de6c61 100644
Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ
diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 00819cd7ff..14fb5c4dbc 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -15864,7 +15864,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -15879,7 +15879,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -15894,7 +15894,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -15909,7 +15909,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 872415231
       }
@@ -16339,7 +16339,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -16373,7 +16372,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -16417,6 +16416,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -16563,7 +16563,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -16589,7 +16588,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -16625,6 +16624,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -16751,7 +16751,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -16785,7 +16784,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -16829,6 +16828,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -16975,7 +16975,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -17001,7 +17000,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -17037,6 +17036,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -17159,7 +17159,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -17185,7 +17184,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -17221,6 +17220,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -17343,7 +17343,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -17369,7 +17368,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -17405,6 +17404,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -17527,7 +17527,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -17553,7 +17552,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -17589,6 +17588,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -17711,7 +17711,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -17737,7 +17736,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -17773,6 +17772,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -49118,7 +49118,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
     }
     apply_if: "name"
   }
@@ -49137,15 +49136,14 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
-      min_distance: 12
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
         is_optional: true
       }
@@ -49168,7 +49166,7 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
       min_distance: 8
     }
@@ -49176,7 +49174,7 @@ cont {
       primary {
         height: 11
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
         is_optional: true
       }
@@ -49205,7 +49203,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49236,7 +49234,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49451,7 +49449,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
     }
     apply_if: "name"
   }
@@ -49470,15 +49467,14 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
-      min_distance: 12
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
         is_optional: true
       }
@@ -49501,7 +49497,7 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
       min_distance: 8
     }
@@ -49509,7 +49505,7 @@ cont {
       primary {
         height: 11
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
         is_optional: true
       }
@@ -49538,7 +49534,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49569,7 +49565,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49784,7 +49780,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
     }
     apply_if: "name"
   }
@@ -49803,15 +49798,14 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
-      min_distance: 12
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
         is_optional: true
       }
@@ -49834,7 +49828,7 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
       min_distance: 8
     }
@@ -49842,7 +49836,7 @@ cont {
       primary {
         height: 11
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
         is_optional: true
       }
@@ -49871,7 +49865,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -49902,7 +49896,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -50117,7 +50111,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
     }
     apply_if: "name"
   }
@@ -50136,15 +50129,14 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
-      min_distance: 12
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
         is_optional: true
       }
@@ -50167,7 +50159,7 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
       min_distance: 8
     }
@@ -50175,7 +50167,7 @@ cont {
       primary {
         height: 11
         color: 3832097
-        stroke_color: 872415231
+        stroke_color: 452984831
         offset_y: 1
         is_optional: true
       }
@@ -50204,7 +50196,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -50235,7 +50227,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 452984831
         offset_y: 1
@@ -53579,7 +53571,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -53613,7 +53604,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -53657,6 +53648,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -53803,7 +53795,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
   element {
@@ -53811,7 +53802,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
   element {
@@ -53819,7 +53809,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
 }
@@ -55017,7 +55006,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -55034,7 +55022,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -55051,7 +55038,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -55068,7 +55054,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -55085,7 +55070,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -59449,7 +59433,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59466,7 +59449,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59483,7 +59465,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59500,7 +59481,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59517,7 +59497,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59534,7 +59513,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59551,7 +59529,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59860,16 +59837,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -59877,7 +59844,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59894,7 +59860,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59911,7 +59876,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59928,7 +59892,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59945,7 +59908,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59962,7 +59924,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60395,6 +60356,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 18
@@ -60402,6 +60372,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 19
@@ -60409,6 +60388,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 20
@@ -60416,6 +60404,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
 }
 cont {
@@ -60618,7 +60615,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60635,7 +60631,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60652,7 +60647,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60669,7 +60663,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60686,7 +60679,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60703,7 +60695,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60720,7 +60711,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60895,15 +60885,6 @@ cont {
       name: "volcano-s"
       priority: 5400
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
   }
   element {
     scale: 11
@@ -60911,15 +60892,6 @@ cont {
       name: "volcano-s"
       priority: 5400
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
   }
   element {
     scale: 12
@@ -60927,15 +60899,6 @@ cont {
       name: "volcano-s"
       priority: 5400
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
   }
   element {
     scale: 13
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 5bcf7a7269..3019573411 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 6fcba7d0be..ccd9020a5f 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -15864,7 +15864,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 856032768
       }
@@ -15879,7 +15879,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 856032768
       }
@@ -15894,7 +15894,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 856032768
       }
@@ -15909,7 +15909,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 6967599
         stroke_color: 856032768
       }
@@ -16339,7 +16339,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -16373,7 +16372,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -16417,6 +16416,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -16563,7 +16563,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -16589,7 +16588,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -16625,6 +16624,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -16751,7 +16751,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -16785,7 +16784,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -16829,6 +16828,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -16975,7 +16975,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -17001,7 +17000,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -17037,6 +17036,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -17159,7 +17159,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -17185,7 +17184,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -17221,6 +17220,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -17343,7 +17343,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -17369,7 +17368,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -17405,6 +17404,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -17527,7 +17527,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -17553,7 +17552,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -17589,6 +17588,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -17711,7 +17711,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -17737,7 +17736,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -17773,6 +17772,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -49382,7 +49382,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
     }
     apply_if: "name"
   }
@@ -49401,15 +49400,14 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
-      min_distance: 12
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 2836760
-        stroke_color: 856032768
+        stroke_color: 436602368
         offset_y: 1
         is_optional: true
       }
@@ -49432,7 +49430,7 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
       min_distance: 8
     }
@@ -49440,7 +49438,7 @@ cont {
       primary {
         height: 11
         color: 2836760
-        stroke_color: 856032768
+        stroke_color: 436602368
         offset_y: 1
         is_optional: true
       }
@@ -49469,7 +49467,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -49500,7 +49498,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -49715,7 +49713,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
     }
     apply_if: "name"
   }
@@ -49734,15 +49731,14 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
-      min_distance: 12
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 2836760
-        stroke_color: 856032768
+        stroke_color: 436602368
         offset_y: 1
         is_optional: true
       }
@@ -49765,7 +49761,7 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
       min_distance: 8
     }
@@ -49773,7 +49769,7 @@ cont {
       primary {
         height: 11
         color: 2836760
-        stroke_color: 856032768
+        stroke_color: 436602368
         offset_y: 1
         is_optional: true
       }
@@ -49802,7 +49798,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -49833,7 +49829,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -50048,7 +50044,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
     }
     apply_if: "name"
   }
@@ -50067,15 +50062,14 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
-      min_distance: 12
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 2836760
-        stroke_color: 856032768
+        stroke_color: 436602368
         offset_y: 1
         is_optional: true
       }
@@ -50098,7 +50092,7 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
       min_distance: 8
     }
@@ -50106,7 +50100,7 @@ cont {
       primary {
         height: 11
         color: 2836760
-        stroke_color: 856032768
+        stroke_color: 436602368
         offset_y: 1
         is_optional: true
       }
@@ -50135,7 +50129,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -50166,7 +50160,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -50381,7 +50375,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 4800
-      min_distance: 12
     }
     apply_if: "name"
   }
@@ -50400,15 +50393,14 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
-      min_distance: 12
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 2836760
-        stroke_color: 856032768
+        stroke_color: 436602368
         offset_y: 1
         is_optional: true
       }
@@ -50431,7 +50423,7 @@ cont {
       priority: -1940
     }
     symbol {
-      name: "nparkf-outline-s"
+      name: "nparkf-outline-m"
       priority: 4800
       min_distance: 8
     }
@@ -50439,7 +50431,7 @@ cont {
       primary {
         height: 11
         color: 2836760
-        stroke_color: 856032768
+        stroke_color: 436602368
         offset_y: 1
         is_optional: true
       }
@@ -50468,7 +50460,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -50499,7 +50491,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 2836760
         stroke_color: 436602368
         offset_y: 1
@@ -53843,7 +53835,6 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
     }
   }
   element {
@@ -53877,7 +53868,7 @@ cont {
     symbol {
       name: "nparkf-outline-s"
       priority: 6700
-      min_distance: 20
+      min_distance: 12
     }
     caption {
       primary {
@@ -53921,6 +53912,7 @@ cont {
     symbol {
       name: "nparkf-outline-m"
       priority: 6700
+      min_distance: 12
     }
     caption {
       primary {
@@ -54067,7 +54059,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
   element {
@@ -54075,7 +54066,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
   element {
@@ -54083,7 +54073,6 @@ cont {
     symbol {
       name: "outdoor_seating-m"
       priority: 450
-      min_distance: 10
     }
   }
 }
@@ -55281,7 +55270,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -55298,7 +55286,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -55315,7 +55302,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -55332,7 +55318,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -55349,7 +55334,6 @@ cont {
     symbol {
       name: "picnic_table-m"
       priority: 1200
-      min_distance: 10
     }
     caption {
       primary {
@@ -59695,7 +59679,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59712,7 +59695,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59729,7 +59711,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59746,7 +59727,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59763,7 +59743,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59780,7 +59759,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -59797,7 +59775,6 @@ cont {
     symbol {
       name: "geyser-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60106,16 +60083,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 6
-        is_optional: true
-      }
-      priority: -5350
     }
   }
   element {
@@ -60123,7 +60090,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60140,7 +60106,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60157,7 +60122,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60174,7 +60138,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60191,7 +60154,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60208,7 +60170,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60621,6 +60582,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 18
@@ -60628,6 +60598,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 19
@@ -60635,6 +60614,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
   element {
     scale: 20
@@ -60642,6 +60630,15 @@ cont {
       name: "peakt-s"
       priority: 2850
     }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7150
+    }
   }
 }
 cont {
@@ -60844,7 +60841,6 @@ cont {
     symbol {
       name: "drinking-water-s"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60861,7 +60857,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60878,7 +60873,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60895,7 +60889,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60912,7 +60905,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60929,7 +60921,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -60946,7 +60937,6 @@ cont {
     symbol {
       name: "drinking-water-m"
       priority: 4650
-      min_distance: 24
     }
     caption {
       primary {
@@ -61121,15 +61111,6 @@ cont {
       name: "volcano-s"
       priority: 5400
     }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
   }
   element {
     scale: 11
@@ -61137,15 +61118,6 @@ cont {
       name: "volcano-s"
       priority: 5400
     }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
   }
   element {
     scale: 12
@@ -61153,15 +61125,6 @@ cont {
       name: "volcano-s"
       priority: 5400
     }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4600
-    }
   }
   element {
     scale: 13
diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
index 48ff25bc25..def4748c3a 100644
--- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt
@@ -126,10 +126,10 @@ leisure-park-permissive                             # area z10- (also has icon z
 leisure-park-private                                # area z10- (also has icon z14-, caption(optional) z14-)
 === 70
 
-landuse-forest                                      # area z10- (also has icon z12-, caption(optional) z13-)
-landuse-forest-coniferous                           # area z10- (also has icon z12-, caption(optional) z13-)
-landuse-forest-deciduous                            # area z10- (also has icon z12-, caption(optional) z13-)
-landuse-forest-mixed                                # area z10- (also has icon z12-, caption(optional) z13-)
+landuse-forest                                      # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-coniferous                           # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-deciduous                            # area z10- (also has icon z13-, caption(optional) z14-)
+landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
 === 60
 
 landuse-churchyard                                  # area z15-
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 64b59302f2..e89f17b403 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -282,7 +282,7 @@ highway-primary_link-tunnel                         # pathtext z11- (also has sh
 barrier-border_control                              # icon z14- (also has caption(optional) z14-)
 railway-halt                                        # icon z13- (also has caption(optional) z13-)
 tourism-alpine_hut                                  # icon z13- (also has caption(optional) z13-)
-waterway-waterfall                                  # icon z11- (also has caption(optional) z11-)
+waterway-waterfall                                  # icon z13- (also has caption(optional) z14-)
 === 5800
 
 place-hamlet                                        # caption z13-
@@ -300,8 +300,8 @@ highway-secondary-tunnel                            # pathtext z10- (also has sh
 === 5600
 
 man_made-lighthouse                                 # icon z14- (also has caption(optional) z14-)
-natural-peak                                        # icon z12- (also has caption(optional) z13-)
-natural-volcano                                     # icon z10- (also has caption(optional) z10-)
+natural-peak                                        # icon z13- (also has caption(optional) z13-)
+natural-volcano                                     # icon z12- (also has caption(optional) z13-)
 === 5400
 
 amenity-theatre                                     # icon z14- (also has caption(optional) z14-)
@@ -324,23 +324,23 @@ leisure-stadium                                     # icon z13- (also has captio
 leisure-marina                                      # icon z16- (also has caption(optional) z16-)
 leisure-park                                        # icon z14- (also has caption(optional) z14-, area z10-)
 leisure-park-permissive                             # icon z14- (also has caption(optional) z14-, area z10-)
-mountain_pass                                       # icon z14- (also has caption(optional) z14-)
+mountain_pass                                       # icon z14- (also has caption(optional) z15-)
 place-square                                        # caption z16-
 === 5050
 
 tourism-viewpoint                                   # icon z14- (also has caption(optional) z14-)
 === 4950
 
-landuse-forest                                      # icon z12- (also has caption(optional) z13-, area z10-)
-landuse-forest-coniferous                           # icon z12- (also has caption(optional) z13-, area z10-)
-landuse-forest-deciduous                            # icon z12- (also has caption(optional) z13-, area z10-)
-landuse-forest-mixed                                # icon z12- (also has caption(optional) z13-, area z10-)
+landuse-forest                                      # icon z13- (also has caption(optional) z14-, area z10-)
+landuse-forest-coniferous                           # icon z13- (also has caption(optional) z14-, area z10-)
+landuse-forest-deciduous                            # icon z13- (also has caption(optional) z14-, area z10-)
+landuse-forest-mixed                                # icon z13- (also has caption(optional) z14-, area z10-)
 === 4800
 
-natural-cave_entrance                               # icon z12- (also has caption(optional) z12-)
+natural-cave_entrance                               # icon z14- (also has caption(optional) z15-)
 natural-geyser                                      # icon z14- (also has caption(optional) z14-)
-natural-hot_spring                                  # icon z14- (also has caption(optional) z14-)
-natural-spring                                      # icon z14- (also has caption(optional) z14-)
+natural-hot_spring                                  # icon z14- (also has caption(optional) z15-)
+natural-spring                                      # icon z14- (also has caption(optional) z15-)
 === 4650
 
 natural-saddle                                      # icon z15- (also has caption(optional) z16-)
@@ -405,7 +405,7 @@ tourism-wilderness_hut                              # icon z16- (also has captio
 === 3900
 
 highway-rest_area                                   # icon z15- (also has caption(optional) z15-)
-tourism-camp_site                                   # icon z15- (also has caption(optional) z15-)
+tourism-camp_site                                   # icon z16- (also has caption(optional) z16-)
 tourism-caravan_site                                # icon z16- (also has caption(optional) z16-)
 tourism-chalet                                      # icon z16- (also has caption(optional) z16-)
 === 3800
@@ -534,7 +534,7 @@ railway-tram_stop                                   # icon z14- (also has captio
 highway-bus_stop                                    # icon z16- (also has caption(optional) z17-)
 === 3600
 
-amenity-drinking_water                              # icon z16- (also has caption(optional) z19-)
+amenity-drinking_water                              # icon z16- (also has caption(optional) z18-)
 === 3500
 
 isoline-step_1000                                   # pathtext z11- (also has line z11-)
@@ -586,7 +586,7 @@ highway-unclassified-bridge                         # pathtext z13- (also has li
 highway-unclassified-tunnel                         # pathtext z13- (also has line z11-, line(casing) z16-)
 === 3100
 
-amenity-water_point                                 # icon z16- (also has caption(optional) z19-)
+amenity-water_point                                 # icon z16- (also has caption(optional) z18-)
 highway-raceway                                     # pathtext z16- (also has line z14-)
 historic-aircraft                                   # icon z16- (also has caption(optional) z16-)
 historic-locomotive                                 # icon z16- (also has caption(optional) z16-)
@@ -597,8 +597,8 @@ historic-wreck                                      # icon z16- (also has captio
 landuse-allotments                                  # caption z15- (also has area z12-)
 landuse-cemetery                                    # icon z15- (also has caption(optional) z15-, area z14-)
 landuse-cemetery-christian                          # icon z15- (also has caption(optional) z15-, area z14-)
-man_made-water_tap                                  # icon z16-
-man_made-water_well                                 # icon z16-
+man_made-water_tap                                  # icon z16- (also has caption(optional) z18-)
+man_made-water_well                                 # icon z16- (also has caption(optional) z18-)
 man_made-windmill                                   # icon z16- (also has caption(optional) z16-)
 === 3050
 
@@ -683,7 +683,7 @@ waterway-weir                                       # pathtext z15- (also has li
 === 2900
 
 highway-ford                                        # icon z16- and pathtext z16- (also has line z13-)
-natural-rock                                        # icon z16-
+natural-rock                                        # icon z17- (also has caption(optional) z17-)
 === 2850
 
 highway-bridleway                                   # pathtext z15- (also has line z14-)
@@ -989,7 +989,7 @@ tourism-artwork-architecture                        # icon z15- (also has captio
 tourism-artwork-painting                            # icon z15- (also has caption(optional) z15-)
 === 1550
 
-amenity-shelter                                     # icon z16- (also has caption(optional) z16-)
+amenity-shelter                                     # icon z17- (also has caption(optional) z17-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
 === 1500
@@ -1051,7 +1051,7 @@ amenity-vending_machine-fuel                        # icon z18- (also has captio
 amenity-vending_machine-parking_tickets             # icon z17- (also has caption(optional) z17-)
 amenity-vending_machine-public_transport_tickets    # icon z17- (also has caption(optional) z17-)
 highway-elevator                                    # icon z17-
-leisure-picnic_table                                # icon z16- (also has caption(optional) z16-)
+leisure-picnic_table                                # icon z17- (also has caption(optional) z17-)
 === 1200
 
 isoline-step_10                                     # pathtext z17- (also has line z15-)
@@ -1151,7 +1151,7 @@ leisure-outdoor_seating                             # icon z18-
 man_made-mast                                       # icon z16-
 man_made-silo                                       # icon z16- (also has caption(optional) z18-)
 man_made-storage_tank                               # icon z16- (also has caption(optional) z18-)
-power-tower                                         # icon z16-
+power-tower                                         # icon z19-
 === 450
 
 amenity-parking                                     # icon z16- (also has caption(optional) z18-, area z15-)
@@ -1407,12 +1407,12 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-border_control                            # caption(optional) z14- (also has icon z14-)
 # railway-halt                                      # caption(optional) z13- (also has icon z13-)
 # tourism-alpine_hut                                # caption(optional) z13- (also has icon z13-)
-# waterway-waterfall                                # caption(optional) z11- (also has icon z11-)
+# waterway-waterfall                                # caption(optional) z14- (also has icon z13-)
 # === -4200
 
 # man_made-lighthouse                               # caption(optional) z14- (also has icon z14-)
-# natural-peak                                      # caption(optional) z13- (also has icon z12-)
-# natural-volcano                                   # caption(optional) z10- (also has icon z10-)
+# natural-peak                                      # caption(optional) z13- (also has icon z13-)
+# natural-volcano                                   # caption(optional) z13- (also has icon z12-)
 # === -4600
 
 # amenity-theatre                                   # caption(optional) z14- (also has icon z14-)
@@ -1435,22 +1435,22 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-marina                                    # caption(optional) z16- (also has icon z16-)
 # leisure-park                                      # caption(optional) z14- (also has icon z14-, area z10-)
 # leisure-park-permissive                           # caption(optional) z14- (also has icon z14-, area z10-)
-# mountain_pass                                     # caption(optional) z14- (also has icon z14-)
+# mountain_pass                                     # caption(optional) z15- (also has icon z14-)
 # === -4950
 
 # tourism-viewpoint                                 # caption(optional) z14- (also has icon z14-)
 # === -5050
 
-# landuse-forest                                    # caption(optional) z13- (also has icon z12-, area z10-)
-# landuse-forest-coniferous                         # caption(optional) z13- (also has icon z12-, area z10-)
-# landuse-forest-deciduous                          # caption(optional) z13- (also has icon z12-, area z10-)
-# landuse-forest-mixed                              # caption(optional) z13- (also has icon z12-, area z10-)
+# landuse-forest                                    # caption(optional) z14- (also has icon z13-, area z10-)
+# landuse-forest-coniferous                         # caption(optional) z14- (also has icon z13-, area z10-)
+# landuse-forest-deciduous                          # caption(optional) z14- (also has icon z13-, area z10-)
+# landuse-forest-mixed                              # caption(optional) z14- (also has icon z13-, area z10-)
 # === -5200
 
-# natural-cave_entrance                             # caption(optional) z12- (also has icon z12-)
+# natural-cave_entrance                             # caption(optional) z15- (also has icon z14-)
 # natural-geyser                                    # caption(optional) z14- (also has icon z14-)
-# natural-hot_spring                                # caption(optional) z14- (also has icon z14-)
-# natural-spring                                    # caption(optional) z14- (also has icon z14-)
+# natural-hot_spring                                # caption(optional) z15- (also has icon z14-)
+# natural-spring                                    # caption(optional) z15- (also has icon z14-)
 # === -5350
 
 # natural-saddle                                    # caption(optional) z16- (also has icon z15-)
@@ -1514,7 +1514,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -6100
 
 # highway-rest_area                                 # caption(optional) z15- (also has icon z15-)
-# tourism-camp_site                                 # caption(optional) z15- (also has icon z15-)
+# tourism-camp_site                                 # caption(optional) z16- (also has icon z16-)
 # tourism-caravan_site                              # caption(optional) z16- (also has icon z16-)
 # tourism-chalet                                    # caption(optional) z16- (also has icon z16-)
 # === -6200
@@ -1643,7 +1643,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # highway-bus_stop                                  # caption(optional) z17- (also has icon z16-)
 # === -6400
 
-# amenity-drinking_water                            # caption(optional) z19- (also has icon z16-)
+# amenity-drinking_water                            # caption(optional) z18- (also has icon z16-)
 # === -6500
 
 # leisure-beach_resort                              # caption(optional) z16- (also has icon z16-, area z10-)
@@ -1652,7 +1652,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-supermarket                                  # caption(optional) z16- (also has icon z16-)
 # === -6800
 
-# amenity-water_point                               # caption(optional) z19- (also has icon z16-)
+# amenity-water_point                               # caption(optional) z18- (also has icon z16-)
 # historic-aircraft                                 # caption(optional) z16- (also has icon z16-)
 # historic-locomotive                               # caption(optional) z16- (also has icon z16-)
 # historic-mine                                     # caption(optional) z15- (also has icon z15-)
@@ -1661,9 +1661,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-wreck                                    # caption(optional) z16- (also has icon z16-)
 # landuse-cemetery                                  # caption(optional) z15- (also has icon z15-, area z14-)
 # landuse-cemetery-christian                        # caption(optional) z15- (also has icon z15-, area z14-)
+# man_made-water_tap                                # caption(optional) z18- (also has icon z16-)
+# man_made-water_well                               # caption(optional) z18- (also has icon z16-)
 # man_made-windmill                                 # caption(optional) z16- (also has icon z16-)
 # === -6950
 
+# natural-rock                                      # caption(optional) z17- (also has icon z17-)
+# === -7150
+
 # amenity-townhall                                  # caption(optional) z16- (also has icon z16-)
 # tourism-hotel                                     # caption(optional) z16- (also has icon z16-)
 # tourism-resort                                    # caption(optional) z16- (also has icon z16-)
@@ -1888,7 +1893,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) z16- (also has icon z16-)
+# amenity-shelter                                   # caption(optional) z17- (also has icon z17-)
 # leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
 # leisure-playground                                # caption(optional) z17- (also has icon z17-, area z16-)
 # === -8500
@@ -1946,7 +1951,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-vending_machine-fuel                      # caption(optional) z18- (also has icon z18-)
 # amenity-vending_machine-parking_tickets           # caption(optional) z17- (also has icon z17-)
 # amenity-vending_machine-public_transport_tickets  # caption(optional) z17- (also has icon z17-)
-# leisure-picnic_table                              # caption(optional) z16- (also has icon z16-)
+# leisure-picnic_table                              # caption(optional) z17- (also has icon z17-)
 # === -8800
 
 # amenity-grave_yard                                # caption(optional) z17- (also has icon z17-, area z14-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index fb8aa07fb5..7e124ee2b3 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -301,7 +301,7 @@ highway-secondary-tunnel                            # pathtext z10- (also has sh
 
 man_made-lighthouse                                 # icon z11- (also has caption(optional) z14-)
 natural-peak                                        # icon z10- (also has caption(optional) z11-)
-natural-volcano                                     # icon z10- (also has caption(optional) z10-)
+natural-volcano                                     # icon z10- (also has caption(optional) z13-)
 === 5400
 
 amenity-theatre                                     # icon z14- (also has caption(optional) z14-)
@@ -339,7 +339,7 @@ landuse-forest-mixed                                # icon z12- (also has captio
 
 natural-cave_entrance                               # icon z10- (also has caption(optional) z11-)
 natural-geyser                                      # icon z10- (also has caption(optional) z12-)
-natural-hot_spring                                  # icon z12- (also has caption(optional) z14-)
+natural-hot_spring                                  # icon z12- (also has caption(optional) z15-)
 natural-spring                                      # icon z12- (also has caption(optional) z14-)
 === 4650
 
@@ -683,7 +683,7 @@ waterway-weir                                       # pathtext z15- (also has li
 === 2900
 
 highway-ford                                        # icon z14- and pathtext z16- (also has line z13-)
-natural-rock                                        # icon z14-
+natural-rock                                        # icon z14- (also has caption(optional) z17-)
 === 2850
 
 highway-bridleway                                   # pathtext z13- (also has line z11-)
@@ -1412,7 +1412,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # man_made-lighthouse                               # caption(optional) z14- (also has icon z11-)
 # natural-peak                                      # caption(optional) z11- (also has icon z10-)
-# natural-volcano                                   # caption(optional) z10- (also has icon z10-)
+# natural-volcano                                   # caption(optional) z13- (also has icon z10-)
 # === -4600
 
 # amenity-theatre                                   # caption(optional) z14- (also has icon z14-)
@@ -1449,7 +1449,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # natural-cave_entrance                             # caption(optional) z11- (also has icon z10-)
 # natural-geyser                                    # caption(optional) z12- (also has icon z10-)
-# natural-hot_spring                                # caption(optional) z14- (also has icon z12-)
+# natural-hot_spring                                # caption(optional) z15- (also has icon z12-)
 # natural-spring                                    # caption(optional) z14- (also has icon z12-)
 # === -5350
 
@@ -1666,6 +1666,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-windmill                                 # caption(optional) z16- (also has icon z16-)
 # === -6950
 
+# natural-rock                                      # caption(optional) z17- (also has icon z14-)
+# === -7150
+
 # amenity-townhall                                  # caption(optional) z16- (also has icon z16-)
 # tourism-hotel                                     # caption(optional) z16- (also has icon z16-)
 # tourism-resort                                    # caption(optional) z16- (also has icon z16-)