diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index fb407a66d4..b1d3465f7c 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 64a206f70e..c2c8e8be9e 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -18802,7 +18802,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18812,7 +18812,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18822,7 +18822,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18832,7 +18832,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18880,7 +18880,7 @@ cont {
     scale: 12
     lines {
       width: 1.9
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19064,7 +19064,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19074,7 +19074,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19084,7 +19084,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19094,7 +19094,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19142,7 +19142,7 @@ cont {
     scale: 12
     lines {
       width: 1.9
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19410,7 +19410,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19420,7 +19420,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19430,7 +19430,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19440,7 +19440,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30257,7 +30257,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30267,7 +30267,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30277,7 +30277,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30287,7 +30287,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30335,7 +30335,7 @@ cont {
     scale: 12
     lines {
       width: 1.9
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30519,7 +30519,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30529,7 +30529,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30539,7 +30539,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30549,7 +30549,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30597,7 +30597,7 @@ cont {
     scale: 12
     lines {
       width: 1.9
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30865,7 +30865,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30875,7 +30875,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30885,7 +30885,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30895,7 +30895,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 757c5cf31a..7ea15dc3f7 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 eb2a59a70d..8638469ae6 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -18571,7 +18571,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18581,7 +18581,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18591,7 +18591,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18601,7 +18601,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18649,7 +18649,7 @@ cont {
     scale: 12
     lines {
       width: 1.9
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18833,7 +18833,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18843,7 +18843,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18853,7 +18853,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18863,7 +18863,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18911,7 +18911,7 @@ cont {
     scale: 12
     lines {
       width: 1.9
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19179,7 +19179,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19189,7 +19189,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19199,7 +19199,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19209,7 +19209,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -29844,7 +29844,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -29854,7 +29854,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -29864,7 +29864,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -29874,7 +29874,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -29922,7 +29922,7 @@ cont {
     scale: 12
     lines {
       width: 1.9
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30106,7 +30106,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30116,7 +30116,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30126,7 +30126,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30136,7 +30136,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30184,7 +30184,7 @@ cont {
     scale: 12
     lines {
       width: 1.9
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30452,7 +30452,7 @@ cont {
     scale: 7
     lines {
       width: 0.9
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30462,7 +30462,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30472,7 +30472,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16741158
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
@@ -30482,7 +30482,7 @@ cont {
     scale: 10
     lines {
       width: 1.5
-      color: 16741158
+      color: 16742950
       priority: 441
       join: BEVELJOIN
       cap: BUTTCAP
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 502cec49c2..a2273b69bf 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 8585bf6efc..a3e14e5a62 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -7758,7 +7758,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 16746306
+      color: 16748864
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -8056,7 +8056,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 16746306
+      color: 16748864
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -8438,7 +8438,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 16746306
+      color: 16748864
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -8777,6 +8777,13 @@ cont {
   name: "highway-motorway_link"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -8785,9 +8792,22 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 30
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -8796,9 +8816,22 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 60
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.5
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -8807,6 +8840,12 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 100
+    }
   }
   element {
     scale: 13
@@ -9006,6 +9045,13 @@ cont {
   name: "highway-motorway_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -9014,9 +9060,22 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 30
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -9025,9 +9084,22 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 60
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.5
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -9036,6 +9108,12 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 100
+    }
   }
   element {
     scale: 13
@@ -9307,6 +9385,13 @@ cont {
   name: "highway-motorway_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -9315,9 +9400,22 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 30
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -9326,9 +9424,28 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 60
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 4.5
+      color: 8421504
+      priority: 523
+      cap: BUTTCAP
+    }
+    lines {
+      width: 2.5
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -9337,6 +9454,12 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 100
+    }
   }
   element {
     scale: 13
@@ -11285,6 +11408,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.7
+      color: 16756055
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -11293,9 +11423,22 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16500
+      min_distance: 60
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.4
+      color: 16756055
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11304,9 +11447,21 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16500
+      min_distance: 100
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 3.0
+      color: 16756055
+      priority: 500
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11315,6 +11470,12 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16500
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -11502,6 +11663,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.7
+      color: 16756055
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -11510,9 +11678,22 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16500
+      min_distance: 60
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.4
+      color: 16756055
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11521,9 +11702,21 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16500
+      min_distance: 100
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 3.0
+      color: 16756055
+      priority: 500
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11532,6 +11725,12 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16500
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -11791,6 +11990,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.7
+      color: 16756055
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -11799,9 +12005,22 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16500
+      min_distance: 60
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.4
+      color: 16756055
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11810,9 +12029,21 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16500
+      min_distance: 100
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 3.0
+      color: 16756055
+      priority: 500
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11821,6 +12052,12 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16500
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -17129,7 +17366,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 16746306
+      color: 16748864
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17427,7 +17664,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 16746306
+      color: 16748864
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17809,7 +18046,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 16746306
+      color: 16748864
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18095,6 +18332,13 @@ cont {
   name: "highway-trunk_link"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18103,9 +18347,22 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 30
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18114,9 +18371,22 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 60
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.5
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -18125,6 +18395,12 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 100
+    }
   }
   element {
     scale: 13
@@ -18324,6 +18600,13 @@ cont {
   name: "highway-trunk_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18332,9 +18615,22 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 30
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18343,9 +18639,22 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 60
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.5
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -18354,6 +18663,12 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 100
+    }
   }
   element {
     scale: 13
@@ -18625,6 +18940,13 @@ cont {
   name: "highway-trunk_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18633,9 +18955,22 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 30
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18644,9 +18979,28 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 60
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 4.5
+      color: 8421504
+      priority: 523
+      cap: BUTTCAP
+    }
+    lines {
+      width: 2.5
+      color: 16748864
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -18655,6 +19009,12 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16524
+      min_distance: 100
+    }
   }
   element {
     scale: 13
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 7ce73c2bfa..638961117d 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 b9f18ade62..94f33372d0 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -7756,7 +7756,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 4991511
+      color: 4991513
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -8074,7 +8074,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 4991511
+      color: 4991513
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -8476,7 +8476,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 4991511
+      color: 4991513
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -8825,6 +8825,13 @@ cont {
   name: "highway-motorway_link"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -8833,9 +8840,24 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 30
+      text_color: 3158064
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -8844,9 +8866,24 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 60
+      text_color: 3158064
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.5
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -8855,6 +8892,14 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 100
+      text_color: 3158064
+    }
   }
   element {
     scale: 13
@@ -9068,6 +9113,13 @@ cont {
   name: "highway-motorway_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -9076,9 +9128,24 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 30
+      text_color: 3158064
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -9087,9 +9154,24 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 60
+      text_color: 3158064
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.5
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -9098,6 +9180,14 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 100
+      text_color: 3158064
+    }
   }
   element {
     scale: 13
@@ -9383,6 +9473,13 @@ cont {
   name: "highway-motorway_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -9391,9 +9488,24 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 30
+      text_color: 3158064
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -9402,9 +9514,29 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 60
+      text_color: 3158064
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 4.5
+      priority: 523
+      cap: BUTTCAP
+    }
+    lines {
+      width: 2.5
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -9413,6 +9545,14 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 100
+      text_color: 3158064
+    }
   }
   element {
     scale: 13
@@ -11422,6 +11562,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.7
+      color: 6173981
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -11430,9 +11577,24 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16500
+      min_distance: 60
+      text_color: 3158064
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.4
+      color: 6173981
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11441,9 +11603,23 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16500
+      min_distance: 100
+      text_color: 3158064
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 3.0
+      color: 6173981
+      priority: 500
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11452,6 +11628,14 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16500
+      min_distance: 120
+      text_color: 3158064
+    }
   }
   element {
     scale: 14
@@ -11651,6 +11835,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.7
+      color: 6173981
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -11659,9 +11850,24 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16500
+      min_distance: 60
+      text_color: 3158064
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.4
+      color: 6173981
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11670,9 +11876,23 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16500
+      min_distance: 100
+      text_color: 3158064
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 3.0
+      color: 6173981
+      priority: 500
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11681,6 +11901,14 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16500
+      min_distance: 120
+      text_color: 3158064
+    }
   }
   element {
     scale: 14
@@ -11952,6 +12180,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.7
+      color: 6173981
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -11960,9 +12195,24 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16500
+      min_distance: 60
+      text_color: 3158064
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.4
+      color: 6173981
+      priority: 500
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11971,9 +12221,23 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16500
+      min_distance: 100
+      text_color: 3158064
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 3.0
+      color: 6173981
+      priority: 500
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 14
@@ -11982,6 +12246,14 @@ cont {
       }
       priority: 16500
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16500
+      min_distance: 120
+      text_color: 3158064
+    }
   }
   element {
     scale: 14
@@ -17372,7 +17644,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 4991511
+      color: 4991513
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17690,7 +17962,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 4991511
+      color: 4991513
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18092,7 +18364,7 @@ cont {
     scale: 11
     lines {
       width: 3.5
-      color: 4991511
+      color: 4991513
       priority: 536
       join: BEVELJOIN
       cap: BUTTCAP
@@ -18388,6 +18660,13 @@ cont {
   name: "highway-trunk_link"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18396,9 +18675,24 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 30
+      text_color: 3158064
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18407,9 +18701,24 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 60
+      text_color: 3158064
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.5
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -18418,6 +18727,14 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 100
+      text_color: 3158064
+    }
   }
   element {
     scale: 13
@@ -18631,6 +18948,13 @@ cont {
   name: "highway-trunk_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18639,9 +18963,24 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 30
+      text_color: 3158064
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18650,9 +18989,24 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 60
+      text_color: 3158064
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 2.5
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -18661,6 +19015,14 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 100
+      text_color: 3158064
+    }
   }
   element {
     scale: 13
@@ -18946,6 +19308,13 @@ cont {
   name: "highway-trunk_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 1.3
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18954,9 +19323,24 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 30
+      text_color: 3158064
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 2.0
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 13
@@ -18965,9 +19349,29 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 60
+      text_color: 3158064
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 4.5
+      priority: 523
+      cap: BUTTCAP
+    }
+    lines {
+      width: 2.5
+      color: 4991513
+      priority: 524
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 15
@@ -18976,6 +19380,14 @@ cont {
       }
       priority: 16524
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 16524
+      min_distance: 100
+      text_color: 3158064
+    }
   }
   element {
     scale: 13