From 19bee3e274547289c5e5a0e89a59b478e8dd0d75 Mon Sep 17 00:00:00 2001
From: Clay Smalley <claysmalley@gmail.com>
Date: Wed, 4 May 2022 09:56:29 -0400
Subject: [PATCH 1/2] Replace diamond shield

---
 style/icons/shield40_diamond_white.svg |  3 +++
 style/icons/shield40_us_nc.svg         |  3 ---
 style/js/shield_defs.js                | 11 ++++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 style/icons/shield40_diamond_white.svg
 delete mode 100644 style/icons/shield40_us_nc.svg

diff --git a/style/icons/shield40_diamond_white.svg b/style/icons/shield40_diamond_white.svg
new file mode 100644
index 000000000..57be62478
--- /dev/null
+++ b/style/icons/shield40_diamond_white.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.0" xmlns="http://www.w3.org/2000/svg">
+ <path style="fill:#fff;stroke:#000" d="m 13.641195,1.2046011 9.154204,9.1542039 c 0.909222,0.909222 0.909222,2.373168 0,3.28239 l -9.154204,9.154204 c -0.909222,0.909222 -2.373168,0.909222 -3.28239,0 L 1.2046011,13.641195 c -0.90922194,-0.909222 -0.90922201,-2.373168 -1e-7,-3.28239 l 9.154204,-9.1542039 c 0.909222,-0.90922196 2.373168,-0.90922196 3.28239,0 z"/>
+</svg>
diff --git a/style/icons/shield40_us_nc.svg b/style/icons/shield40_us_nc.svg
deleted file mode 100644
index 8a82f9fbf..000000000
--- a/style/icons/shield40_us_nc.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" version="1.0" xmlns="http://www.w3.org/2000/svg">
- <path d="m29.069 9.2773 16.32 16.32c0.96185 0.96185 0.96185 2.5105 0 3.4724l-16.32 16.32c-0.96185 0.96185-2.5105 0.96185-3.4724 0l-16.32-16.32c-0.96185-0.96185-0.96185-2.5105 0-3.4724l16.32-16.32c0.96185-0.96185 2.5105-0.96185 3.4724 0z" fill="#fff" stroke="#000" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="2.465" transform="matrix(.5 0 0 .5 -3.667 -3.667)"/>
-</svg>
diff --git a/style/js/shield_defs.js b/style/js/shield_defs.js
index ba0cc87a3..41f140654 100644
--- a/style/js/shield_defs.js
+++ b/style/js/shield_defs.js
@@ -68,13 +68,14 @@ export function loadShields(shieldImages) {
 
   //Diamond shields
   var diamondShield = {
-    backgroundImage: shieldImages.shield40_us_nc,
+    backgroundImage: shieldImages.shield40_diamond_white,
+    textLayoutConstraint: ShieldText.ellipseTextConstraint,
     textColor: "black",
     padding: {
-      left: 5,
-      right: 5,
-      top: 5,
-      bottom: 5,
+      left: 2,
+      right: 2,
+      top: 4.5,
+      bottom: 4.5,
     },
   };
 

From 44167c250c288f6ef4633a6bf2cbb6121248d774 Mon Sep 17 00:00:00 2001
From: Clay Smalley <claysmalley@gmail.com>
Date: Wed, 4 May 2022 17:22:38 -0400
Subject: [PATCH 2/2] Adjust spacing on diamond shield

---
 style/js/shield_defs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/style/js/shield_defs.js b/style/js/shield_defs.js
index 41f140654..2b8a42f1a 100644
--- a/style/js/shield_defs.js
+++ b/style/js/shield_defs.js
@@ -72,8 +72,8 @@ export function loadShields(shieldImages) {
     textLayoutConstraint: ShieldText.ellipseTextConstraint,
     textColor: "black",
     padding: {
-      left: 2,
-      right: 2,
+      left: 2.5,
+      right: 2.5,
       top: 4.5,
       bottom: 4.5,
     },