diff --git a/data/colors.txt b/data/colors.txt
index f961b4e7ee..6ec8888ec1 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -74,6 +74,7 @@
 2828327
 2836760
 3155515
+3156522
 3158064
 3183362
 3351066
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index c2c52ff08b..27cc884387 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 40e7c0bb25..e42cba3c86 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -7127,7 +7127,6 @@ cont {
     scale: 17
     symbol {
       name: "mail-m"
-      apply_for_type: 1
       priority: 16632
     }
     caption {
@@ -7135,6 +7134,7 @@ cont {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15632
     }
@@ -7142,8 +7142,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "postbox-m"
-      apply_for_type: 1
+      name: "mail-m"
       priority: 16632
     }
     caption {
@@ -7159,8 +7158,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "postbox-m"
-      apply_for_type: 1
+      name: "mail-m"
       priority: 16632
     }
     caption {
@@ -49463,6 +49461,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 10
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 15
@@ -49470,6 +49475,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 10
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 16
@@ -49477,6 +49489,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 17
@@ -49484,6 +49503,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 18
@@ -49491,6 +49517,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 19
@@ -49498,6 +49531,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
 }
 cont {
@@ -51185,6 +51225,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 17
@@ -51192,6 +51239,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 18
@@ -51199,6 +51253,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 19
@@ -51206,6 +51267,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
 }
 cont {
@@ -52529,6 +52597,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 17
@@ -52536,6 +52611,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 18
@@ -52543,6 +52625,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 19
@@ -52550,6 +52639,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 2475c7f377..0eafa613c3 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 b204f968f8..c1492e6338 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -7061,7 +7061,6 @@ cont {
     scale: 17
     symbol {
       name: "mail-m"
-      apply_for_type: 1
       priority: 16632
     }
     caption {
@@ -7069,6 +7068,7 @@ cont {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15632
     }
@@ -7076,8 +7076,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "postbox-m"
-      apply_for_type: 1
+      name: "mail-m"
       priority: 16632
     }
     caption {
@@ -7093,8 +7092,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "postbox-m"
-      apply_for_type: 1
+      name: "mail-m"
       priority: 16632
     }
     caption {
@@ -49261,6 +49259,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 10
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 15
@@ -49268,6 +49273,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 10
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 16
@@ -49275,6 +49287,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 17
@@ -49282,6 +49301,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 18
@@ -49289,6 +49315,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 19
@@ -49296,6 +49329,13 @@ cont {
       color: 14934482
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 8355711
+      }
+      priority: 15000
+    }
   }
 }
 cont {
@@ -50847,6 +50887,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 17
@@ -50854,6 +50901,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 18
@@ -50861,6 +50915,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 19
@@ -50868,6 +50929,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
 }
 cont {
@@ -52191,6 +52259,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 17
@@ -52198,6 +52273,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 18
@@ -52205,6 +52287,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 19
@@ -52212,6 +52301,13 @@ cont {
       color: 15591638
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 6381914
+      }
+      priority: 15142
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index e4b5d6b520..4938b256c3 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 9395dfda98..099e2dcbfc 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -7061,7 +7061,6 @@ cont {
     scale: 17
     symbol {
       name: "mail-m"
-      apply_for_type: 1
       priority: 16632
     }
     caption {
@@ -7069,6 +7068,7 @@ cont {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
       priority: 15632
     }
@@ -7076,8 +7076,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "postbox-m"
-      apply_for_type: 1
+      name: "mail-m"
       priority: 16632
     }
     caption {
@@ -7093,8 +7092,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "postbox-m"
-      apply_for_type: 1
+      name: "mail-m"
       priority: 16632
     }
     caption {
@@ -37865,21 +37863,21 @@ cont {
   element {
     scale: 12
     area {
-      color: 15590876
+      color: 3156522
       priority: -15898
     }
   }
   element {
     scale: 13
     area {
-      color: 15590876
+      color: 3156522
       priority: -15898
     }
   }
   element {
     scale: 14
     area {
-      color: 15590876
+      color: 3156522
       priority: -15898
     }
     caption {
@@ -37895,7 +37893,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 15590876
+      color: 3156522
       priority: -15898
     }
     caption {
@@ -37911,7 +37909,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 15590876
+      color: 3156522
       priority: -15898
     }
     caption {
@@ -37927,7 +37925,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 15590876
+      color: 3156522
       priority: -15898
     }
     caption {
@@ -37943,7 +37941,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 15590876
+      color: 3156522
       priority: -15898
     }
     caption {
@@ -37959,7 +37957,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 15590876
+      color: 3156522
       priority: -15898
     }
     caption {
@@ -49353,36 +49351,78 @@ cont {
     area {
       priority: -16700
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 15
     area {
       priority: -16700
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 16
     area {
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 5592405
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 17
     area {
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 5592405
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 18
     area {
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 5592405
+      }
+      priority: 15000
+    }
   }
   element {
     scale: 19
     area {
       priority: -16700
     }
+    caption {
+      primary {
+        height: 8
+        color: 5592405
+      }
+      priority: 15000
+    }
   }
 }
 cont {
@@ -50934,6 +50974,13 @@ cont {
       color: 2499106
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 5592405
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 17
@@ -50941,6 +50988,13 @@ cont {
       color: 2499106
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 5592405
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 18
@@ -50948,6 +51002,13 @@ cont {
       color: 2499106
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 5592405
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 19
@@ -50955,6 +51016,13 @@ cont {
       color: 2499106
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 5592405
+      }
+      priority: 15142
+    }
   }
 }
 cont {
@@ -52278,6 +52346,13 @@ cont {
       color: 2499106
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 5592405
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 17
@@ -52285,6 +52360,13 @@ cont {
       color: 2499106
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 5592405
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 18
@@ -52292,6 +52374,13 @@ cont {
       color: 2499106
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 5592405
+      }
+      priority: 15142
+    }
   }
   element {
     scale: 19
@@ -52299,6 +52388,13 @@ cont {
       color: 2499106
       priority: -15858
     }
+    caption {
+      primary {
+        height: 9
+        color: 5592405
+      }
+      priority: 15142
+    }
   }
 }
 cont {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index c6aaf69135..2e5097a50b 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 7cb02715d2..43f037896a 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -22449,6 +22449,65 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-bare_rock"
+  element {
+    scale: 12
+    area {
+      color: 15590876
+      priority: 1001
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15590876
+      priority: 1001
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15590876
+      priority: 1001
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15590876
+      priority: 1001
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15590876
+      priority: 1001
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15590876
+      priority: 1001
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15590876
+      priority: 1001
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15590876
+      priority: 1001
+    }
+  }
+}
 cont {
   name: "natural-bay"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 1ad34b6f64..67f64f46dc 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index cd37e9eab9..d4e8594215 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -22839,6 +22839,65 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-bare_rock"
+  element {
+    scale: 12
+    area {
+      color: 3156522
+      priority: 1001
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 3156522
+      priority: 1001
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 3156522
+      priority: 1001
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 3156522
+      priority: 1001
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 3156522
+      priority: 1001
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 3156522
+      priority: 1001
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3156522
+      priority: 1001
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3156522
+      priority: 1001
+    }
+  }
+}
 cont {
   name: "natural-bay"
   element {
diff --git a/data/visibility.txt b/data/visibility.txt
index 39c4d761c1..b34a8de9fa 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -590,7 +590,7 @@ world  00000000000000000000  +
         {}
     mountain_pass  00000000000000000000  -
     natural  00000000000000000000  +
-        bare_rock  00000000000000000000  -
+        bare_rock  00000000000011111111  -
         bay  00000000000000111111  -
         beach  00000000001111111111  +
             gravel  00000000001111111111  -