diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index f217a6de44773..165cc33c9766c 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 37f729644a922..6d4b74918dbf1 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -25226,67 +25226,101 @@ cont {
 cont {
   name: "highway-rest_area"
   element {
-    scale: 16
+    scale: 14
     symbol {
       name: "picnic-m"
       priority: 16637
       min_distance: 10
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 16637
+      priority: 15637
     }
   }
   element {
-    scale: 17
+    scale: 15
     symbol {
       name: "picnic-m"
       priority: 16637
       min_distance: 10
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
+      priority: 15637
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-m"
       priority: 16637
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15637
+    }
   }
   element {
-    scale: 18
+    scale: 17
     symbol {
       name: "picnic-m"
       priority: 16637
-      min_distance: 10
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
+      priority: 15637
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "picnic-m"
       priority: 16637
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15637
+    }
   }
   element {
     scale: 19
     symbol {
       name: "picnic-m"
       priority: 16637
-      min_distance: 10
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 16637
+      priority: 15637
     }
   }
 }
@@ -27497,10 +27531,10 @@ cont {
 cont {
   name: "highway-services"
   element {
-    scale: 15
+    scale: 12
     symbol {
       name: "car-repair-s"
-      priority: 16656
+      priority: 16637
       min_distance: 20
     }
     caption {
@@ -27510,14 +27544,65 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "car-repair-s"
+      priority: 16637
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15637
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car-repair-s"
+      priority: 16637
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15637
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car-repair-m"
+      priority: 16637
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15637
     }
   }
   element {
     scale: 16
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
@@ -27526,14 +27611,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
   element {
     scale: 17
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
@@ -27542,39 +27627,39 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
   element {
     scale: 18
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
   element {
     scale: 19
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
 }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index efae3562d0edc..549bbdadc68cf 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 88d19e419d741..afb592d139b6e 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -24995,35 +24995,52 @@ cont {
 cont {
   name: "highway-rest_area"
   element {
-    scale: 16
+    scale: 15
     symbol {
       name: "picnic-m"
       priority: 16637
       min_distance: 10
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
+      priority: 15637
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-m"
       priority: 16637
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15637
+    }
   }
   element {
     scale: 17
     symbol {
       name: "picnic-m"
       priority: 16637
-      min_distance: 10
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 16637
+      priority: 15637
     }
   }
   element {
@@ -25031,15 +25048,15 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 16637
-      min_distance: 10
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 16637
+      priority: 15637
     }
   }
   element {
@@ -25047,15 +25064,15 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 16637
-      min_distance: 10
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 16637
+      priority: 15637
     }
   }
 }
@@ -27180,10 +27197,10 @@ cont {
 cont {
   name: "highway-services"
   element {
-    scale: 15
+    scale: 14
     symbol {
       name: "car-repair-s"
-      priority: 16656
+      priority: 16637
       min_distance: 20
     }
     caption {
@@ -27193,14 +27210,31 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car-repair-m"
+      priority: 16637
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15637
     }
   }
   element {
     scale: 16
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
@@ -27209,14 +27243,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
   element {
     scale: 17
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
@@ -27225,39 +27259,39 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
   element {
     scale: 18
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
   element {
     scale: 19
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
 }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 4b83f78b5f615..d723508e8a73e 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 917116a323d1d..4782e81c24cfd 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -25080,35 +25080,52 @@ cont {
 cont {
   name: "highway-rest_area"
   element {
-    scale: 16
+    scale: 15
     symbol {
       name: "picnic-m"
       priority: 16637
       min_distance: 10
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
+      priority: 15637
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-m"
       priority: 16637
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15637
+    }
   }
   element {
     scale: 17
     symbol {
       name: "picnic-m"
       priority: 16637
-      min_distance: 10
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
-      priority: 16637
+      priority: 15637
     }
   }
   element {
@@ -25116,15 +25133,15 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 16637
-      min_distance: 10
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
-      priority: 16637
+      priority: 15637
     }
   }
   element {
@@ -25132,15 +25149,15 @@ cont {
     symbol {
       name: "picnic-m"
       priority: 16637
-      min_distance: 10
     }
-    path_text {
+    caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
-      priority: 16637
+      priority: 15637
     }
   }
 }
@@ -27281,10 +27298,10 @@ cont {
 cont {
   name: "highway-services"
   element {
-    scale: 15
+    scale: 14
     symbol {
       name: "car-repair-s"
-      priority: 16656
+      priority: 16637
       min_distance: 20
     }
     caption {
@@ -27294,14 +27311,31 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car-repair-m"
+      priority: 16637
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15637
     }
   }
   element {
     scale: 16
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
@@ -27310,14 +27344,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
   element {
     scale: 17
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
@@ -27326,39 +27360,39 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
   element {
     scale: 18
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
   element {
     scale: 19
     symbol {
       name: "car-repair-m"
-      priority: 16656
+      priority: 16637
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
         is_optional: true
       }
-      priority: 15656
+      priority: 15637
     }
   }
 }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index d404d74124d43..7866c7787d28e 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 9bb284054562c..3a81f754e79b5 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -12817,6 +12817,106 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-rest_area"
+  element {
+    scale: 14
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 13
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+}
 cont {
   name: "highway-road"
   element {
@@ -15070,6 +15170,133 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-services"
+  element {
+    scale: 12
+    symbol {
+      name: "car-repair-s"
+      priority: 16878
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 13
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+}
 cont {
   name: "highway-speed_camera"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 51ed5098cb277..bca1fa71d5273 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 9ee80136d457e..03befa5fcdf85 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -12996,6 +12996,106 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-rest_area"
+  element {
+    scale: 14
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "picnic-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+}
 cont {
   name: "highway-road"
   element {
@@ -15289,6 +15389,133 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-services"
+  element {
+    scale: 12
+    symbol {
+      name: "car-repair-s"
+      priority: 16878
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "car-repair-m"
+      priority: 16878
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15878
+    }
+  }
+}
 cont {
   name: "highway-speed_camera"
   element {
diff --git a/data/visibility.txt b/data/visibility.txt
index 98387e15cd945..102fd760b09cc 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -448,7 +448,7 @@ world  00000000000000000000  +
             bridge  00000000000011111111  -
             tunnel  00000000000011111111  -
             {}
-        rest_area  00000000000000000000  -
+        rest_area  00000000000000111111  -
         road  00000000000011111111  +
             bridge  00000000000011111111  -
             tunnel  00000000000011111111  -
@@ -469,7 +469,7 @@ world  00000000000000000000  +
             parking_aisle  00000000000000111111  -
             tunnel  00000000000000111111  -
             {}
-        services  00000000000000000000  -
+        services  00000000000011111111  -
         speed_camera  00000000000001111111  -
         steps  00000000000000000011  +
             bridge  00000000000000000011  -