diff --git a/data/styles/default/dark/6plus/shield-us-hw-thin-scaled.png b/data/styles/default/dark/6plus/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 50fdac5a1..000000000
Binary files a/data/styles/default/dark/6plus/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/6plus/shield-us-hw-thin.png b/data/styles/default/dark/6plus/shield-us-hw-thin.png
deleted file mode 100644
index 728771aad..000000000
Binary files a/data/styles/default/dark/6plus/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/6plus/shield-us-hw-wide-scaled.png b/data/styles/default/dark/6plus/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 1ac895dbd..000000000
Binary files a/data/styles/default/dark/6plus/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/6plus/shield-us-hw-wide.png b/data/styles/default/dark/6plus/shield-us-hw-wide.png
deleted file mode 100644
index 411b186bb..000000000
Binary files a/data/styles/default/dark/6plus/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/dark/6plus/shield-us-i-thin-scaled.png b/data/styles/default/dark/6plus/shield-us-i-thin-scaled.png
deleted file mode 100644
index 53966ce78..000000000
Binary files a/data/styles/default/dark/6plus/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/6plus/shield-us-i-thin.png b/data/styles/default/dark/6plus/shield-us-i-thin.png
deleted file mode 100644
index 7836e351d..000000000
Binary files a/data/styles/default/dark/6plus/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/6plus/shield-us-i-wide-scaled.png b/data/styles/default/dark/6plus/shield-us-i-wide-scaled.png
deleted file mode 100644
index d4b227ce3..000000000
Binary files a/data/styles/default/dark/6plus/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/6plus/shield-us-i-wide.png b/data/styles/default/dark/6plus/shield-us-i-wide.png
deleted file mode 100644
index a9caec586..000000000
Binary files a/data/styles/default/dark/6plus/shield-us-i-wide.png and /dev/null differ
diff --git a/data/styles/default/dark/hdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/hdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index d33950c8a..000000000
Binary files a/data/styles/default/dark/hdpi/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/hdpi/shield-us-hw-thin.png b/data/styles/default/dark/hdpi/shield-us-hw-thin.png
deleted file mode 100644
index 8e0dea3ce..000000000
Binary files a/data/styles/default/dark/hdpi/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/hdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/hdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 1b955306e..000000000
Binary files a/data/styles/default/dark/hdpi/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/hdpi/shield-us-hw-wide.png b/data/styles/default/dark/hdpi/shield-us-hw-wide.png
deleted file mode 100644
index ae80bfb37..000000000
Binary files a/data/styles/default/dark/hdpi/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/dark/hdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/hdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 08cb51197..000000000
Binary files a/data/styles/default/dark/hdpi/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/hdpi/shield-us-i-thin.png b/data/styles/default/dark/hdpi/shield-us-i-thin.png
deleted file mode 100644
index ce8514d15..000000000
Binary files a/data/styles/default/dark/hdpi/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/hdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/hdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index e81c362a8..000000000
Binary files a/data/styles/default/dark/hdpi/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/hdpi/shield-us-i-wide.png b/data/styles/default/dark/hdpi/shield-us-i-wide.png
deleted file mode 100644
index d1090d2f1..000000000
Binary files a/data/styles/default/dark/hdpi/shield-us-i-wide.png and /dev/null differ
diff --git a/data/styles/default/dark/mdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/mdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index b0d8e9e88..000000000
Binary files a/data/styles/default/dark/mdpi/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/mdpi/shield-us-hw-thin.png b/data/styles/default/dark/mdpi/shield-us-hw-thin.png
deleted file mode 100644
index 8095ca713..000000000
Binary files a/data/styles/default/dark/mdpi/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/mdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/mdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index f7735fb05..000000000
Binary files a/data/styles/default/dark/mdpi/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/mdpi/shield-us-hw-wide.png b/data/styles/default/dark/mdpi/shield-us-hw-wide.png
deleted file mode 100644
index 5203f7df7..000000000
Binary files a/data/styles/default/dark/mdpi/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/dark/mdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/mdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 9fedc9e63..000000000
Binary files a/data/styles/default/dark/mdpi/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/mdpi/shield-us-i-thin.png b/data/styles/default/dark/mdpi/shield-us-i-thin.png
deleted file mode 100644
index 64919699b..000000000
Binary files a/data/styles/default/dark/mdpi/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/mdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/mdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 20aa79514..000000000
Binary files a/data/styles/default/dark/mdpi/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/mdpi/shield-us-i-wide.png b/data/styles/default/dark/mdpi/shield-us-i-wide.png
deleted file mode 100644
index 849721be9..000000000
Binary files a/data/styles/default/dark/mdpi/shield-us-i-wide.png and /dev/null differ
diff --git a/data/styles/default/dark/symbols/shield-us-hw-thin-scaled.svg b/data/styles/default/dark/symbols/shield-us-hw-thin-scaled.svg
new file mode 100644
index 000000000..afe6665d6
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-hw-thin-scaled.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="34" version="1.1" viewBox="0 0 32 34" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m23.352 28.025h1.2124c2.0083 0 4.7321-1.7221 5.4357-6.1088 0.18811-1.1729-0.2779-2.3335-0.7569-3.3388-2.2037-3.9859-1.6898-6.826 0.75688-9.3417l-5.5517-5.1815c-1.1376 0.96915-2.6125 1.9581-4.2241 1.9581-1.6116 0-3.0865-0.98877-4.2241-1.9579-1.1376 0.96915-2.6126 1.9579-4.2241 1.9579-1.6116 0-3.0865-0.98891-4.2241-1.9581l-5.5517 5.1815c2.4467 2.5157 2.9606 5.3558 0.75688 9.3417-0.47901 1.0054-0.94501 2.166-0.7569 3.3388 0.70353 4.3866 3.4274 6.1088 5.4357 6.1088h1.2124c2.751 0 6.157 2.5565 7.352 4.0292 1.1949-1.4726 4.601-4.0292 7.352-4.0292z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-hw-thin.svg b/data/styles/default/dark/symbols/shield-us-hw-thin.svg
new file mode 100644
index 000000000..1c7b49709
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-hw-thin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" viewBox="0 0 22 22" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m16.251 18.122h0.866c1.4345 0 3.3801-1.2301 3.8827-4.3634 0.13436-0.83776-0.1985-1.6668-0.54065-2.3849-1.5741-2.8471-1.207-4.8757 0.54063-6.6727l-3.9656-3.7011c-0.81257 0.69225-1.8661 1.3986-3.0173 1.3986-1.1511 0-2.2047-0.70626-3.0173-1.3985-0.81258 0.69225-1.8661 1.3985-3.0173 1.3985-1.1512 0-2.2047-0.70637-3.0173-1.3986l-3.9656 3.7011c1.7477 1.797 2.1147 3.8256 0.54063 6.6727-0.34215 0.71812-0.67502 1.5471-0.54065 2.3849 0.50253 3.1333 2.4482 4.3634 3.8827 4.3634h0.866c1.965 0 4.3979 1.8261 5.2515 2.878 0.85351-1.0519 3.2865-2.878 5.2515-2.878z" fill="#fff"  stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-hw-wide-scaled.svg b/data/styles/default/dark/symbols/shield-us-hw-wide-scaled.svg
new file mode 100644
index 000000000..333621d3e
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-hw-wide-scaled.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38" height="36" version="1.1" viewBox="0 0 38 36" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m28.184 27.981h3.0171c2.5736 0 4.8382-1.1324 5.7397-5.8296 0.24107-1.256-0.35613-2.8114-0.96996-3.8879-1.9251-4.1295-1.7287-6.2256 0.96993-8.9869l-5.5484-5.5485c-1.4579 1.0378-4.1231 2.0967-6.1883 2.0967-2.0654 0-4.7464-1.0588-6.2043-2.0966-1.4578 1.0378-4.1389 2.0966-6.2043 2.0966s-4.7305-1.059-6.1883-2.0967l-5.5484 5.5485c2.6987 2.7613 2.8951 4.8573 0.96993 8.9869-0.61383 1.0766-1.211 2.6319-0.96996 3.8879 0.90157 4.6973 3.1661 5.8296 5.7397 5.8296h3.0171c4.6277 0 7.7718 2.6339 9.1843 4.2476 1.4123-1.6137 4.5564-4.2476 9.1843-4.2476z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-hw-wide.svg b/data/styles/default/dark/symbols/shield-us-hw-wide.svg
new file mode 100644
index 000000000..f0a81e015
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-hw-wide.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="22" version="1.1" viewBox="0 0 26 22" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.14 18.386h2.0171c1.7206 0 3.2346-1.2565 3.8373-4.3898 0.16117-0.8378-0.23809-1.9048-0.64847-2.6229-1.287-2.7546-1.1557-4.8308 0.64845-6.6727l-3.7094-3.7011c-0.97466 0.69223-2.7565 1.3986-4.1372 1.3986-1.3808 0-3.1732-0.70625-4.1479-1.3985-0.97463 0.69225-2.7671 1.3985-4.1479 1.3985-1.3808 0-3.1626-0.70637-4.1372-1.3986l-3.7094 3.7011c1.8042 1.8419 1.9355 3.9181 0.64845 6.6727-0.41038 0.71812-0.80964 1.7851-0.64847 2.6229 0.60275 3.1333 2.1167 4.3898 3.8373 4.3898h2.0171c3.0939 0 5.1959 1.9338 6.1402 3.0102 0.94423-1.0764 3.0462-3.0102 6.1402-3.0102z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-i-thin-scaled.svg b/data/styles/default/dark/symbols/shield-us-i-thin-scaled.svg
new file mode 100644
index 000000000..da8ffff67
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-i-thin-scaled.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="38" version="1.1" viewBox="0 0 32 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m27.207 2.2188c-4.0645 2.9696-7.7279 2.9381-11.207 0-3.4792 2.9381-7.1426 2.9696-11.207 0-10.667 19.377 6.606 27.386 11.207 29.168 4.601-1.7815 21.874-9.7912 11.207-29.168z" fill="#fff" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m29.865 11.066h-27.73c-0.82801 5.1038 0.63161 9.0262 2.9336 12.031 3.4003 4.4387 8.6031 6.8182 10.932 7.7324 2.3285-0.91421 7.5314-3.2937 10.932-7.7324 2.302-3.005 3.7616-6.9275 2.9336-12.031z" fill="#264d99"/>
+ <path d="m29.447 9.1016h-26.895c-0.17704 0.67316-0.31479 1.3289-0.41797 1.9648h27.73c-0.10318-0.63599-0.24093-1.2917-0.41797-1.9648z" fill="#fff"/>
+ <path d="m16 2.8027c-1.7118 1.3573-3.5069 2.1269-5.3828 2.1309-1.8173 0.0038602-3.6786-0.73196-5.5781-2.0078-1.1776 2.2172-1.9855 4.2716-2.4863 6.1758h26.895c-0.50081-1.9042-1.3088-3.9586-2.4863-6.1758-1.8995 1.2758-3.7608 2.0117-5.5781 2.0078-1.876-0.0039847-3.671-0.77359-5.3828-2.1309z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-i-thin.svg b/data/styles/default/dark/symbols/shield-us-i-thin.svg
new file mode 100644
index 000000000..130627eca
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-i-thin.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20" height="24" version="1.1" viewBox="0 0 20 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.7073 0.49998c2.6448 1.931 5.0287 1.9106 7.2927 0 2.264 1.9106 4.6479 1.931 7.2927 0 6.9413 12.6-4.345 20.061-7.2927 20.061s-14.234-7.4606-7.2927-20.061z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m1.1992 6.2539c-0.32837 1.9515-0.19224 3.7081 0.24609 5.2676 0.36189 1.2875 0.93041 2.4406 1.6152 3.4551 1.1184 1.6567 2.5427 2.9422 3.8555 3.8047s2.558 1.2793 3.084 1.2793c0.52603 0 1.7712-0.41676 3.084-1.2793 1.3128-0.86254 2.7371-2.148 3.8555-3.8047 0.68352-1.0125 1.2513-2.1627 1.6133-3.4473 0.43999-1.5614 0.57693-3.3208 0.24805-5.2754z" fill="#264d99"/>
+ <path d="m1.4766 4.9766c-0.11406 0.4346-0.20717 0.86037-0.27734 1.2773h17.602c-0.07017-0.41697-0.16328-0.84274-0.27734-1.2773z" fill="#fff"/>
+ <path d="m1.4766 4.9766h17.047c-0.31246-1.1906-0.79469-2.448-1.4805-3.7695-1.1938 0.76436-2.3767 1.2368-3.541 1.2344-1.2254-0.0025941-2.3947-0.50897-3.502-1.3574-1.1072 0.84845-2.2765 1.3548-3.502 1.3574-1.1643 0.0024645-2.3472-0.47002-3.541-1.2344-0.68578 1.3216-1.168 2.579-1.4805 3.7695z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-i-wide-scaled.svg b/data/styles/default/dark/symbols/shield-us-i-wide-scaled.svg
new file mode 100644
index 000000000..68a012aa2
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-i-wide-scaled.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38" height="38" version="1.1" viewBox="0 0 38 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m32.165 3.2188c-4.0644 2.9696-9.6859 2.9381-13.165 0-3.4792 2.9381-9.1007 2.9696-13.165 0-13.549 19.268 8.408 27.549 13.165 29.168 4.7571-1.6188 26.714-9.8998 13.165-29.168z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m35.729 12.066h-33.457c-0.25961 1.2661-0.3382 2.4579-0.26562 3.5781 0.2187 3.3758 1.7734 6.1552 3.9121 8.4355 4.2193 4.4988 10.647 6.9304 13.082 7.7656 2.4354-0.83519 8.8628-3.2668 13.082-7.7656 2.1387-2.2804 3.6934-5.0598 3.9121-8.4355 0.07257-1.1202-6e-3 -2.312-0.26562-3.5781z" fill="#264d99"/>
+ <path d="m35.197 10.102h-32.395c-0.22548 0.67392-0.40083 1.3288-0.53125 1.9648h33.457c-0.13042-0.63606-0.30577-1.2909-0.53125-1.9648z" fill="#fff"/>
+ <path d="m19 3.7832c-3.5595 2.7678-8.8923 2.7892-12.979 0.083984-1.5317 2.2386-2.5762 4.314-3.2188 6.2344h32.395c-0.64252-1.9203-1.6871-3.9958-3.2188-6.2344-4.0862 2.7052-9.419 2.6838-12.979-0.083984z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-i-wide.svg b/data/styles/default/dark/symbols/shield-us-i-wide.svg
new file mode 100644
index 000000000..b4f483961
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-i-wide.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="24" version="1.1" viewBox="0 0 26 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m23.743 0.50389c-3.4789 1.931-7.7645 1.9106-10.743 0-2.978 1.9106-7.2636 1.931-10.743 0-6.536 13.842 6.8802 20.065 10.743 20.061 3.8623 0.0036 17.278-6.2194 10.743-20.061z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m24.895 6.2578h-23.789c-0.43961 3.9187 0.95508 6.9145 2.9922 9.1309 1.4561 1.5842 3.2403 2.7617 4.8887 3.5371 1.6483 0.77545 3.1826 1.1394 4.0137 1.1387 0.83105 7.75e-4 2.3653-0.36322 4.0137-1.1387 1.6483-0.77545 3.4325-1.9529 4.8887-3.5371 2.0371-2.2163 3.4318-5.2122 2.9922-9.1309z" fill="#264d99"/>
+ <path d="m24.691 4.9805h-23.383c-0.089219 0.43625-0.15653 0.862-0.20312 1.2773h23.789c-0.046594-0.41534-0.11391-0.8411-0.20312-1.2773z" fill="#fff"/>
+ <path d="m13 1.043c-2.9868 1.779-7.0035 1.8031-10.436 0.11719-0.60272 1.3546-1.0118 2.6269-1.2559 3.8203h23.383c-0.24407-1.1934-0.65314-2.4657-1.2559-3.8203-3.432 1.6859-7.4487 1.6618-10.436-0.11719z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/dark/xhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/xhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 476a82b02..000000000
Binary files a/data/styles/default/dark/xhdpi/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xhdpi/shield-us-hw-thin.png b/data/styles/default/dark/xhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 561520186..000000000
Binary files a/data/styles/default/dark/xhdpi/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/xhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/xhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index e2c63033f..000000000
Binary files a/data/styles/default/dark/xhdpi/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xhdpi/shield-us-hw-wide.png b/data/styles/default/dark/xhdpi/shield-us-hw-wide.png
deleted file mode 100644
index 85631ddb3..000000000
Binary files a/data/styles/default/dark/xhdpi/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/dark/xhdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/xhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 87a595b93..000000000
Binary files a/data/styles/default/dark/xhdpi/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xhdpi/shield-us-i-thin.png b/data/styles/default/dark/xhdpi/shield-us-i-thin.png
deleted file mode 100644
index 76a9d92c0..000000000
Binary files a/data/styles/default/dark/xhdpi/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/xhdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/xhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 9cb16fb2e..000000000
Binary files a/data/styles/default/dark/xhdpi/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xhdpi/shield-us-i-wide.png b/data/styles/default/dark/xhdpi/shield-us-i-wide.png
deleted file mode 100644
index 0ca980c4b..000000000
Binary files a/data/styles/default/dark/xhdpi/shield-us-i-wide.png and /dev/null differ
diff --git a/data/styles/default/dark/xxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index d5aeb5039..000000000
Binary files a/data/styles/default/dark/xxhdpi/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xxhdpi/shield-us-hw-thin.png b/data/styles/default/dark/xxhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 63076af0c..000000000
Binary files a/data/styles/default/dark/xxhdpi/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/xxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 4eae04c82..000000000
Binary files a/data/styles/default/dark/xxhdpi/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xxhdpi/shield-us-hw-wide.png b/data/styles/default/dark/xxhdpi/shield-us-hw-wide.png
deleted file mode 100644
index c437a3873..000000000
Binary files a/data/styles/default/dark/xxhdpi/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/dark/xxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 83b3f80d4..000000000
Binary files a/data/styles/default/dark/xxhdpi/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xxhdpi/shield-us-i-thin.png b/data/styles/default/dark/xxhdpi/shield-us-i-thin.png
deleted file mode 100644
index f6b6bff33..000000000
Binary files a/data/styles/default/dark/xxhdpi/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/xxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 3f1da7c04..000000000
Binary files a/data/styles/default/dark/xxhdpi/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xxhdpi/shield-us-i-wide.png b/data/styles/default/dark/xxhdpi/shield-us-i-wide.png
deleted file mode 100644
index c3ac7ee78..000000000
Binary files a/data/styles/default/dark/xxhdpi/shield-us-i-wide.png and /dev/null differ
diff --git a/data/styles/default/dark/xxxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 8281311b1..000000000
Binary files a/data/styles/default/dark/xxxhdpi/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xxxhdpi/shield-us-hw-thin.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 361ace4af..000000000
Binary files a/data/styles/default/dark/xxxhdpi/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/xxxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index c63dd2795..000000000
Binary files a/data/styles/default/dark/xxxhdpi/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xxxhdpi/shield-us-hw-wide.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-wide.png
deleted file mode 100644
index e4c10d8e4..000000000
Binary files a/data/styles/default/dark/xxxhdpi/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/dark/xxxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 23662ab86..000000000
Binary files a/data/styles/default/dark/xxxhdpi/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xxxhdpi/shield-us-i-thin.png b/data/styles/default/dark/xxxhdpi/shield-us-i-thin.png
deleted file mode 100644
index e738c6d78..000000000
Binary files a/data/styles/default/dark/xxxhdpi/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/dark/xxxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 05c2982ad..000000000
Binary files a/data/styles/default/dark/xxxhdpi/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/dark/xxxhdpi/shield-us-i-wide.png b/data/styles/default/dark/xxxhdpi/shield-us-i-wide.png
deleted file mode 100644
index 13bcafe3b..000000000
Binary files a/data/styles/default/dark/xxxhdpi/shield-us-i-wide.png and /dev/null differ
diff --git a/data/styles/default/light/6plus/shield-us-hw-thin-scaled.png b/data/styles/default/light/6plus/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 653567bf1..000000000
Binary files a/data/styles/default/light/6plus/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/6plus/shield-us-hw-thin.png b/data/styles/default/light/6plus/shield-us-hw-thin.png
deleted file mode 100644
index 9bc46df56..000000000
Binary files a/data/styles/default/light/6plus/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/light/6plus/shield-us-hw-wide-scaled.png b/data/styles/default/light/6plus/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 23c785f19..000000000
Binary files a/data/styles/default/light/6plus/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/6plus/shield-us-hw-wide.png b/data/styles/default/light/6plus/shield-us-hw-wide.png
deleted file mode 100644
index fa48dd9c9..000000000
Binary files a/data/styles/default/light/6plus/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/light/6plus/shield-us-i-thin-scaled.png b/data/styles/default/light/6plus/shield-us-i-thin-scaled.png
deleted file mode 100644
index 53966ce78..000000000
Binary files a/data/styles/default/light/6plus/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/6plus/shield-us-i-thin.png b/data/styles/default/light/6plus/shield-us-i-thin.png
deleted file mode 100644
index 7836e351d..000000000
Binary files a/data/styles/default/light/6plus/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/light/6plus/shield-us-i-wide-scaled.png b/data/styles/default/light/6plus/shield-us-i-wide-scaled.png
deleted file mode 100644
index d4b227ce3..000000000
Binary files a/data/styles/default/light/6plus/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/6plus/shield-us-i-wide.png b/data/styles/default/light/6plus/shield-us-i-wide.png
deleted file mode 100644
index a9caec586..000000000
Binary files a/data/styles/default/light/6plus/shield-us-i-wide.png and /dev/null differ
diff --git a/data/styles/default/light/hdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/hdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index d33950c8a..000000000
Binary files a/data/styles/default/light/hdpi/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/hdpi/shield-us-hw-thin.png b/data/styles/default/light/hdpi/shield-us-hw-thin.png
deleted file mode 100644
index 8e0dea3ce..000000000
Binary files a/data/styles/default/light/hdpi/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/light/hdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/hdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 1b955306e..000000000
Binary files a/data/styles/default/light/hdpi/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/hdpi/shield-us-hw-wide.png b/data/styles/default/light/hdpi/shield-us-hw-wide.png
deleted file mode 100644
index ae80bfb37..000000000
Binary files a/data/styles/default/light/hdpi/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/light/hdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/hdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 08cb51197..000000000
Binary files a/data/styles/default/light/hdpi/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/hdpi/shield-us-i-thin.png b/data/styles/default/light/hdpi/shield-us-i-thin.png
deleted file mode 100644
index ce8514d15..000000000
Binary files a/data/styles/default/light/hdpi/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/light/hdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/hdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index e81c362a8..000000000
Binary files a/data/styles/default/light/hdpi/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/hdpi/shield-us-i-wide.png b/data/styles/default/light/hdpi/shield-us-i-wide.png
deleted file mode 100644
index d1090d2f1..000000000
Binary files a/data/styles/default/light/hdpi/shield-us-i-wide.png and /dev/null differ
diff --git a/data/styles/default/light/mdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/mdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index b0d8e9e88..000000000
Binary files a/data/styles/default/light/mdpi/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/mdpi/shield-us-hw-thin.png b/data/styles/default/light/mdpi/shield-us-hw-thin.png
deleted file mode 100644
index 8095ca713..000000000
Binary files a/data/styles/default/light/mdpi/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/light/mdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/mdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index f7735fb05..000000000
Binary files a/data/styles/default/light/mdpi/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/mdpi/shield-us-hw-wide.png b/data/styles/default/light/mdpi/shield-us-hw-wide.png
deleted file mode 100644
index 5203f7df7..000000000
Binary files a/data/styles/default/light/mdpi/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/light/mdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/mdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 9fedc9e63..000000000
Binary files a/data/styles/default/light/mdpi/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/mdpi/shield-us-i-thin.png b/data/styles/default/light/mdpi/shield-us-i-thin.png
deleted file mode 100644
index 64919699b..000000000
Binary files a/data/styles/default/light/mdpi/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/light/mdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/mdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 20aa79514..000000000
Binary files a/data/styles/default/light/mdpi/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/mdpi/shield-us-i-wide.png b/data/styles/default/light/mdpi/shield-us-i-wide.png
deleted file mode 100644
index 849721be9..000000000
Binary files a/data/styles/default/light/mdpi/shield-us-i-wide.png and /dev/null differ
diff --git a/data/styles/default/light/symbols/shield-us-hw-thin-scaled.svg b/data/styles/default/light/symbols/shield-us-hw-thin-scaled.svg
new file mode 100644
index 000000000..afe6665d6
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-hw-thin-scaled.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="34" version="1.1" viewBox="0 0 32 34" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m23.352 28.025h1.2124c2.0083 0 4.7321-1.7221 5.4357-6.1088 0.18811-1.1729-0.2779-2.3335-0.7569-3.3388-2.2037-3.9859-1.6898-6.826 0.75688-9.3417l-5.5517-5.1815c-1.1376 0.96915-2.6125 1.9581-4.2241 1.9581-1.6116 0-3.0865-0.98877-4.2241-1.9579-1.1376 0.96915-2.6126 1.9579-4.2241 1.9579-1.6116 0-3.0865-0.98891-4.2241-1.9581l-5.5517 5.1815c2.4467 2.5157 2.9606 5.3558 0.75688 9.3417-0.47901 1.0054-0.94501 2.166-0.7569 3.3388 0.70353 4.3866 3.4274 6.1088 5.4357 6.1088h1.2124c2.751 0 6.157 2.5565 7.352 4.0292 1.1949-1.4726 4.601-4.0292 7.352-4.0292z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-hw-thin.svg b/data/styles/default/light/symbols/shield-us-hw-thin.svg
new file mode 100644
index 000000000..1c7b49709
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-hw-thin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" viewBox="0 0 22 22" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m16.251 18.122h0.866c1.4345 0 3.3801-1.2301 3.8827-4.3634 0.13436-0.83776-0.1985-1.6668-0.54065-2.3849-1.5741-2.8471-1.207-4.8757 0.54063-6.6727l-3.9656-3.7011c-0.81257 0.69225-1.8661 1.3986-3.0173 1.3986-1.1511 0-2.2047-0.70626-3.0173-1.3985-0.81258 0.69225-1.8661 1.3985-3.0173 1.3985-1.1512 0-2.2047-0.70637-3.0173-1.3986l-3.9656 3.7011c1.7477 1.797 2.1147 3.8256 0.54063 6.6727-0.34215 0.71812-0.67502 1.5471-0.54065 2.3849 0.50253 3.1333 2.4482 4.3634 3.8827 4.3634h0.866c1.965 0 4.3979 1.8261 5.2515 2.878 0.85351-1.0519 3.2865-2.878 5.2515-2.878z" fill="#fff"  stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-hw-wide-scaled.svg b/data/styles/default/light/symbols/shield-us-hw-wide-scaled.svg
new file mode 100644
index 000000000..333621d3e
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-hw-wide-scaled.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38" height="36" version="1.1" viewBox="0 0 38 36" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m28.184 27.981h3.0171c2.5736 0 4.8382-1.1324 5.7397-5.8296 0.24107-1.256-0.35613-2.8114-0.96996-3.8879-1.9251-4.1295-1.7287-6.2256 0.96993-8.9869l-5.5484-5.5485c-1.4579 1.0378-4.1231 2.0967-6.1883 2.0967-2.0654 0-4.7464-1.0588-6.2043-2.0966-1.4578 1.0378-4.1389 2.0966-6.2043 2.0966s-4.7305-1.059-6.1883-2.0967l-5.5484 5.5485c2.6987 2.7613 2.8951 4.8573 0.96993 8.9869-0.61383 1.0766-1.211 2.6319-0.96996 3.8879 0.90157 4.6973 3.1661 5.8296 5.7397 5.8296h3.0171c4.6277 0 7.7718 2.6339 9.1843 4.2476 1.4123-1.6137 4.5564-4.2476 9.1843-4.2476z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-hw-wide.svg b/data/styles/default/light/symbols/shield-us-hw-wide.svg
new file mode 100644
index 000000000..f0a81e015
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-hw-wide.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="22" version="1.1" viewBox="0 0 26 22" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.14 18.386h2.0171c1.7206 0 3.2346-1.2565 3.8373-4.3898 0.16117-0.8378-0.23809-1.9048-0.64847-2.6229-1.287-2.7546-1.1557-4.8308 0.64845-6.6727l-3.7094-3.7011c-0.97466 0.69223-2.7565 1.3986-4.1372 1.3986-1.3808 0-3.1732-0.70625-4.1479-1.3985-0.97463 0.69225-2.7671 1.3985-4.1479 1.3985-1.3808 0-3.1626-0.70637-4.1372-1.3986l-3.7094 3.7011c1.8042 1.8419 1.9355 3.9181 0.64845 6.6727-0.41038 0.71812-0.80964 1.7851-0.64847 2.6229 0.60275 3.1333 2.1167 4.3898 3.8373 4.3898h2.0171c3.0939 0 5.1959 1.9338 6.1402 3.0102 0.94423-1.0764 3.0462-3.0102 6.1402-3.0102z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-i-thin-scaled.svg b/data/styles/default/light/symbols/shield-us-i-thin-scaled.svg
new file mode 100644
index 000000000..da8ffff67
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-i-thin-scaled.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="38" version="1.1" viewBox="0 0 32 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m27.207 2.2188c-4.0645 2.9696-7.7279 2.9381-11.207 0-3.4792 2.9381-7.1426 2.9696-11.207 0-10.667 19.377 6.606 27.386 11.207 29.168 4.601-1.7815 21.874-9.7912 11.207-29.168z" fill="#fff" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m29.865 11.066h-27.73c-0.82801 5.1038 0.63161 9.0262 2.9336 12.031 3.4003 4.4387 8.6031 6.8182 10.932 7.7324 2.3285-0.91421 7.5314-3.2937 10.932-7.7324 2.302-3.005 3.7616-6.9275 2.9336-12.031z" fill="#264d99"/>
+ <path d="m29.447 9.1016h-26.895c-0.17704 0.67316-0.31479 1.3289-0.41797 1.9648h27.73c-0.10318-0.63599-0.24093-1.2917-0.41797-1.9648z" fill="#fff"/>
+ <path d="m16 2.8027c-1.7118 1.3573-3.5069 2.1269-5.3828 2.1309-1.8173 0.0038602-3.6786-0.73196-5.5781-2.0078-1.1776 2.2172-1.9855 4.2716-2.4863 6.1758h26.895c-0.50081-1.9042-1.3088-3.9586-2.4863-6.1758-1.8995 1.2758-3.7608 2.0117-5.5781 2.0078-1.876-0.0039847-3.671-0.77359-5.3828-2.1309z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-i-thin.svg b/data/styles/default/light/symbols/shield-us-i-thin.svg
new file mode 100644
index 000000000..130627eca
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-i-thin.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20" height="24" version="1.1" viewBox="0 0 20 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.7073 0.49998c2.6448 1.931 5.0287 1.9106 7.2927 0 2.264 1.9106 4.6479 1.931 7.2927 0 6.9413 12.6-4.345 20.061-7.2927 20.061s-14.234-7.4606-7.2927-20.061z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m1.1992 6.2539c-0.32837 1.9515-0.19224 3.7081 0.24609 5.2676 0.36189 1.2875 0.93041 2.4406 1.6152 3.4551 1.1184 1.6567 2.5427 2.9422 3.8555 3.8047s2.558 1.2793 3.084 1.2793c0.52603 0 1.7712-0.41676 3.084-1.2793 1.3128-0.86254 2.7371-2.148 3.8555-3.8047 0.68352-1.0125 1.2513-2.1627 1.6133-3.4473 0.43999-1.5614 0.57693-3.3208 0.24805-5.2754z" fill="#264d99"/>
+ <path d="m1.4766 4.9766c-0.11406 0.4346-0.20717 0.86037-0.27734 1.2773h17.602c-0.07017-0.41697-0.16328-0.84274-0.27734-1.2773z" fill="#fff"/>
+ <path d="m1.4766 4.9766h17.047c-0.31246-1.1906-0.79469-2.448-1.4805-3.7695-1.1938 0.76436-2.3767 1.2368-3.541 1.2344-1.2254-0.0025941-2.3947-0.50897-3.502-1.3574-1.1072 0.84845-2.2765 1.3548-3.502 1.3574-1.1643 0.0024645-2.3472-0.47002-3.541-1.2344-0.68578 1.3216-1.168 2.579-1.4805 3.7695z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-i-wide-scaled.svg b/data/styles/default/light/symbols/shield-us-i-wide-scaled.svg
new file mode 100644
index 000000000..68a012aa2
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-i-wide-scaled.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38" height="38" version="1.1" viewBox="0 0 38 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m32.165 3.2188c-4.0644 2.9696-9.6859 2.9381-13.165 0-3.4792 2.9381-9.1007 2.9696-13.165 0-13.549 19.268 8.408 27.549 13.165 29.168 4.7571-1.6188 26.714-9.8998 13.165-29.168z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m35.729 12.066h-33.457c-0.25961 1.2661-0.3382 2.4579-0.26562 3.5781 0.2187 3.3758 1.7734 6.1552 3.9121 8.4355 4.2193 4.4988 10.647 6.9304 13.082 7.7656 2.4354-0.83519 8.8628-3.2668 13.082-7.7656 2.1387-2.2804 3.6934-5.0598 3.9121-8.4355 0.07257-1.1202-6e-3 -2.312-0.26562-3.5781z" fill="#264d99"/>
+ <path d="m35.197 10.102h-32.395c-0.22548 0.67392-0.40083 1.3288-0.53125 1.9648h33.457c-0.13042-0.63606-0.30577-1.2909-0.53125-1.9648z" fill="#fff"/>
+ <path d="m19 3.7832c-3.5595 2.7678-8.8923 2.7892-12.979 0.083984-1.5317 2.2386-2.5762 4.314-3.2188 6.2344h32.395c-0.64252-1.9203-1.6871-3.9958-3.2188-6.2344-4.0862 2.7052-9.419 2.6838-12.979-0.083984z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-i-wide.svg b/data/styles/default/light/symbols/shield-us-i-wide.svg
new file mode 100644
index 000000000..b4f483961
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-i-wide.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="24" version="1.1" viewBox="0 0 26 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m23.743 0.50389c-3.4789 1.931-7.7645 1.9106-10.743 0-2.978 1.9106-7.2636 1.931-10.743 0-6.536 13.842 6.8802 20.065 10.743 20.061 3.8623 0.0036 17.278-6.2194 10.743-20.061z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m24.895 6.2578h-23.789c-0.43961 3.9187 0.95508 6.9145 2.9922 9.1309 1.4561 1.5842 3.2403 2.7617 4.8887 3.5371 1.6483 0.77545 3.1826 1.1394 4.0137 1.1387 0.83105 7.75e-4 2.3653-0.36322 4.0137-1.1387 1.6483-0.77545 3.4325-1.9529 4.8887-3.5371 2.0371-2.2163 3.4318-5.2122 2.9922-9.1309z" fill="#264d99"/>
+ <path d="m24.691 4.9805h-23.383c-0.089219 0.43625-0.15653 0.862-0.20312 1.2773h23.789c-0.046594-0.41534-0.11391-0.8411-0.20312-1.2773z" fill="#fff"/>
+ <path d="m13 1.043c-2.9868 1.779-7.0035 1.8031-10.436 0.11719-0.60272 1.3546-1.0118 2.6269-1.2559 3.8203h23.383c-0.24407-1.1934-0.65314-2.4657-1.2559-3.8203-3.432 1.6859-7.4487 1.6618-10.436-0.11719z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/light/xhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/xhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 476a82b02..000000000
Binary files a/data/styles/default/light/xhdpi/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xhdpi/shield-us-hw-thin.png b/data/styles/default/light/xhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 561520186..000000000
Binary files a/data/styles/default/light/xhdpi/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/light/xhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/xhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index e2c63033f..000000000
Binary files a/data/styles/default/light/xhdpi/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xhdpi/shield-us-hw-wide.png b/data/styles/default/light/xhdpi/shield-us-hw-wide.png
deleted file mode 100644
index 85631ddb3..000000000
Binary files a/data/styles/default/light/xhdpi/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/light/xhdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/xhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 87a595b93..000000000
Binary files a/data/styles/default/light/xhdpi/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xhdpi/shield-us-i-thin.png b/data/styles/default/light/xhdpi/shield-us-i-thin.png
deleted file mode 100644
index 76a9d92c0..000000000
Binary files a/data/styles/default/light/xhdpi/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/light/xhdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/xhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 9cb16fb2e..000000000
Binary files a/data/styles/default/light/xhdpi/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xhdpi/shield-us-i-wide.png b/data/styles/default/light/xhdpi/shield-us-i-wide.png
deleted file mode 100644
index 0ca980c4b..000000000
Binary files a/data/styles/default/light/xhdpi/shield-us-i-wide.png and /dev/null differ
diff --git a/data/styles/default/light/xxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/xxhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index d5aeb5039..000000000
Binary files a/data/styles/default/light/xxhdpi/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xxhdpi/shield-us-hw-thin.png b/data/styles/default/light/xxhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 63076af0c..000000000
Binary files a/data/styles/default/light/xxhdpi/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/light/xxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/xxhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 4eae04c82..000000000
Binary files a/data/styles/default/light/xxhdpi/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xxhdpi/shield-us-hw-wide.png b/data/styles/default/light/xxhdpi/shield-us-hw-wide.png
deleted file mode 100644
index c437a3873..000000000
Binary files a/data/styles/default/light/xxhdpi/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/light/xxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/xxhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 83b3f80d4..000000000
Binary files a/data/styles/default/light/xxhdpi/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xxhdpi/shield-us-i-thin.png b/data/styles/default/light/xxhdpi/shield-us-i-thin.png
deleted file mode 100644
index f6b6bff33..000000000
Binary files a/data/styles/default/light/xxhdpi/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/light/xxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/xxhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 3f1da7c04..000000000
Binary files a/data/styles/default/light/xxhdpi/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xxhdpi/shield-us-i-wide.png b/data/styles/default/light/xxhdpi/shield-us-i-wide.png
deleted file mode 100644
index c3ac7ee78..000000000
Binary files a/data/styles/default/light/xxhdpi/shield-us-i-wide.png and /dev/null differ
diff --git a/data/styles/default/light/xxxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 8281311b1..000000000
Binary files a/data/styles/default/light/xxxhdpi/shield-us-hw-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xxxhdpi/shield-us-hw-thin.png b/data/styles/default/light/xxxhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 361ace4af..000000000
Binary files a/data/styles/default/light/xxxhdpi/shield-us-hw-thin.png and /dev/null differ
diff --git a/data/styles/default/light/xxxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index c63dd2795..000000000
Binary files a/data/styles/default/light/xxxhdpi/shield-us-hw-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xxxhdpi/shield-us-hw-wide.png b/data/styles/default/light/xxxhdpi/shield-us-hw-wide.png
deleted file mode 100644
index e4c10d8e4..000000000
Binary files a/data/styles/default/light/xxxhdpi/shield-us-hw-wide.png and /dev/null differ
diff --git a/data/styles/default/light/xxxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 23662ab86..000000000
Binary files a/data/styles/default/light/xxxhdpi/shield-us-i-thin-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xxxhdpi/shield-us-i-thin.png b/data/styles/default/light/xxxhdpi/shield-us-i-thin.png
deleted file mode 100644
index e738c6d78..000000000
Binary files a/data/styles/default/light/xxxhdpi/shield-us-i-thin.png and /dev/null differ
diff --git a/data/styles/default/light/xxxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 05c2982ad..000000000
Binary files a/data/styles/default/light/xxxhdpi/shield-us-i-wide-scaled.png and /dev/null differ
diff --git a/data/styles/default/light/xxxhdpi/shield-us-i-wide.png b/data/styles/default/light/xxxhdpi/shield-us-i-wide.png
deleted file mode 100644
index 13bcafe3b..000000000
Binary files a/data/styles/default/light/xxxhdpi/shield-us-i-wide.png and /dev/null differ