diff --git a/data/styles/default/dark/style.mapcss b/data/styles/default/dark/style.mapcss
index 3f8b3ec20..55344b15e 100644
--- a/data/styles/default/dark/style.mapcss
+++ b/data/styles/default/dark/style.mapcss
@@ -71,8 +71,9 @@ colors
   RoadShieldBlackText-color: #212121;
   RoadShieldWhiteText-color: #B7B6B6;
   RoadShieldUKYellowText-color: #B49E0E;
-  RoadShieldBlueBackground-color: #294C88;
+  RoadShieldWhiteBackground-color: #999999;
   RoadShieldGreenBackground-color: #136C30;
+  RoadShieldBlueBackground-color: #294C88;
   RoadShieldRedBackground-color: #9F1A17;
   RoadShieldOrangeBackground-color: #B58E1B;
   PoiHotelTextOutline-color: #000000;
diff --git a/data/styles/default/light/style.mapcss b/data/styles/default/light/style.mapcss
index 6a3afb879..ab819679d 100644
--- a/data/styles/default/light/style.mapcss
+++ b/data/styles/default/light/style.mapcss
@@ -71,8 +71,9 @@ colors
   RoadShieldBlackText-color: #000000;
   RoadShieldWhiteText-color: #FFFFFF;
   RoadShieldUKYellowText-color: #FFD400;
-  RoadShieldBlueBackground-color: #1A5EC1;
+  RoadShieldWhiteBackground-color: #FFFFFF;
   RoadShieldGreenBackground-color: #309302;
+  RoadShieldBlueBackground-color: #1A5EC1;
   RoadShieldRedBackground-color: #E63534;
   RoadShieldOrangeBackground-color: #FFBE00;
   PoiHotelTextOutline-color: #FFFFFF;
diff --git a/data/styles/outdoors/dark/style.mapcss b/data/styles/outdoors/dark/style.mapcss
index 051ece6d5..6e5b0cc51 100644
--- a/data/styles/outdoors/dark/style.mapcss
+++ b/data/styles/outdoors/dark/style.mapcss
@@ -71,8 +71,9 @@ colors
   RoadShieldBlackText-color: #212121;
   RoadShieldWhiteText-color: #B7B6B6;
   RoadShieldUKYellowText-color: #B49E0E;
-  RoadShieldBlueBackground-color: #294C88;
+  RoadShieldWhiteBackground-color: #999999;
   RoadShieldGreenBackground-color: #136C30;
+  RoadShieldBlueBackground-color: #294C88;
   RoadShieldRedBackground-color: #9F1A17;
   RoadShieldOrangeBackground-color: #B58E1B;
   PoiHotelTextOutline-color: #000000;
diff --git a/data/styles/outdoors/light/style.mapcss b/data/styles/outdoors/light/style.mapcss
index 8776c8d3b..1b8a3c6e1 100644
--- a/data/styles/outdoors/light/style.mapcss
+++ b/data/styles/outdoors/light/style.mapcss
@@ -73,8 +73,9 @@ colors
   RoadShieldBlackText-color: #000000;
   RoadShieldWhiteText-color: #FFFFFF;
   RoadShieldUKYellowText-color: #FFD400;
-  RoadShieldBlueBackground-color: #1A5EC1;
+  RoadShieldWhiteBackground-color: #FFFFFF;
   RoadShieldGreenBackground-color: #309302;
+  RoadShieldBlueBackground-color: #1A5EC1;
   RoadShieldRedBackground-color: #E63534;
   RoadShieldOrangeBackground-color: #FFBE00;
   PoiHotelTextOutline-color: #FFFFFF;
diff --git a/data/styles/vehicle/dark/style.mapcss b/data/styles/vehicle/dark/style.mapcss
index 78c6c35cd..3057c2490 100644
--- a/data/styles/vehicle/dark/style.mapcss
+++ b/data/styles/vehicle/dark/style.mapcss
@@ -72,8 +72,9 @@ colors
   RoadShieldBlackText-color: #212121;
   RoadShieldWhiteText-color: #B7B6B6;
   RoadShieldUKYellowText-color: #B49E0E;
-  RoadShieldBlueBackground-color: #294C88;
+  RoadShieldWhiteBackground-color: #999999;
   RoadShieldGreenBackground-color: #136C30;
+  RoadShieldBlueBackground-color: #294C88;
   RoadShieldRedBackground-color: #9F1A17;
   RoadShieldOrangeBackground-color: #B58E1B;
   PoiHotelTextOutline-color: #000000;
diff --git a/data/styles/vehicle/light/style.mapcss b/data/styles/vehicle/light/style.mapcss
index 41455f9b1..5568310f8 100644
--- a/data/styles/vehicle/light/style.mapcss
+++ b/data/styles/vehicle/light/style.mapcss
@@ -72,8 +72,9 @@ colors
   RoadShieldBlackText-color: #000000;
   RoadShieldWhiteText-color: #FFFFFF;
   RoadShieldUKYellowText-color: #FFD400;
-  RoadShieldBlueBackground-color: #1A5EC1;
+  RoadShieldWhiteBackground-color: #FFFFFF;
   RoadShieldGreenBackground-color: #309302;
+  RoadShieldBlueBackground-color: #1A5EC1;
   RoadShieldRedBackground-color: #E63534;
   RoadShieldOrangeBackground-color: #FFBE00;
   PoiHotelTextOutline-color: #FFFFFF;
diff --git a/libs/drape_frontend/apply_feature_functors.cpp b/libs/drape_frontend/apply_feature_functors.cpp
index 8d930dba0..2f904f593 100644
--- a/libs/drape_frontend/apply_feature_functors.cpp
+++ b/libs/drape_frontend/apply_feature_functors.cpp
@@ -51,6 +51,7 @@ double const kMinVisibleFontSize = 8.0;
 df::ColorConstant const kPoiDeletedMaskColor = "PoiDeletedMask";
 df::ColorConstant const kRoadShieldBlackTextColor = "RoadShieldBlackText";
 df::ColorConstant const kRoadShieldWhiteTextColor = "RoadShieldWhiteText";
+df::ColorConstant const kRoadShieldWhiteBackgroundColor = "RoadShieldWhiteBackground";
 df::ColorConstant const kRoadShieldGreenBackgroundColor = "RoadShieldGreenBackground";
 df::ColorConstant const kRoadShieldBlueBackgroundColor = "RoadShieldBlueBackground";
 df::ColorConstant const kRoadShieldRedBackgroundColor = "RoadShieldRedBackground";
@@ -252,18 +253,22 @@ dp::Color GetRoadShieldColor(dp::Color const & baseColor, ftypes::RoadShield con
   using ftypes::RoadShieldType;
 
   static base::SmallMapBase<ftypes::RoadShieldType, df::ColorConstant> kColors = {
+      {RoadShieldType::Generic_White, kRoadShieldWhiteBackgroundColor},
       {RoadShieldType::Generic_Green, kRoadShieldGreenBackgroundColor},
       {RoadShieldType::Generic_Blue, kRoadShieldBlueBackgroundColor},
       {RoadShieldType::Generic_Red, kRoadShieldRedBackgroundColor},
       {RoadShieldType::Generic_Orange, kRoadShieldOrangeBackgroundColor},
+      {RoadShieldType::Generic_White_Bordered, kRoadShieldWhiteBackgroundColor},
       {RoadShieldType::Generic_Green_Bordered, kRoadShieldGreenBackgroundColor},
       {RoadShieldType::Generic_Blue_Bordered, kRoadShieldBlueBackgroundColor},
       {RoadShieldType::Generic_Red_Bordered, kRoadShieldRedBackgroundColor},
       {RoadShieldType::Generic_Orange_Bordered, kRoadShieldOrangeBackgroundColor},
+      {RoadShieldType::Generic_Pill_White, kRoadShieldWhiteBackgroundColor},
       {RoadShieldType::Generic_Pill_Green, kRoadShieldGreenBackgroundColor},
       {RoadShieldType::Generic_Pill_Blue, kRoadShieldBlueBackgroundColor},
       {RoadShieldType::Generic_Pill_Red, kRoadShieldRedBackgroundColor},
       {RoadShieldType::Generic_Pill_Orange, kRoadShieldOrangeBackgroundColor},
+      {RoadShieldType::Generic_Pill_White_Bordered, kRoadShieldWhiteBackgroundColor},
       {RoadShieldType::Generic_Pill_Green_Bordered, kRoadShieldGreenBackgroundColor},
       {RoadShieldType::Generic_Pill_Blue_Bordered, kRoadShieldBlueBackgroundColor},
       {RoadShieldType::Generic_Pill_Red_Bordered, kRoadShieldRedBackgroundColor},