Updated map style

83 files changed, 53 insertions, 29 deletions

diff --git a/data/styles/clear/include/Roads_label.mapcss b/data/styles/clear/include/Roads_label.mapcss
index 71193bddec..9adfc8bc7c 100755
--- a/data/styles/clear/include/Roads_label.mapcss
+++ b/data/styles/clear/include/Roads_label.mapcss
@@ -180,25 +180,28 @@ line|z10-[highway=primary_link],
 line|z12-[highway=secondary],
 line|z12-[highway=residential],
 line|z12-[highway=tertiary]
-{shield-font-size: 9;shield-text-color: @shield;shield-text-halo-radius: 1;shield-text-halo-color: @shield_halo;shield-text-halo-opacity: 1;}
-
-line|z10-11[highway=motorway],
-line|z10-11[highway=trunk],
-line|z10-11[highway=motorway_link],
-line|z10-11[highway=trunk_link],
-line|z10-11[highway=primary],
-line|z10-11[highway=primary_link]
-{shield-text-halo-radius: 0.5;shield-min-distance: 18;}
-line|z12-14[highway=motorway],
-line|z12-14[highway=trunk],
-line|z12-14[highway=motorway_link],
-line|z12-14[highway=trunk_link],
-line|z12-14[highway=primary],
-line|z12-14[highway=primary_link],
-line|z12-14[highway=secondary],
-line|z12-14[highway=residential],
-line|z12-14[highway=tertiary]
-{shield-min-distance: 20;}
+{shield-font-size: 10;shield-text-color: @shield_text;shield-text-halo-radius: 0;shield-text-halo-color: @shield_text_halo;shield-color: @shield;shield-outline-radius: 1;shield-outline-color: @shield_outline;}
+
+line|z10-12[highway=motorway],
+line|z10-12[highway=trunk],
+line|z10-12[highway=motorway_link],
+line|z10-12[highway=trunk_link],
+line|z10-12[highway=primary],
+line|z10-12[highway=primary_link],
+line|z10-12[highway=secondary],
+line|z10-12[highway=residential],
+line|z10-12[highway=tertiary]
+{shield-min-distance: 60;}
+line|z13-14[highway=motorway],
+line|z13-14[highway=trunk],
+line|z13-14[highway=motorway_link],
+line|z13-14[highway=trunk_link],
+line|z13-14[highway=primary],
+line|z13-14[highway=primary_link],
+line|z13-14[highway=secondary],
+line|z13-14[highway=residential],
+line|z13-14[highway=tertiary]
+{shield-min-distance: 100;}
 line|z15[highway=motorway],
 line|z15[highway=trunk],
 line|z15[highway=motorway_link],
@@ -208,20 +211,37 @@ line|z15[highway=primary_link],
 line|z15[highway=secondary],
 line|z15[highway=residential],
 line|z15[highway=tertiary]
-{shield-min-distance: 24;}
+{shield-min-distance: 150;}
 line|z16[highway=motorway],
 line|z16[highway=trunk],
+line|z16[highway=motorway_link],
+line|z16[highway=trunk_link],
 line|z16[highway=primary],
+line|z16[highway=primary_link],
 line|z16[highway=secondary],
 line|z16[highway=residential],
 line|z16[highway=tertiary]
-{shield-min-distance: 25;}
+{shield-min-distance: 250;}
 line|z17[highway=motorway],
-line|z17[highway=trunk]
-{shield-font-size: 10;shield-min-distance: 25;}
+line|z17[highway=trunk],
+line|z17[highway=motorway_link],
+line|z17[highway=trunk_link],
+line|z17[highway=primary],
+line|z17[highway=primary_link],
+line|z17[highway=secondary],
+line|z17[highway=residential],
+line|z17[highway=tertiary]
+{shield-font-size: 11;shield-min-distance: 400;}
 line|z18-[highway=motorway],
-line|z18-[highway=trunk]
-{shield-font-size: 10;shield-min-distance: 26;}
+line|z18-[highway=trunk],
+line|z18-[highway=motorway_link],
+line|z18-[highway=trunk_link],
+line|z18-[highway=primary],
+line|z18-[highway=primary_link],
+line|z18-[highway=secondary],
+line|z18-[highway=residential],
+line|z18-[highway=tertiary]
+{shield-font-size: 11;shield-min-distance: 500;}
 
 /* 3.TRUNK & MOTORWAY 10-22 ZOOM */
 
diff --git a/data/styles/clear/style-clear/6plus/shield-us-hw-thin-scaled.png b/data/styles/clear/style-clear/6plus/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..50fdac5a10
--- /dev/null
+++ b/data/styles/clear/style-clear/6plus/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-hw-thin.png b/data/styles/clear/style-clear/6plus/shield-us-hw-thin.png
new file mode 100644
index 0000000000..728771aadf
--- /dev/null
+++ b/data/styles/clear/style-clear/6plus/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-hw-wide-scaled.png b/data/styles/clear/style-clear/6plus/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..1ac895dbd8
--- /dev/null
+++ b/data/styles/clear/style-clear/6plus/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-hw-wide.png b/data/styles/clear/style-clear/6plus/shield-us-hw-wide.png
new file mode 100644
index 0000000000..411b186bb6
--- /dev/null
+++ b/data/styles/clear/style-clear/6plus/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-i-thin-scaled.png b/data/styles/clear/style-clear/6plus/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..8560ec37a2
--- /dev/null
+++ b/data/styles/clear/style-clear/6plus/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-i-thin.png b/data/styles/clear/style-clear/6plus/shield-us-i-thin.png
new file mode 100644
index 0000000000..c916d3e35c
--- /dev/null
+++ b/data/styles/clear/style-clear/6plus/shield-us-i-thin.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-i-wide-scaled.png b/data/styles/clear/style-clear/6plus/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..f6b6c24fe8
--- /dev/null
+++ b/data/styles/clear/style-clear/6plus/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-clear/6plus/shield-us-i-wide.png b/data/styles/clear/style-clear/6plus/shield-us-i-wide.png
new file mode 100644
index 0000000000..5cd9e6bf66
--- /dev/null
+++ b/data/styles/clear/style-clear/6plus/shield-us-i-wide.png
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index 06ef3346a6..8079234389 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -166,6 +166,8 @@
 /* 6.4 Road labels */
 
 @road_label_halo: #FFFFFF;
-@shield: #fff;
-@shield_halo: #498F46;
+@shield_text: #000000;
+@shield_text_halo: #000000;
+@shield: #FFFFFF;
+@shield_outline: #000000;
 /* blue - #2E89B0; #687E94; #598DBE; */
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-hw-thin-scaled.png b/data/styles/clear/style-clear/hdpi/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..d013ef84de
--- /dev/null
+++ b/data/styles/clear/style-clear/hdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-hw-thin.png b/data/styles/clear/style-clear/hdpi/shield-us-hw-thin.png
new file mode 100644
index 0000000000..e7ebaab75a
--- /dev/null
+++ b/data/styles/clear/style-clear/hdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-hw-wide-scaled.png b/data/styles/clear/style-clear/hdpi/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..5b40ac627c
--- /dev/null
+++ b/data/styles/clear/style-clear/hdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-hw-wide.png b/data/styles/clear/style-clear/hdpi/shield-us-hw-wide.png
new file mode 100644
index 0000000000..ee5a7efbc1
--- /dev/null
+++ b/data/styles/clear/style-clear/hdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-i-thin-scaled.png b/data/styles/clear/style-clear/hdpi/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..08dcde9476
--- /dev/null
+++ b/data/styles/clear/style-clear/hdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-i-thin.png b/data/styles/clear/style-clear/hdpi/shield-us-i-thin.png
new file mode 100644
index 0000000000..81cbac5836
--- /dev/null
+++ b/data/styles/clear/style-clear/hdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-i-wide-scaled.png b/data/styles/clear/style-clear/hdpi/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..4b11d3a8b8
--- /dev/null
+++ b/data/styles/clear/style-clear/hdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-clear/hdpi/shield-us-i-wide.png b/data/styles/clear/style-clear/hdpi/shield-us-i-wide.png
new file mode 100644
index 0000000000..1dabc96854
--- /dev/null
+++ b/data/styles/clear/style-clear/hdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-hw-thin-scaled.png b/data/styles/clear/style-clear/mdpi/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..620b8561ab
--- /dev/null
+++ b/data/styles/clear/style-clear/mdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-hw-thin.png b/data/styles/clear/style-clear/mdpi/shield-us-hw-thin.png
new file mode 100644
index 0000000000..d7458aaca8
--- /dev/null
+++ b/data/styles/clear/style-clear/mdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-hw-wide-scaled.png b/data/styles/clear/style-clear/mdpi/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..96307978c6
--- /dev/null
+++ b/data/styles/clear/style-clear/mdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-hw-wide.png b/data/styles/clear/style-clear/mdpi/shield-us-hw-wide.png
new file mode 100644
index 0000000000..d3dedf062c
--- /dev/null
+++ b/data/styles/clear/style-clear/mdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-i-thin-scaled.png b/data/styles/clear/style-clear/mdpi/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..524602266c
--- /dev/null
+++ b/data/styles/clear/style-clear/mdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-i-thin.png b/data/styles/clear/style-clear/mdpi/shield-us-i-thin.png
new file mode 100644
index 0000000000..51c8b323a7
--- /dev/null
+++ b/data/styles/clear/style-clear/mdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-i-wide-scaled.png b/data/styles/clear/style-clear/mdpi/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..2132d2ec9a
--- /dev/null
+++ b/data/styles/clear/style-clear/mdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-clear/mdpi/shield-us-i-wide.png b/data/styles/clear/style-clear/mdpi/shield-us-i-wide.png
new file mode 100644
index 0000000000..fabc87a056
--- /dev/null
+++ b/data/styles/clear/style-clear/mdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-hw-thin-scaled.png b/data/styles/clear/style-clear/xhdpi/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..037105428a
--- /dev/null
+++ b/data/styles/clear/style-clear/xhdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-hw-thin.png b/data/styles/clear/style-clear/xhdpi/shield-us-hw-thin.png
new file mode 100644
index 0000000000..9817377ddc
--- /dev/null
+++ b/data/styles/clear/style-clear/xhdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-hw-wide-scaled.png b/data/styles/clear/style-clear/xhdpi/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..171944c1b5
--- /dev/null
+++ b/data/styles/clear/style-clear/xhdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-hw-wide.png b/data/styles/clear/style-clear/xhdpi/shield-us-hw-wide.png
new file mode 100644
index 0000000000..9cd13ee2f6
--- /dev/null
+++ b/data/styles/clear/style-clear/xhdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-i-thin-scaled.png b/data/styles/clear/style-clear/xhdpi/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..1c5e864e2e
--- /dev/null
+++ b/data/styles/clear/style-clear/xhdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-i-thin.png b/data/styles/clear/style-clear/xhdpi/shield-us-i-thin.png
new file mode 100644
index 0000000000..0b2581d742
--- /dev/null
+++ b/data/styles/clear/style-clear/xhdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-i-wide-scaled.png b/data/styles/clear/style-clear/xhdpi/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..ecc1979fbb
--- /dev/null
+++ b/data/styles/clear/style-clear/xhdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-clear/xhdpi/shield-us-i-wide.png b/data/styles/clear/style-clear/xhdpi/shield-us-i-wide.png
new file mode 100644
index 0000000000..5649aa5daa
--- /dev/null
+++ b/data/styles/clear/style-clear/xhdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-hw-thin-scaled.png b/data/styles/clear/style-clear/xxhdpi/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..b84c4a4043
--- /dev/null
+++ b/data/styles/clear/style-clear/xxhdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-hw-thin.png b/data/styles/clear/style-clear/xxhdpi/shield-us-hw-thin.png
new file mode 100644
index 0000000000..606cfeb01f
--- /dev/null
+++ b/data/styles/clear/style-clear/xxhdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-hw-wide-scaled.png b/data/styles/clear/style-clear/xxhdpi/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..40290ef0a5
--- /dev/null
+++ b/data/styles/clear/style-clear/xxhdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-hw-wide.png b/data/styles/clear/style-clear/xxhdpi/shield-us-hw-wide.png
new file mode 100644
index 0000000000..d00b341fe8
--- /dev/null
+++ b/data/styles/clear/style-clear/xxhdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-i-thin-scaled.png b/data/styles/clear/style-clear/xxhdpi/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..abf541096c
--- /dev/null
+++ b/data/styles/clear/style-clear/xxhdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-i-thin.png b/data/styles/clear/style-clear/xxhdpi/shield-us-i-thin.png
new file mode 100644
index 0000000000..28d0c4c9cd
--- /dev/null
+++ b/data/styles/clear/style-clear/xxhdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-i-wide-scaled.png b/data/styles/clear/style-clear/xxhdpi/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..7c64ec16e1
--- /dev/null
+++ b/data/styles/clear/style-clear/xxhdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-clear/xxhdpi/shield-us-i-wide.png b/data/styles/clear/style-clear/xxhdpi/shield-us-i-wide.png
new file mode 100644
index 0000000000..2c9c65130f
--- /dev/null
+++ b/data/styles/clear/style-clear/xxhdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-hw-thin-scaled.png b/data/styles/clear/style-night/6plus/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..50fdac5a10
--- /dev/null
+++ b/data/styles/clear/style-night/6plus/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-hw-thin.png b/data/styles/clear/style-night/6plus/shield-us-hw-thin.png
new file mode 100644
index 0000000000..728771aadf
--- /dev/null
+++ b/data/styles/clear/style-night/6plus/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-hw-wide-scaled.png b/data/styles/clear/style-night/6plus/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..1ac895dbd8
--- /dev/null
+++ b/data/styles/clear/style-night/6plus/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-hw-wide.png b/data/styles/clear/style-night/6plus/shield-us-hw-wide.png
new file mode 100644
index 0000000000..411b186bb6
--- /dev/null
+++ b/data/styles/clear/style-night/6plus/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-i-thin-scaled.png b/data/styles/clear/style-night/6plus/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..8560ec37a2
--- /dev/null
+++ b/data/styles/clear/style-night/6plus/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-i-thin.png b/data/styles/clear/style-night/6plus/shield-us-i-thin.png
new file mode 100644
index 0000000000..c916d3e35c
--- /dev/null
+++ b/data/styles/clear/style-night/6plus/shield-us-i-thin.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-i-wide-scaled.png b/data/styles/clear/style-night/6plus/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..f6b6c24fe8
--- /dev/null
+++ b/data/styles/clear/style-night/6plus/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-night/6plus/shield-us-i-wide.png b/data/styles/clear/style-night/6plus/shield-us-i-wide.png
new file mode 100644
index 0000000000..5cd9e6bf66
--- /dev/null
+++ b/data/styles/clear/style-night/6plus/shield-us-i-wide.png
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index 93dcd6f1fe..efb1182a98 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -167,5 +167,7 @@
 /* 6.4 Road labels */
 
 @road_label_halo: #000000;
-@shield: #b2b2b2;
-@shield_halo: #000000;
+@shield_text: #b2b2b2;
+@shield_text_halo: #000000;
+@shield: #000000;
+@shield_outline: #b2b2b2;
diff --git a/data/styles/clear/style-night/hdpi/shield-us-hw-thin-scaled.png b/data/styles/clear/style-night/hdpi/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..d013ef84de
--- /dev/null
+++ b/data/styles/clear/style-night/hdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-hw-thin.png b/data/styles/clear/style-night/hdpi/shield-us-hw-thin.png
new file mode 100644
index 0000000000..e7ebaab75a
--- /dev/null
+++ b/data/styles/clear/style-night/hdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-hw-wide-scaled.png b/data/styles/clear/style-night/hdpi/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..5b40ac627c
--- /dev/null
+++ b/data/styles/clear/style-night/hdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-hw-wide.png b/data/styles/clear/style-night/hdpi/shield-us-hw-wide.png
new file mode 100644
index 0000000000..ee5a7efbc1
--- /dev/null
+++ b/data/styles/clear/style-night/hdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-i-thin-scaled.png b/data/styles/clear/style-night/hdpi/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..08dcde9476
--- /dev/null
+++ b/data/styles/clear/style-night/hdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-i-thin.png b/data/styles/clear/style-night/hdpi/shield-us-i-thin.png
new file mode 100644
index 0000000000..81cbac5836
--- /dev/null
+++ b/data/styles/clear/style-night/hdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-i-wide-scaled.png b/data/styles/clear/style-night/hdpi/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..4b11d3a8b8
--- /dev/null
+++ b/data/styles/clear/style-night/hdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-night/hdpi/shield-us-i-wide.png b/data/styles/clear/style-night/hdpi/shield-us-i-wide.png
new file mode 100644
index 0000000000..1dabc96854
--- /dev/null
+++ b/data/styles/clear/style-night/hdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-hw-thin-scaled.png b/data/styles/clear/style-night/mdpi/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..620b8561ab
--- /dev/null
+++ b/data/styles/clear/style-night/mdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-hw-thin.png b/data/styles/clear/style-night/mdpi/shield-us-hw-thin.png
new file mode 100644
index 0000000000..d7458aaca8
--- /dev/null
+++ b/data/styles/clear/style-night/mdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-hw-wide-scaled.png b/data/styles/clear/style-night/mdpi/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..96307978c6
--- /dev/null
+++ b/data/styles/clear/style-night/mdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-hw-wide.png b/data/styles/clear/style-night/mdpi/shield-us-hw-wide.png
new file mode 100644
index 0000000000..d3dedf062c
--- /dev/null
+++ b/data/styles/clear/style-night/mdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-i-thin-scaled.png b/data/styles/clear/style-night/mdpi/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..524602266c
--- /dev/null
+++ b/data/styles/clear/style-night/mdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-i-thin.png b/data/styles/clear/style-night/mdpi/shield-us-i-thin.png
new file mode 100644
index 0000000000..51c8b323a7
--- /dev/null
+++ b/data/styles/clear/style-night/mdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-i-wide-scaled.png b/data/styles/clear/style-night/mdpi/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..2132d2ec9a
--- /dev/null
+++ b/data/styles/clear/style-night/mdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-night/mdpi/shield-us-i-wide.png b/data/styles/clear/style-night/mdpi/shield-us-i-wide.png
new file mode 100644
index 0000000000..fabc87a056
--- /dev/null
+++ b/data/styles/clear/style-night/mdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-hw-thin-scaled.png b/data/styles/clear/style-night/xhdpi/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..037105428a
--- /dev/null
+++ b/data/styles/clear/style-night/xhdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-hw-thin.png b/data/styles/clear/style-night/xhdpi/shield-us-hw-thin.png
new file mode 100644
index 0000000000..9817377ddc
--- /dev/null
+++ b/data/styles/clear/style-night/xhdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-hw-wide-scaled.png b/data/styles/clear/style-night/xhdpi/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..171944c1b5
--- /dev/null
+++ b/data/styles/clear/style-night/xhdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-hw-wide.png b/data/styles/clear/style-night/xhdpi/shield-us-hw-wide.png
new file mode 100644
index 0000000000..9cd13ee2f6
--- /dev/null
+++ b/data/styles/clear/style-night/xhdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-i-thin-scaled.png b/data/styles/clear/style-night/xhdpi/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..1c5e864e2e
--- /dev/null
+++ b/data/styles/clear/style-night/xhdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-i-thin.png b/data/styles/clear/style-night/xhdpi/shield-us-i-thin.png
new file mode 100644
index 0000000000..0b2581d742
--- /dev/null
+++ b/data/styles/clear/style-night/xhdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-i-wide-scaled.png b/data/styles/clear/style-night/xhdpi/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..ecc1979fbb
--- /dev/null
+++ b/data/styles/clear/style-night/xhdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-night/xhdpi/shield-us-i-wide.png b/data/styles/clear/style-night/xhdpi/shield-us-i-wide.png
new file mode 100644
index 0000000000..5649aa5daa
--- /dev/null
+++ b/data/styles/clear/style-night/xhdpi/shield-us-i-wide.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-hw-thin-scaled.png b/data/styles/clear/style-night/xxhdpi/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..b84c4a4043
--- /dev/null
+++ b/data/styles/clear/style-night/xxhdpi/shield-us-hw-thin-scaled.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-hw-thin.png b/data/styles/clear/style-night/xxhdpi/shield-us-hw-thin.png
new file mode 100644
index 0000000000..606cfeb01f
--- /dev/null
+++ b/data/styles/clear/style-night/xxhdpi/shield-us-hw-thin.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-hw-wide-scaled.png b/data/styles/clear/style-night/xxhdpi/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..40290ef0a5
--- /dev/null
+++ b/data/styles/clear/style-night/xxhdpi/shield-us-hw-wide-scaled.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-hw-wide.png b/data/styles/clear/style-night/xxhdpi/shield-us-hw-wide.png
new file mode 100644
index 0000000000..d00b341fe8
--- /dev/null
+++ b/data/styles/clear/style-night/xxhdpi/shield-us-hw-wide.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-i-thin-scaled.png b/data/styles/clear/style-night/xxhdpi/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..abf541096c
--- /dev/null
+++ b/data/styles/clear/style-night/xxhdpi/shield-us-i-thin-scaled.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-i-thin.png b/data/styles/clear/style-night/xxhdpi/shield-us-i-thin.png
new file mode 100644
index 0000000000..28d0c4c9cd
--- /dev/null
+++ b/data/styles/clear/style-night/xxhdpi/shield-us-i-thin.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-i-wide-scaled.png b/data/styles/clear/style-night/xxhdpi/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..7c64ec16e1
--- /dev/null
+++ b/data/styles/clear/style-night/xxhdpi/shield-us-i-wide-scaled.png
diff --git a/data/styles/clear/style-night/xxhdpi/shield-us-i-wide.png b/data/styles/clear/style-night/xxhdpi/shield-us-i-wide.png
new file mode 100644
index 0000000000..2c9c65130f
--- /dev/null
+++ b/data/styles/clear/style-night/xxhdpi/shield-us-i-wide.png