diff --git a/icons/shield_us_nht_oreg.svg b/icons/shield_us_nht_oreg.svg
index 8ae91012c..61434ae90 100644
--- a/icons/shield_us_nht_oreg.svg
+++ b/icons/shield_us_nht_oreg.svg
@@ -1,48 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="22"
-   height="21"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="shield_us_nht_oreg.svg"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs5" />
-  <sodipodi:namedview
-     id="namedview5"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="11.238095"
-     inkscape:cx="11.033898"
-     inkscape:cy="10.5"
-     inkscape:window-width="1728"
-     inkscape:window-height="431"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g5" />
-  <g
-     fill="none"
-     fill-rule="evenodd"
-     id="g5">
-    <path
-       stroke="#FFF"
-       d="M10.9888705,1.53541164 C12.4932905,2.17213039 15.6549806,3.87611026 18.0538816,8.07193788 C19.311349,10.2705988 20.4865793,13.351667 20.4635207,15.9366539 L20.4952729,16.5917888 C20.5014614,16.8224065 20.5007132,17.0099295 20.4978836,17.1483271 L19.6146601,17.587847 C17.9917962,18.3189203 14.7868092,19.5 11.0005286,19.5 C6.74015838,19.5 3.21513315,18.0067865 1.85323088,17.3403669 L1.52154499,16.1815027 C1.53204122,15.9896301 1.54713988,15.7788513 1.56842789,15.5510978 L1.69152238,14.7185312 C2.07673476,12.2857243 2.64277057,10.3462577 3.94316334,8.07092597 C6.60805142,3.40953244 10.1920991,1.83760152 10.9888705,1.53541164 Z"
-       stroke-linejoin="square"
-       fill="#FFCD00"
-       id="path1" />
-    <path
-       stroke="#000"
-       d="M10.8553487,0.522191046 C12.7064083,1.1499044 16.2583722,2.91672937 18.9219393,7.57547464 C20.2554561,9.90710666 21.4793665,13.1747632 21.4636972,15.9160756 L21.4946142,16.5539789 C21.5112777,17.1582891 21.4840083,17.5025726 21.4840083,17.5025726 L20.0431555,18.491591 C18.348598,19.2568847 14.9806692,20.5 11.0005286,20.5 C6.52368045,20.5 2.82089975,18.9284912 1.4020398,18.2328833 L0.513021913,17.7692982 L0.521689379,16.1518789 C0.533269482,15.9341385 0.55043236,15.6929746 0.575318901,15.430959 L0.703827367,14.5621389 C1.10885219,12.0042067 1.70795868,9.9665959 3.07501927,7.5746137 C6.32347976,1.8924416 10.8553487,0.522191046 10.8553487,0.522191046 Z"
-       id="path2" />
-  </g>
+<svg width="22" height="21" xmlns="http://www.w3.org/2000/svg">
+ <g fill="none" fill-rule="evenodd">
+  <path stroke="#FFF" d="M10.9888705,1.53541164 C12.4932905,2.17213039 15.6549806,3.87611026 18.0538816,8.07193788 C19.311349,10.2705988 20.4865793,13.351667 20.4635207,15.9366539 L20.4952729,16.5917888 C20.5014614,16.8224065 20.5007132,17.0099295 20.4978836,17.1483271 L19.6146601,17.587847 C17.9917962,18.3189203 14.7868092,19.5 11.0005286,19.5 C6.74015838,19.5 3.21513315,18.0067865 1.85323088,17.3403669 L1.52154499,16.1815027 C1.53204122,15.9896301 1.54713988,15.7788513 1.56842789,15.5510978 L1.69152238,14.7185312 C2.07673476,12.2857243 2.64277057,10.3462577 3.94316334,8.07092597 C6.60805142,3.40953244 10.1920991,1.83760152 10.9888705,1.53541164 Z" stroke-linejoin="square" fill="#FFCD00"/>
+  <path stroke="#000" d="M10.8553487,0.522191046 C12.7064083,1.1499044 16.2583722,2.91672937 18.9219393,7.57547464 C20.2554561,9.90710666 21.4793665,13.1747632 21.4636972,15.9160756 L21.4946142,16.5539789 C21.5112777,17.1582891 21.4840083,17.5025726 21.4840083,17.5025726 L20.0431555,18.491591 C18.348598,19.2568847 14.9806692,20.5 11.0005286,20.5 C6.52368045,20.5 2.82089975,18.9284912 1.4020398,18.2328833 L0.513021913,17.7692982 L0.521689379,16.1518789 C0.533269482,15.9341385 0.55043236,15.6929746 0.575318901,15.430959 L0.703827367,14.5621389 C1.10885219,12.0042067 1.70795868,9.9665959 3.07501927,7.5746137 C6.32347976,1.8924416 10.8553487,0.522191046 10.8553487,0.522191046 Z"/>
+ </g>
 </svg>
diff --git a/icons/shield_us_nht_ovvi.svg b/icons/shield_us_nht_ovvi.svg
index b7593a07b..a0308ec62 100644
--- a/icons/shield_us_nht_ovvi.svg
+++ b/icons/shield_us_nht_ovvi.svg
@@ -1,48 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="22"
-   height="21"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="shield_us_nht_ovvi.svg"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="namedview4"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="11.238095"
-     inkscape:cx="11.033898"
-     inkscape:cy="10.5"
-     inkscape:window-width="1728"
-     inkscape:window-height="431"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g4" />
-  <g
-     fill="none"
-     fill-rule="evenodd"
-     id="g4">
-    <path
-       stroke="#FFF"
-       d="M10.9888705,1.53541164 C12.4932905,2.17213039 15.6549806,3.87611026 18.0538816,8.07193788 C19.311349,10.2705988 20.4865793,13.351667 20.4635207,15.9366539 L20.4952729,16.5917888 C20.5014614,16.8224065 20.5007132,17.0099295 20.4978836,17.1483271 L19.6146601,17.587847 C17.9917962,18.3189203 14.7868092,19.5 11.0005286,19.5 C6.74015838,19.5 3.21513315,18.0067865 1.85323088,17.3403669 L1.52154499,16.1815027 C1.53204122,15.9896301 1.54713988,15.7788513 1.56842789,15.5510978 L1.69152238,14.7185312 C2.07673476,12.2857243 2.64277057,10.3462577 3.94316334,8.07092597 C6.60805142,3.40953244 10.1920991,1.83760152 10.9888705,1.53541164 Z"
-       stroke-linejoin="square"
-       fill="#693F23"
-       id="path1" />
-    <path
-       stroke="#000"
-       d="M10.8553487,0.522191046 C12.7064083,1.1499044 16.2583722,2.91672937 18.9219393,7.57547464 C20.2554561,9.90710666 21.4793665,13.1747632 21.4636972,15.9160756 L21.4946142,16.5539789 C21.5112777,17.1582891 21.4840083,17.5025726 21.4840083,17.5025726 L20.0431555,18.491591 C18.348598,19.2568847 14.9806692,20.5 11.0005286,20.5 C6.52368045,20.5 2.82089975,18.9284912 1.4020398,18.2328833 L0.513021913,17.7692982 L0.521689379,16.1518789 C0.533269482,15.9341385 0.55043236,15.6929746 0.575318901,15.430959 L0.703827367,14.5621389 C1.10885219,12.0042067 1.70795868,9.9665959 3.07501927,7.5746137 C6.32347976,1.8924416 10.8553487,0.522191046 10.8553487,0.522191046 Z"
-       id="path2" />
-  </g>
+<svg width="22" height="21" xmlns="http://www.w3.org/2000/svg">
+ <g fill="none" fill-rule="evenodd">
+  <path stroke="#FFF" d="M10.9888705,1.53541164 C12.4932905,2.17213039 15.6549806,3.87611026 18.0538816,8.07193788 C19.311349,10.2705988 20.4865793,13.351667 20.4635207,15.9366539 L20.4952729,16.5917888 C20.5014614,16.8224065 20.5007132,17.0099295 20.4978836,17.1483271 L19.6146601,17.587847 C17.9917962,18.3189203 14.7868092,19.5 11.0005286,19.5 C6.74015838,19.5 3.21513315,18.0067865 1.85323088,17.3403669 L1.52154499,16.1815027 C1.53204122,15.9896301 1.54713988,15.7788513 1.56842789,15.5510978 L1.69152238,14.7185312 C2.07673476,12.2857243 2.64277057,10.3462577 3.94316334,8.07092597 C6.60805142,3.40953244 10.1920991,1.83760152 10.9888705,1.53541164 Z" stroke-linejoin="square" fill="#693F23"/>
+  <path stroke="#000" d="M10.8553487,0.522191046 C12.7064083,1.1499044 16.2583722,2.91672937 18.9219393,7.57547464 C20.2554561,9.90710666 21.4793665,13.1747632 21.4636972,15.9160756 L21.4946142,16.5539789 C21.5112777,17.1582891 21.4840083,17.5025726 21.4840083,17.5025726 L20.0431555,18.491591 C18.348598,19.2568847 14.9806692,20.5 11.0005286,20.5 C6.52368045,20.5 2.82089975,18.9284912 1.4020398,18.2328833 L0.513021913,17.7692982 L0.521689379,16.1518789 C0.533269482,15.9341385 0.55043236,15.6929746 0.575318901,15.430959 L0.703827367,14.5621389 C1.10885219,12.0042067 1.70795868,9.9665959 3.07501927,7.5746137 C6.32347976,1.8924416 10.8553487,0.522191046 10.8553487,0.522191046 Z"/>
+ </g>
 </svg>
diff --git a/icons/shield_us_nht_semo.svg b/icons/shield_us_nht_semo.svg
index 43f8629cf..b5baff864 100644
--- a/icons/shield_us_nht_semo.svg
+++ b/icons/shield_us_nht_semo.svg
@@ -1,53 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="22"
-   height="21"
-   version="1.1"
-   id="svg7"
-   sodipodi:docname="shield_us_nht_semo.svg"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="11.238095"
-     inkscape:cx="11.033898"
-     inkscape:cy="10.455508"
-     inkscape:window-width="1728"
-     inkscape:window-height="786"
-     inkscape:window-x="0"
-     inkscape:window-y="38"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g7" />
-  <defs
-     id="defs1">
-    <path
-       d="M20.9854853,17.4641695 L20.7080082,17.6146471 L20.372574,17.784192 L19.828855,18.0397453 C18.1701087,18.7879341 14.8836869,20 11.0005286,20 C6.63197547,20 3.01810879,18.4676785 1.62767684,17.7866468 L1.01464917,17.4669788 L1.00156842,17.1239637 L1.00189323,16.7153542 L1.02161769,16.166596 C1.03266103,15.9618117 1.0487905,15.7359093 1.07185898,15.4911286 L1.19767487,14.640335 C1.59279348,12.1449655 2.17536463,10.1564268 3.5090913,7.82276984 C6.64086683,2.34470182 11.0026532,1 11.0026532,1 L11.3634101,1.13622157 C12.4717499,1.5943384 15.9083145,3.31183189 18.4879104,7.82370626 C19.7834357,10.0889108 20.9829962,13.263381 20.9636187,15.9265648 L20.9949457,16.57293 C21.0103992,17.1407528 20.9854853,17.4641695 20.9854853,17.4641695 Z"
-       id="a" />
-  </defs>
-  <g
-     fill="none"
-     fill-rule="evenodd"
-     id="g7">
-    <path
-       stroke="#000"
-       d="M10.8553487,0.522191046 C12.7064083,1.1499044 16.2583722,2.91672937 18.9219393,7.57547464 C20.2554561,9.90710666 21.4793665,13.1747632 21.4636972,15.9160756 L21.4946142,16.5539789 C21.5112777,17.1582891 21.4840083,17.5025726 21.4840083,17.5025726 L20.0431555,18.491591 C18.348598,19.2568847 14.9806692,20.5 11.0005286,20.5 C6.52368045,20.5 2.82089975,18.9284912 1.4020398,18.2328833 L0.513021913,17.7692982 L0.521689379,16.1518789 C0.533269482,15.9341385 0.55043236,15.6929746 0.575318901,15.430959 L0.703827367,14.5621389 C1.10885219,12.0042067 1.70795868,9.9665959 3.07501927,7.5746137 C6.32347976,1.8924416 10.8553487,0.522191046 10.8553487,0.522191046 Z"
-       id="path1"
-       style="fill:#ffffff" />
-    <path
-       stroke="#FFF"
-       d="M10.9888705,1.53541164 C12.4932905,2.17213039 15.6549806,3.87611026 18.0538816,8.07193788 C19.311349,10.2705988 20.4865793,13.351667 20.4635207,15.9366539 L20.4952729,16.5917888 C20.5014614,16.8224065 20.5007132,17.0099295 20.4978836,17.1483271 L19.6146601,17.587847 C17.9917962,18.3189203 14.7868092,19.5 11.0005286,19.5 C6.74015838,19.5 3.21513315,18.0067865 1.85323088,17.3403669 L1.52154499,16.1815027 C1.53204122,15.9896301 1.54713988,15.7788513 1.56842789,15.5510978 L1.69152238,14.7185312 C2.07673476,12.2857243 2.64277057,10.3462577 3.94316334,8.07092597 C6.60805142,3.40953244 10.1920991,1.83760152 10.9888705,1.53541164 Z"
-       stroke-linejoin="square"
-       id="path2"
-       style="fill:#9bcbeb;fill-opacity:1" />
-  </g>
+<svg width="22" height="21" xmlns="http://www.w3.org/2000/svg">
+ <g fill="none" fill-rule="evenodd">
+  <path stroke="#000" d="M10.8553487,0.522191046 C12.7064083,1.1499044 16.2583722,2.91672937 18.9219393,7.57547464 C20.2554561,9.90710666 21.4793665,13.1747632 21.4636972,15.9160756 L21.4946142,16.5539789 C21.5112777,17.1582891 21.4840083,17.5025726 21.4840083,17.5025726 L20.0431555,18.491591 C18.348598,19.2568847 14.9806692,20.5 11.0005286,20.5 C6.52368045,20.5 2.82089975,18.9284912 1.4020398,18.2328833 L0.513021913,17.7692982 L0.521689379,16.1518789 C0.533269482,15.9341385 0.55043236,15.6929746 0.575318901,15.430959 L0.703827367,14.5621389 C1.10885219,12.0042067 1.70795868,9.9665959 3.07501927,7.5746137 C6.32347976,1.8924416 10.8553487,0.522191046 10.8553487,0.522191046 Z" style="fill:#fff"/>
+  <path stroke="#FFF" d="M10.9888705,1.53541164 C12.4932905,2.17213039 15.6549806,3.87611026 18.0538816,8.07193788 C19.311349,10.2705988 20.4865793,13.351667 20.4635207,15.9366539 L20.4952729,16.5917888 C20.5014614,16.8224065 20.5007132,17.0099295 20.4978836,17.1483271 L19.6146601,17.587847 C17.9917962,18.3189203 14.7868092,19.5 11.0005286,19.5 C6.74015838,19.5 3.21513315,18.0067865 1.85323088,17.3403669 L1.52154499,16.1815027 C1.53204122,15.9896301 1.54713988,15.7788513 1.56842789,15.5510978 L1.69152238,14.7185312 C2.07673476,12.2857243 2.64277057,10.3462577 3.94316334,8.07092597 C6.60805142,3.40953244 10.1920991,1.83760152 10.9888705,1.53541164 Z" stroke-linejoin="square" style="fill:#9bcbeb;fill-opacity:1"/>
+ </g>
 </svg>