diff --git a/icons/bug-off.json b/icons/bug-off.json
index dd0527b9e..04cd93124 100644
--- a/icons/bug-off.json
+++ b/icons/bug-off.json
@@ -1,9 +1,14 @@
 {
   "$schema": "../icon.schema.json",
   "contributors": [
-    "danielbayley"
+    "danielbayley",
+    "jamiemlaw"
   ],
   "tags": [
+    "issue",
+    "fixed",
+    "resolved",
+    "testing",
     "debug",
     "code",
     "insect",
diff --git a/icons/bug-off.svg b/icons/bug-off.svg
index 5f0a42968..5244cf566 100644
--- a/icons/bug-off.svg
+++ b/icons/bug-off.svg
@@ -9,13 +9,14 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M15 7.13V6a3 3 0 0 0-5.14-2.1L8 2" />
-  <path d="M14.12 3.88 16 2" />
-  <path d="M22 13h-4v-2a4 4 0 0 0-4-4h-1.3" />
-  <path d="M20.97 5c0 2.1-1.6 3.8-3.5 4" />
-  <path d="m2 2 20 20" />
-  <path d="M7.7 7.7A4 4 0 0 0 6 11v3a6 6 0 0 0 11.13 3.13" />
   <path d="M12 20v-8" />
+  <path d="M14.12 3.88 16 2" />
+  <path d="M15 7.13V6a3 3 0 0 0-5.14-2.1L8 2" />
+  <path d="M18 12.34V11a4 4 0 0 0-4-4h-1.3" />
+  <path d="m2 2 20 20" />
+  <path d="M21 5a4 4 0 0 1-3.55 3.97" />
+  <path d="M22 13h-3.34" />
+  <path d="M3 21a4 4 0 0 1 3.81-4" />
   <path d="M6 13H2" />
-  <path d="M3 21c0-2.1 1.7-3.9 3.8-4" />
+  <path d="M7.7 7.7A4 4 0 0 0 6 11v3a6 6 0 0 0 11.13 3.13" />
 </svg>
diff --git a/icons/bug-play.json b/icons/bug-play.json
index e5f6db1ba..aa800e359 100644
--- a/icons/bug-play.json
+++ b/icons/bug-play.json
@@ -3,10 +3,14 @@
   "contributors": [
     "danielbayley",
     "jguddas",
-    "karsa-mistmere"
+    "karsa-mistmere",
+    "jamiemlaw"
   ],
   "tags": [
+    "issue",
+    "testing",
     "debug",
+    "reproduce",
     "code",
     "insect"
   ],
diff --git a/icons/bug-play.svg b/icons/bug-play.svg
index a796d4a99..cc5d93bc1 100644
--- a/icons/bug-play.svg
+++ b/icons/bug-play.svg
@@ -12,10 +12,10 @@
   <path d="M10 19.655A6 6 0 0 1 6 14v-3a4 4 0 0 1 4-4h4a4 4 0 0 1 4 3.97" />
   <path d="M14 15.003a1 1 0 0 1 1.517-.859l4.997 2.997a1 1 0 0 1 0 1.718l-4.997 2.997a1 1 0 0 1-1.517-.86z" />
   <path d="M14.12 3.88 16 2" />
-  <path d="M20.97 5c0 2.1-1.6 3.8-3.5 4" />
-  <path d="M3 21c0-2.1 1.7-3.9 3.8-4" />
+  <path d="M21 5a4 4 0 0 1-3.55 3.97" />
+  <path d="M3 21a4 4 0 0 1 3.81-4" />
+  <path d="M3 5a4 4 0 0 0 3.55 3.97" />
   <path d="M6 13H2" />
-  <path d="M6.53 9C4.6 8.8 3 7.1 3 5" />
   <path d="m8 2 1.88 1.88" />
-  <path d="M9 7.13v-1a3 3 0 0 1 4.18-2.895 3 3 0 0 1 1.821 2.896v1" />
+  <path d="M9 7.13V6a3 3 0 1 1 6 0v1.13" />
 </svg>
diff --git a/icons/bug.json b/icons/bug.json
index 5d4f1ad2d..7490dbf6b 100644
--- a/icons/bug.json
+++ b/icons/bug.json
@@ -1,14 +1,21 @@
 {
   "$schema": "../icon.schema.json",
   "contributors": [
-    "danielbayley"
+    "danielbayley",
+    "jamiemlaw"
   ],
   "tags": [
     "issue",
+    "error",
+    "defect",
+    "testing",
+    "troubleshoot",
+    "problem",
     "report",
     "debug",
     "code",
-    "insect"
+    "insect",
+    "beetle"
   ],
   "categories": [
     "development",
diff --git a/icons/bug.svg b/icons/bug.svg
index 2eae345c1..a9cf7b61d 100644
--- a/icons/bug.svg
+++ b/icons/bug.svg
@@ -9,15 +9,15 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="m8 2 1.88 1.88" />
-  <path d="M14.12 3.88 16 2" />
-  <path d="M9 7.13v-1a3.003 3.003 0 1 1 6 0v1" />
-  <path d="M12 20c-3.3 0-6-2.7-6-6v-3a4 4 0 0 1 4-4h4a4 4 0 0 1 4 4v3c0 3.3-2.7 6-6 6" />
   <path d="M12 20v-9" />
-  <path d="M6.53 9C4.6 8.8 3 7.1 3 5" />
-  <path d="M6 13H2" />
-  <path d="M3 21c0-2.1 1.7-3.9 3.8-4" />
-  <path d="M20.97 5c0 2.1-1.6 3.8-3.5 4" />
+  <path d="M14 7a4 4 0 0 1 4 4v3a6 6 0 0 1-12 0v-3a4 4 0 0 1 4-4z" />
+  <path d="M14.12 3.88 16 2" />
+  <path d="M21 21a4 4 0 0 0-3.81-4" />
+  <path d="M21 5a4 4 0 0 1-3.55 3.97" />
   <path d="M22 13h-4" />
-  <path d="M17.2 17c2.1.1 3.8 1.9 3.8 4" />
+  <path d="M3 21a4 4 0 0 1 3.81-4" />
+  <path d="M3 5a4 4 0 0 0 3.55 3.97" />
+  <path d="M6 13H2" />
+  <path d="m8 2 1.88 1.88" />
+  <path d="M9 7.13V6a3 3 0 1 1 6 0v1.13" />
 </svg>