diff --git a/data/colors.txt b/data/colors.txt
index 52ed7ad91e..d2692134f3 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -258,11 +258,15 @@
 2157549977
 2160707771
 2163800312
+2164214668
 2787649562
 2801593470
 3003121664
+3003473869
 3019898879
 3258727484
+3422763904
+3432785840
 3942645760
 4043309055
 4279308544
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 5376d02ce1..5428288b32 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 d594f3458c..e299bc073b 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -35935,45 +35935,51 @@ cont {
   }
   element {
     scale: 14
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 16
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 17
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
@@ -35986,12 +35992,13 @@ cont {
   }
   element {
     scale: 18
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
@@ -36004,12 +36011,13 @@ cont {
   }
   element {
     scale: 19
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
@@ -36058,68 +36066,52 @@ cont {
   name: "man_made-cutline"
   element {
     scale: 14
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
+      cap: BUTTCAP
     }
   }
   element {
     scale: 15
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
+      cap: BUTTCAP
     }
   }
   element {
     scale: 16
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
     }
   }
   element {
     scale: 17
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
     }
   }
   element {
     scale: 18
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
     }
   }
   element {
     scale: 19
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
     }
   }
 }
@@ -36235,45 +36227,51 @@ cont {
   }
   element {
     scale: 14
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 16
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 17
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
@@ -36286,12 +36284,13 @@ cont {
   }
   element {
     scale: 18
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
@@ -36304,12 +36303,13 @@ cont {
   }
   element {
     scale: 19
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index f404959dd2..d26f87367b 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 3d56c5f89b..7cb332a692 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -35633,45 +35633,51 @@ cont {
   }
   element {
     scale: 14
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 16
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 17
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
@@ -35684,12 +35690,13 @@ cont {
   }
   element {
     scale: 18
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
@@ -35702,12 +35709,13 @@ cont {
   }
   element {
     scale: 19
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
@@ -35756,68 +35764,52 @@ cont {
   name: "man_made-cutline"
   element {
     scale: 14
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
+      cap: BUTTCAP
     }
   }
   element {
     scale: 15
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
+      cap: BUTTCAP
     }
   }
   element {
     scale: 16
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
     }
   }
   element {
     scale: 17
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
     }
   }
   element {
     scale: 18
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
     }
   }
   element {
     scale: 19
-    area {
+    lines {
+      width: 2.0
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
-      priority: -15816
+      priority: 1184
     }
   }
 }
@@ -35933,45 +35925,51 @@ cont {
   }
   element {
     scale: 14
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 16
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: -15544
     }
   }
   element {
     scale: 17
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
@@ -35984,12 +35982,13 @@ cont {
   }
   element {
     scale: 18
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
@@ -36002,12 +36001,13 @@ cont {
   }
   element {
     scale: 19
+    lines {
+      width: 2.0
+      color: 14934482
+      priority: 1456
+    }
     area {
       color: 14934482
-      border {
-        width: 2.0
-        color: 14934482
-      }
       priority: 16000
     }
     caption {
@@ -64792,6 +64792,10 @@ cont {
   }
 }
 colors {
+  value {
+    name: "RouteMaskPedestrian"
+    color: 2147483648
+  }
   value {
     name: "DefaultTrackColor"
     color: 2004720
@@ -64812,6 +64816,10 @@ colors {
     name: "TrafficArrowLight"
     color: 16777215
   }
+  value {
+    name: "GuiText"
+    color: 609045837
+  }
   value {
     name: "PoiHotelTextOutline"
     color: 1728053247
@@ -64821,7 +64829,8 @@ colors {
     color: 3019898879
   }
   value {
-    name: "LocalAdsPrimaryText"
+    name: "RouteMaskBicycle"
+    color: 2147483648
   }
   value {
     name: "RoadShieldUKYellowText"
@@ -64835,6 +64844,10 @@ colors {
     name: "TrackHumanSpeed"
     color: 1913758
   }
+  value {
+    name: "RouteArrowsMaskCar"
+    color: 3422763904
+  }
   value {
     name: "TrafficArrowDark"
     color: 4666933
@@ -64895,6 +64908,10 @@ colors {
     name: "TrafficG0"
     color: 8263442
   }
+  value {
+    name: "RouteArrowsMaskBicycle"
+    color: 3432785840
+  }
   value {
     name: "RoutePreview"
     color: 3003121664
@@ -64903,6 +64920,10 @@ colors {
     name: "LocalAdsSecondaryTextOutline"
     color: 16777215
   }
+  value {
+    name: "RouteMaskCar"
+    color: 3003121664
+  }
   value {
     name: "Arrow3D"
     color: 5286655
@@ -64951,8 +64972,7 @@ colors {
     color: 3183362
   }
   value {
-    name: "GuiText"
-    color: 609045837
+    name: "LocalAdsPrimaryText"
   }
   value {
     name: "RouteTrafficG1"
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index e8bb266b8d..edc2a10157 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 da83c287c8..3206d0199d 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -35787,37 +35787,43 @@ cont {
   }
   element {
     scale: 14
+    lines {
+      width: 2.0
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: -15544
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: -15544
     }
   }
   element {
     scale: 16
+    lines {
+      width: 2.0
+      priority: 1456
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: -15544
     }
   }
   element {
     scale: 17
+    lines {
+      width: 2.0
+      priority: 1456
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: 16000
     }
     caption {
@@ -35830,10 +35836,11 @@ cont {
   }
   element {
     scale: 18
+    lines {
+      width: 2.0
+      priority: 1456
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: 16000
     }
     caption {
@@ -35846,10 +35853,11 @@ cont {
   }
   element {
     scale: 19
+    lines {
+      width: 2.0
+      priority: 1456
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: 16000
     }
     caption {
@@ -35898,56 +35906,46 @@ cont {
   name: "man_made-cutline"
   element {
     scale: 14
-    area {
-      border {
-        width: 2.0
-      }
-      priority: -15816
+    lines {
+      width: 2.0
+      priority: 1184
+      cap: BUTTCAP
     }
   }
   element {
     scale: 15
-    area {
-      border {
-        width: 2.0
-      }
-      priority: -15816
+    lines {
+      width: 2.0
+      priority: 1184
+      cap: BUTTCAP
     }
   }
   element {
     scale: 16
-    area {
-      border {
-        width: 2.0
-      }
-      priority: -15816
+    lines {
+      width: 2.0
+      priority: 1184
     }
   }
   element {
     scale: 17
-    area {
-      border {
-        width: 2.0
-      }
-      priority: -15816
+    lines {
+      width: 2.0
+      priority: 1184
     }
   }
   element {
     scale: 18
-    area {
-      border {
-        width: 2.0
-      }
-      priority: -15816
+    lines {
+      width: 2.0
+      priority: 1184
     }
   }
   element {
     scale: 19
-    area {
-      border {
-        width: 2.0
-      }
-      priority: -15816
+    lines {
+      width: 2.0
+      priority: 1184
     }
   }
 }
@@ -36061,37 +36059,43 @@ cont {
   }
   element {
     scale: 14
+    lines {
+      width: 2.0
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: -15544
     }
   }
   element {
     scale: 15
+    lines {
+      width: 2.0
+      priority: 1456
+      cap: BUTTCAP
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: -15544
     }
   }
   element {
     scale: 16
+    lines {
+      width: 2.0
+      priority: 1456
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: -15544
     }
   }
   element {
     scale: 17
+    lines {
+      width: 2.0
+      priority: 1456
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: 16000
     }
     caption {
@@ -36104,10 +36108,11 @@ cont {
   }
   element {
     scale: 18
+    lines {
+      width: 2.0
+      priority: 1456
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: 16000
     }
     caption {
@@ -36120,10 +36125,11 @@ cont {
   }
   element {
     scale: 19
+    lines {
+      width: 2.0
+      priority: 1456
+    }
     area {
-      border {
-        width: 2.0
-      }
       priority: 16000
     }
     caption {
@@ -64878,6 +64884,10 @@ cont {
   }
 }
 colors {
+  value {
+    name: "RouteMaskPedestrian"
+    color: 2147483648
+  }
   value {
     name: "DefaultTrackColor"
     color: 2004720
@@ -64898,6 +64908,10 @@ colors {
     name: "TrafficArrowLight"
     color: 12895428
   }
+  value {
+    name: "GuiText"
+    color: 1308622847
+  }
   value {
     name: "PoiHotelTextOutline"
     color: 1711276032
@@ -64907,8 +64921,8 @@ colors {
     color: 3019898879
   }
   value {
-    name: "LocalAdsPrimaryText"
-    color: 16777215
+    name: "RouteMaskBicycle"
+    color: 2147483648
   }
   value {
     name: "RoadShieldUKYellowText"
@@ -64922,6 +64936,10 @@ colors {
     name: "TrackHumanSpeed"
     color: 16750592
   }
+  value {
+    name: "RouteArrowsMaskCar"
+    color: 3003473869
+  }
   value {
     name: "TrafficArrowDark"
     color: 1644825
@@ -64985,6 +65003,10 @@ colors {
     name: "TrafficG0"
     color: 4985359
   }
+  value {
+    name: "RouteArrowsMaskBicycle"
+    color: 2164214668
+  }
   value {
     name: "RoutePreview"
     color: 3019898879
@@ -64992,6 +65014,10 @@ colors {
   value {
     name: "LocalAdsSecondaryTextOutline"
   }
+  value {
+    name: "RouteMaskCar"
+    color: 2147483648
+  }
   value {
     name: "Arrow3D"
     color: 4311295
@@ -65040,8 +65066,8 @@ colors {
     color: 1272880
   }
   value {
-    name: "GuiText"
-    color: 1308622847
+    name: "LocalAdsPrimaryText"
+    color: 16777215
   }
   value {
     name: "RouteTrafficG1"
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 66c53d650c..debf83e713 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 3def6fc952..4fd2579c57 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -38487,6 +38487,10 @@ cont {
   }
 }
 colors {
+  value {
+    name: "RouteMaskPedestrian"
+    color: 2147483648
+  }
   value {
     name: "DefaultTrackColor"
     color: 2004720
@@ -38507,6 +38511,10 @@ colors {
     name: "TrafficArrowLight"
     color: 16777215
   }
+  value {
+    name: "GuiText"
+    color: 609045837
+  }
   value {
     name: "PoiHotelTextOutline"
     color: 1728053247
@@ -38516,7 +38524,8 @@ colors {
     color: 3019898879
   }
   value {
-    name: "LocalAdsPrimaryText"
+    name: "RouteMaskBicycle"
+    color: 2147483648
   }
   value {
     name: "RoadShieldUKYellowText"
@@ -38530,6 +38539,10 @@ colors {
     name: "TrackHumanSpeed"
     color: 1913758
   }
+  value {
+    name: "RouteArrowsMaskCar"
+    color: 3422763904
+  }
   value {
     name: "TrafficArrowDark"
     color: 4666933
@@ -38590,6 +38603,10 @@ colors {
     name: "TrafficG0"
     color: 8263442
   }
+  value {
+    name: "RouteArrowsMaskBicycle"
+    color: 3432785840
+  }
   value {
     name: "RoutePreview"
     color: 3003121664
@@ -38598,6 +38615,10 @@ colors {
     name: "LocalAdsSecondaryTextOutline"
     color: 16777215
   }
+  value {
+    name: "RouteMaskCar"
+    color: 3003121664
+  }
   value {
     name: "Arrow3D"
     color: 5286655
@@ -38646,8 +38667,7 @@ colors {
     color: 3183362
   }
   value {
-    name: "GuiText"
-    color: 609045837
+    name: "LocalAdsPrimaryText"
   }
   value {
     name: "RouteTrafficG1"
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index a0733a6534..c82f0aa34f 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 45f3825393..5477998719 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -38877,6 +38877,10 @@ cont {
   }
 }
 colors {
+  value {
+    name: "RouteMaskPedestrian"
+    color: 2147483648
+  }
   value {
     name: "DefaultTrackColor"
     color: 2004720
@@ -38897,6 +38901,10 @@ colors {
     name: "TrafficArrowLight"
     color: 11184810
   }
+  value {
+    name: "GuiText"
+    color: 1308622847
+  }
   value {
     name: "PoiHotelTextOutline"
     color: 1711276032
@@ -38906,8 +38914,8 @@ colors {
     color: 3019898879
   }
   value {
-    name: "LocalAdsPrimaryText"
-    color: 16777215
+    name: "RouteMaskBicycle"
+    color: 2147483648
   }
   value {
     name: "RoadShieldUKYellowText"
@@ -38921,6 +38929,10 @@ colors {
     name: "TrackHumanSpeed"
     color: 16750592
   }
+  value {
+    name: "RouteArrowsMaskCar"
+    color: 3003473869
+  }
   value {
     name: "TrafficArrowDark"
     color: 1973790
@@ -38984,6 +38996,10 @@ colors {
     name: "TrafficG0"
     color: 4985359
   }
+  value {
+    name: "RouteArrowsMaskBicycle"
+    color: 2164214668
+  }
   value {
     name: "RoutePreview"
     color: 3019898879
@@ -38991,6 +39007,10 @@ colors {
   value {
     name: "LocalAdsSecondaryTextOutline"
   }
+  value {
+    name: "RouteMaskCar"
+    color: 2147483648
+  }
   value {
     name: "Arrow3D"
     color: 4311295
@@ -39039,8 +39059,8 @@ colors {
     color: 1272880
   }
   value {
-    name: "GuiText"
-    color: 1308622847
+    name: "LocalAdsPrimaryText"
+    color: 16777215
   }
   value {
     name: "RouteTrafficG1"