diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index fbea24ba65..cd406c8a6e 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 54b37bfd04..50700dd2ca 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -25225,6 +25225,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -25241,6 +25247,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -25257,6 +25269,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 18
@@ -25365,6 +25383,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -25381,6 +25405,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -25397,6 +25427,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 18
@@ -25529,6 +25565,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -25557,6 +25599,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -25585,6 +25633,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 18
@@ -25717,6 +25771,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -25743,6 +25803,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -25769,6 +25835,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 18
@@ -28734,6 +28806,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -28751,6 +28829,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 175
+    }
   }
   element {
     scale: 15
@@ -28910,6 +28994,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -28939,6 +29029,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 175
+    }
   }
   element {
     scale: 15
@@ -29158,6 +29254,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -29175,6 +29277,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 175
+    }
   }
   element {
     scale: 15
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 2120add6ab..67504d0a2e 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 85cd197bbc..272cfc4c4c 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -25083,6 +25083,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -25099,6 +25105,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -25115,6 +25127,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 18
@@ -25223,6 +25241,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -25239,6 +25263,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -25255,6 +25285,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 18
@@ -25387,6 +25423,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -25415,6 +25457,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -25443,6 +25491,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 18
@@ -25575,6 +25629,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -25601,6 +25661,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -25627,6 +25693,12 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 2955
+      min_distance: 300
+    }
   }
   element {
     scale: 18
@@ -28426,6 +28498,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -28443,6 +28521,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 175
+    }
   }
   element {
     scale: 15
@@ -28602,6 +28686,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -28631,6 +28721,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 175
+    }
   }
   element {
     scale: 15
@@ -28850,6 +28946,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -28867,6 +28969,12 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 2960
+      min_distance: 175
+    }
   }
   element {
     scale: 15
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index f003d7c7cb..750640fc65 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 48375313e0..14c5b1d3b6 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -25164,6 +25164,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 250
+      text_color: 11711154
+    }
   }
   element {
     scale: 16
@@ -25180,6 +25187,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 300
+      text_color: 11711154
+    }
   }
   element {
     scale: 17
@@ -25196,6 +25210,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 300
+      text_color: 11711154
+    }
   }
   element {
     scale: 18
@@ -25306,6 +25327,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 250
+      text_color: 11711154
+    }
   }
   element {
     scale: 16
@@ -25322,6 +25350,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 300
+      text_color: 11711154
+    }
   }
   element {
     scale: 17
@@ -25338,6 +25373,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 300
+      text_color: 11711154
+    }
   }
   element {
     scale: 18
@@ -25472,6 +25514,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 250
+      text_color: 11711154
+    }
   }
   element {
     scale: 16
@@ -25500,6 +25549,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 300
+      text_color: 11711154
+    }
   }
   element {
     scale: 17
@@ -25528,6 +25584,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 300
+      text_color: 11711154
+    }
   }
   element {
     scale: 18
@@ -25662,6 +25725,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 250
+      text_color: 11711154
+    }
   }
   element {
     scale: 16
@@ -25687,6 +25757,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 300
+      text_color: 11711154
+    }
   }
   element {
     scale: 17
@@ -25712,6 +25789,13 @@ cont {
       }
       priority: 3000
     }
+    shield {
+      height: 10
+      stroke_color: 11711154
+      priority: 2955
+      min_distance: 300
+      text_color: 11711154
+    }
   }
   element {
     scale: 18
@@ -28527,6 +28611,13 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2960
+      min_distance: 120
+      text_color: 11711154
+    }
   }
   element {
     scale: 14
@@ -28544,6 +28635,13 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2960
+      min_distance: 175
+      text_color: 11711154
+    }
   }
   element {
     scale: 15
@@ -28708,6 +28806,13 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2960
+      min_distance: 120
+      text_color: 11711154
+    }
   }
   element {
     scale: 14
@@ -28737,6 +28842,13 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2960
+      min_distance: 175
+      text_color: 11711154
+    }
   }
   element {
     scale: 15
@@ -28961,6 +29073,13 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2960
+      min_distance: 120
+      text_color: 11711154
+    }
   }
   element {
     scale: 14
@@ -28978,6 +29097,13 @@ cont {
       }
       priority: 3150
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 2960
+      min_distance: 175
+      text_color: 11711154
+    }
   }
   element {
     scale: 15
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 119a36e15e..45a9ff4245 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 19a34eab4e..b3164a416d 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -11867,6 +11867,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3910
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -11889,6 +11895,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3910
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -11911,6 +11923,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 3910
+      min_distance: 350
+    }
   }
   element {
     scale: 18
@@ -12045,6 +12063,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3910
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -12067,6 +12091,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3910
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -12089,6 +12119,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 3910
+      min_distance: 350
+    }
   }
   element {
     scale: 18
@@ -12247,6 +12283,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3910
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -12281,6 +12323,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3910
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -12315,6 +12363,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 3910
+      min_distance: 350
+    }
   }
   element {
     scale: 18
@@ -12473,6 +12527,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3910
+      min_distance: 250
+    }
   }
   element {
     scale: 16
@@ -12499,6 +12559,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3910
+      min_distance: 300
+    }
   }
   element {
     scale: 17
@@ -12525,6 +12591,12 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 10
+      color: 16777215
+      priority: 3910
+      min_distance: 350
+    }
   }
   element {
     scale: 18
@@ -15223,6 +15295,12 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3920
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -15240,6 +15318,12 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3920
+      min_distance: 175
+    }
   }
   element {
     scale: 15
@@ -15429,6 +15513,12 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3920
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -15458,6 +15548,12 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3920
+      min_distance: 175
+    }
   }
   element {
     scale: 15
@@ -15707,6 +15803,12 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3920
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -15724,6 +15826,12 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 3920
+      min_distance: 175
+    }
   }
   element {
     scale: 15
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index c046951ba0..f74b123d11 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 c0dc308953..9463ee413e 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -12069,6 +12069,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 250
+      text_color: 3158064
+    }
   }
   element {
     scale: 16
@@ -12091,6 +12099,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 300
+      text_color: 3158064
+    }
   }
   element {
     scale: 17
@@ -12113,6 +12129,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 350
+      text_color: 3158064
+    }
   }
   element {
     scale: 18
@@ -12251,6 +12275,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 250
+      text_color: 3158064
+    }
   }
   element {
     scale: 16
@@ -12273,6 +12305,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 300
+      text_color: 3158064
+    }
   }
   element {
     scale: 17
@@ -12295,6 +12335,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 350
+      text_color: 3158064
+    }
   }
   element {
     scale: 18
@@ -12457,6 +12505,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 250
+      text_color: 3158064
+    }
   }
   element {
     scale: 16
@@ -12491,6 +12547,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 300
+      text_color: 3158064
+    }
   }
   element {
     scale: 17
@@ -12525,6 +12589,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 350
+      text_color: 3158064
+    }
   }
   element {
     scale: 18
@@ -12687,6 +12759,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 250
+      text_color: 3158064
+    }
   }
   element {
     scale: 16
@@ -12712,6 +12792,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 300
+      text_color: 3158064
+    }
   }
   element {
     scale: 17
@@ -12737,6 +12825,14 @@ cont {
       }
       priority: 3950
     }
+    shield {
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3910
+      min_distance: 350
+      text_color: 3158064
+    }
   }
   element {
     scale: 18
@@ -15477,6 +15573,14 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3920
+      min_distance: 120
+      text_color: 3158064
+    }
   }
   element {
     scale: 14
@@ -15494,6 +15598,14 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3920
+      min_distance: 175
+      text_color: 3158064
+    }
   }
   element {
     scale: 15
@@ -15693,6 +15805,14 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3920
+      min_distance: 120
+      text_color: 3158064
+    }
   }
   element {
     scale: 14
@@ -15722,6 +15842,14 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3920
+      min_distance: 175
+      text_color: 3158064
+    }
   }
   element {
     scale: 15
@@ -15981,6 +16109,14 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3920
+      min_distance: 120
+      text_color: 3158064
+    }
   }
   element {
     scale: 14
@@ -15998,6 +16134,14 @@ cont {
       }
       priority: 4100
     }
+    shield {
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
+      priority: 3920
+      min_distance: 175
+      text_color: 3158064
+    }
   }
   element {
     scale: 15
diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt
index ab9deb3631..34b9027e6e 100644
--- a/data/styles/clear/include/priorities_3_FG.prio.txt
+++ b/data/styles/clear/include/priorities_3_FG.prio.txt
@@ -160,17 +160,17 @@ highway-secondary_link-tunnel                       # line z14- (also has line(c
 # highway-secondary_link-tunnel                     # line(casing) z16- (also has line z14-, pathtext z16-)
 # === 259
 
-highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z18-)
-highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z18-)
-highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z18-)
-highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z18-)
-highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z15-)
-highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-)
-highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z15-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z15-)
+highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z13-)
 === 250
 
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z18-)
-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z15-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z15-)
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z13-)
 # === 249
 
 highway-tertiary_link                               # line z15- (also has pathtext z18-)
@@ -325,13 +325,13 @@ highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (al
 highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
 highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z18-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z15-)
 highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
 highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
 highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z16-)
 highway-service-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z15-, line::bridgeblack z16-, pathtext z16-)
 highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z15-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z13-)
 highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z18-)
 highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
 highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
@@ -359,13 +359,13 @@ highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (al
 highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
 highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z18-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z15-)
 highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
 highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
 highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z16-)
 highway-service-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z15-, line::bridgewhite z16-, pathtext z16-)
 highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
 highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z18-)
 highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
 highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index d323ed9562..3a73d95407 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -653,9 +653,9 @@ highway-pedestrian                                  # pathtext z14- (also has li
 highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
 highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
 highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
-highway-tertiary                                    # pathtext z12- (also has shield::shield z15-, line z11-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z15-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z15-, line z11-, line(casing) z16-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z16-)
 natural-strait                                      # caption z13- (also has line z13-)
 waterway-river                                      # pathtext z11- (also has line z10-)
 waterway-riverbank                                  # pathtext z11- (also has line z10-, area z1-)
@@ -671,10 +671,10 @@ amenity-fountain                                    # icon z16- (also has captio
 highway-raceway                                     # pathtext z16- (also has line z14-)
 === 3050
 
-highway-residential                                 # pathtext z13- (also has shield::shield z18-, line z12-)
-highway-residential-area                            # pathtext z13- (also has shield::shield z18-, line z12-)
-highway-residential-bridge                          # pathtext z13- (also has shield::shield z18-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel                          # pathtext z13- (also has shield::shield z18-, line z12-, line(casing) z16-)
+highway-residential                                 # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-area                            # pathtext z13- (also has shield::shield z15-, line z12-)
+highway-residential-bridge                          # pathtext z13- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel                          # pathtext z13- (also has shield::shield z15-, line z12-, line(casing) z16-)
 highway-road                                        # pathtext z14- (also has line z12-)
 highway-road-bridge                                 # pathtext z14- (also has line z12-, line::bridgeblack z16-, line::bridgewhite z16-)
 highway-road-tunnel                                 # pathtext z14- (also has line z12-)
@@ -698,15 +698,15 @@ highway-secondary-bridge::shield                    # shield::shield z12- (also
 highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z16-)
 === 2965
 
-highway-tertiary::shield                            # shield::shield z15- (also has pathtext z12-, line z11-)
-highway-tertiary-bridge::shield                     # shield::shield z15- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-tertiary-tunnel::shield                     # shield::shield z15- (also has pathtext z12-, line z11-, line(casing) z16-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z16-)
 === 2960
 
-highway-residential::shield                         # shield::shield z18- (also has pathtext z13-, line z12-)
-highway-residential-area::shield                    # shield::shield z18- (also has pathtext z13-, line z12-)
-highway-residential-bridge::shield                  # shield::shield z18- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-residential-tunnel::shield                  # shield::shield z18- (also has pathtext z13-, line z12-, line(casing) z16-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z13-, line z12-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z13-, line z12-, line(casing) z16-)
 === 2955
 
 highway-cycleway                                    # pathtext z15- (also has line z13-)
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index 207053b2df..d7c8e2d714 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -141,22 +141,22 @@ highway-secondary_link-tunnel                       # line z14- (also has line(c
 # highway-secondary_link-tunnel                     # line(casing) z14- (also has line z14-, pathtext z16-)
 # === 199
 
-highway-residential                                 # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z18-)
-highway-residential-area                            # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z18-)
-highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z18-)
-highway-residential-tunnel                          # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z18-)
-highway-tertiary                                    # line z11- (also has line(casing) z15-, pathtext z12-, shield::shield z15-)
-highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z15-)
-highway-tertiary-tunnel                             # line z11- (also has line(casing) z15-, pathtext z12-, shield::shield z15-)
+highway-residential                                 # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z15-)
+highway-residential-area                            # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z15-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z15-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z15-)
+highway-tertiary                                    # line z11- (also has line(casing) z15-, pathtext z12-, shield::shield z13-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z13-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z15-, pathtext z12-, shield::shield z13-)
 === 190
 
-# highway-residential                               # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z18-)
-# highway-residential-area                          # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z18-)
-# highway-residential-bridge                        # line(casing) z15- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z18-)
-# highway-residential-tunnel                        # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z18-)
-# highway-tertiary                                  # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z15-)
-# highway-tertiary-bridge                           # line(casing) z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-)
-# highway-tertiary-tunnel                           # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z15-)
+# highway-residential                               # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-)
+# highway-residential-area                          # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-)
+# highway-residential-bridge                        # line(casing) z15- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-)
+# highway-residential-tunnel                        # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z15-)
+# highway-tertiary                                  # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z13-)
+# highway-tertiary-bridge                           # line(casing) z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z13-)
+# highway-tertiary-tunnel                           # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z13-)
 # === 189
 
 highway-tertiary_link                               # line z15- (also has line(casing) z15-, pathtext z18-)
@@ -295,10 +295,10 @@ highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (al
 highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z18-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z15-)
 highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z12-)
 highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, line(casing) z14-, pathtext z16-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z15-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z13-)
 highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, line(casing) z15-, pathtext z18-)
 highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
@@ -320,10 +320,10 @@ highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (al
 highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z14-, pathtext z11-, shield::shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z18-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z15-)
 highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z12-)
 highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z16-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z15-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z13-)
 highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, line(casing) z15-, pathtext z18-)
 highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index 3bdbd96e08..fdc7e87aaf 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -72,9 +72,9 @@ highway-secondary-bridge                            # pathtext z10- (also has sh
 highway-secondary-tunnel                            # pathtext z10- (also has shield::shield z12-, line z10-, line(casing) z14-)
 === 4150
 
-highway-tertiary                                    # pathtext z12- (also has shield::shield z15-, line z11-, line(casing) z15-)
-highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z15-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-)
-highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z15-, line z11-, line(casing) z15-)
+highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z15-)
+highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-)
+highway-tertiary-tunnel                             # pathtext z12- (also has shield::shield z13-, line z11-, line(casing) z15-)
 === 4100
 
 highway-secondary_link                              # pathtext z16- (also has line(casing) z14-, line z14-)
@@ -88,10 +88,10 @@ highway-unclassified-bridge                         # pathtext z14- (also has li
 highway-unclassified-tunnel                         # pathtext z14- (also has line z11-, line(casing) z16-)
 === 4000
 
-highway-residential                                 # pathtext z12- (also has shield::shield z18-, line z12-, line(casing) z15-)
-highway-residential-area                            # pathtext z12- (also has shield::shield z18-, line z12-, line(casing) z15-)
-highway-residential-bridge                          # pathtext z12- (also has shield::shield z18-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-)
-highway-residential-tunnel                          # pathtext z12- (also has shield::shield z18-, line z12-, line(casing) z15-)
+highway-residential                                 # pathtext z12- (also has shield::shield z15-, line z12-, line(casing) z15-)
+highway-residential-area                            # pathtext z12- (also has shield::shield z15-, line z12-, line(casing) z15-)
+highway-residential-bridge                          # pathtext z12- (also has shield::shield z15-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-)
+highway-residential-tunnel                          # pathtext z12- (also has shield::shield z15-, line z12-, line(casing) z15-)
 === 3950
 
 highway-primary_link::shield                        # shield::shield z11- (also has pathtext z11-, line z11-, line(casing) z14-)
@@ -104,15 +104,15 @@ highway-secondary-bridge::shield                    # shield::shield z12- (also
 highway-secondary-tunnel::shield                    # shield::shield z12- (also has pathtext z10-, line z10-, line(casing) z14-)
 === 3930
 
-highway-tertiary::shield                            # shield::shield z15- (also has pathtext z12-, line z11-, line(casing) z15-)
-highway-tertiary-bridge::shield                     # shield::shield z15- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-)
-highway-tertiary-tunnel::shield                     # shield::shield z15- (also has pathtext z12-, line z11-, line(casing) z15-)
+highway-tertiary::shield                            # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z15-)
+highway-tertiary-bridge::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-)
+highway-tertiary-tunnel::shield                     # shield::shield z13- (also has pathtext z12-, line z11-, line(casing) z15-)
 === 3920
 
-highway-residential::shield                         # shield::shield z18- (also has pathtext z12-, line z12-, line(casing) z15-)
-highway-residential-area::shield                    # shield::shield z18- (also has pathtext z12-, line z12-, line(casing) z15-)
-highway-residential-bridge::shield                  # shield::shield z18- (also has pathtext z12-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-)
-highway-residential-tunnel::shield                  # shield::shield z18- (also has pathtext z12-, line z12-, line(casing) z15-)
+highway-residential::shield                         # shield::shield z15- (also has pathtext z12-, line z12-, line(casing) z15-)
+highway-residential-area::shield                    # shield::shield z15- (also has pathtext z12-, line z12-, line(casing) z15-)
+highway-residential-bridge::shield                  # shield::shield z15- (also has pathtext z12-, line z12-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-)
+highway-residential-tunnel::shield                  # shield::shield z15- (also has pathtext z12-, line z12-, line(casing) z15-)
 === 3910
 
 highway-road                                        # pathtext z14- (also has line z12-)