diff --git a/data/colors.txt b/data/colors.txt
index 7a37794710..7ef765fc73 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -95,6 +95,7 @@
 13155550
 13224123
 13229526
+13445160
 13484259
 13615592
 13620648
@@ -122,6 +123,7 @@
 16749632
 16750592
 16752972
+16760320
 16763432
 16764006
 16774560
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 70f5469009..db848199a6 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 70f5469009..db848199a6 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 6f11340f8f..2c5630b1a7 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -75953,7 +75953,7 @@ cont {
 }
 colors {
   value {
-    name: "RoadShieldGreenText"
+    name: "RoadShieldWhiteText"
     color: 16777215
     x: 0
     y: 0
@@ -75982,24 +75982,18 @@ colors {
     x: 0
     y: 0
   }
-  value {
-    name: "RoadShieldAddText"
-    color: 0
-    x: 0
-    y: 0
-  }
-  value {
-    name: "RoadShieldAddTextOutline"
-    color: 16777215
-    x: 0
-    y: 0
-  }
   value {
     name: "PoiDeletedMask"
     color: 3019898879
     x: 0
     y: 0
   }
+  value {
+    name: "RoadShieldUKYellowText"
+    color: 16764006
+    x: 0
+    y: 0
+  }
   value {
     name: "RoadShieldBlueBackground"
     color: 3043273
@@ -76012,30 +76006,24 @@ colors {
     x: 0
     y: 0
   }
-  value {
-    name: "RoadShieldUSInterstateText"
-    color: 16777215
-    x: 0
-    y: 0
-  }
   value {
     name: "TrafficArrowDark"
     color: 7033108
     x: 0
     y: 0
   }
-  value {
-    name: "RoadShieldBlueText"
-    color: 16777215
-    x: 0
-    y: 0
-  }
   value {
     name: "RoutePedestrian"
     color: 857551774
     x: 0
     y: 0
   }
+  value {
+    name: "RoadShieldOrangeBackground"
+    color: 16760320
+    x: 0
+    y: 0
+  }
   value {
     name: "Arrow3DOutline"
     color: 16777215
@@ -76043,8 +76031,8 @@ colors {
     y: 0
   }
   value {
-    name: "RouteTrafficG0"
-    color: 10167040
+    name: "RoadShieldRedBackground"
+    color: 13445160
     x: 0
     y: 0
   }
@@ -76054,6 +76042,12 @@ colors {
     x: 0
     y: 0
   }
+  value {
+    name: "RoadShieldBlackText"
+    color: 0
+    x: 0
+    y: 0
+  }
   value {
     name: "Route"
     color: 34815
@@ -76066,12 +76060,6 @@ colors {
     x: 0
     y: 0
   }
-  value {
-    name: "RoadShieldUSHighwayText"
-    color: 0
-    x: 0
-    y: 0
-  }
   value {
     name: "TrackPlaneSpeed"
     color: 705791
@@ -76079,8 +76067,8 @@ colors {
     y: 0
   }
   value {
-    name: "TrafficG0"
-    color: 10167045
+    name: "TrackCarSpeed"
+    color: 1407476
     x: 0
     y: 0
   }
@@ -76109,8 +76097,8 @@ colors {
     y: 0
   }
   value {
-    name: "TrackCarSpeed"
-    color: 1407476
+    name: "TrafficG0"
+    color: 10167045
     x: 0
     y: 0
   }
@@ -76169,8 +76157,8 @@ colors {
     y: 0
   }
   value {
-    name: "RoadShieldUKGreenText"
-    color: 16764006
+    name: "RouteTrafficG0"
+    color: 10167040
     x: 0
     y: 0
   }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index ea46952182..9998436a6f 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 edcc0eed1f..199b90f20e 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -75953,7 +75953,7 @@ cont {
 }
 colors {
   value {
-    name: "RoadShieldGreenText"
+    name: "RoadShieldWhiteText"
     color: 16777215
     x: 0
     y: 0
@@ -75982,24 +75982,18 @@ colors {
     x: 0
     y: 0
   }
-  value {
-    name: "RoadShieldAddText"
-    color: 0
-    x: 0
-    y: 0
-  }
-  value {
-    name: "RoadShieldAddTextOutline"
-    color: 16777215
-    x: 0
-    y: 0
-  }
   value {
     name: "PoiDeletedMask"
     color: 3019898879
     x: 0
     y: 0
   }
+  value {
+    name: "RoadShieldUKYellowText"
+    color: 16764006
+    x: 0
+    y: 0
+  }
   value {
     name: "RoadShieldBlueBackground"
     color: 3043273
@@ -76012,30 +76006,24 @@ colors {
     x: 0
     y: 0
   }
-  value {
-    name: "RoadShieldUSInterstateText"
-    color: 16777215
-    x: 0
-    y: 0
-  }
   value {
     name: "TrafficArrowDark"
     color: 1973790
     x: 0
     y: 0
   }
-  value {
-    name: "RoadShieldBlueText"
-    color: 16777215
-    x: 0
-    y: 0
-  }
   value {
     name: "RoutePedestrian"
     color: 1308604747
     x: 0
     y: 0
   }
+  value {
+    name: "RoadShieldOrangeBackground"
+    color: 16760320
+    x: 0
+    y: 0
+  }
   value {
     name: "Arrow3DOutline"
     color: 16777215
@@ -76043,8 +76031,8 @@ colors {
     y: 0
   }
   value {
-    name: "RouteTrafficG0"
-    color: 10167040
+    name: "RoadShieldRedBackground"
+    color: 13445160
     x: 0
     y: 0
   }
@@ -76054,6 +76042,12 @@ colors {
     x: 0
     y: 0
   }
+  value {
+    name: "RoadShieldBlackText"
+    color: 0
+    x: 0
+    y: 0
+  }
   value {
     name: "Route"
     color: 34815
@@ -76066,12 +76060,6 @@ colors {
     x: 0
     y: 0
   }
-  value {
-    name: "RoadShieldUSHighwayText"
-    color: 0
-    x: 0
-    y: 0
-  }
   value {
     name: "TrackPlaneSpeed"
     color: 16774560
@@ -76079,8 +76067,8 @@ colors {
     y: 0
   }
   value {
-    name: "TrafficG0"
-    color: 4263680
+    name: "TrackCarSpeed"
+    color: 16763432
     x: 0
     y: 0
   }
@@ -76109,8 +76097,8 @@ colors {
     y: 0
   }
   value {
-    name: "TrackCarSpeed"
-    color: 16763432
+    name: "TrafficG0"
+    color: 4263680
     x: 0
     y: 0
   }
@@ -76169,8 +76157,8 @@ colors {
     y: 0
   }
   value {
-    name: "RoadShieldUKGreenText"
-    color: 16764006
+    name: "RouteTrafficG0"
+    color: 10167040
     x: 0
     y: 0
   }