diff --git a/groups/exclamation-mark.json b/groups/exclamation-mark.json
index fce365b40..270530fb0 100644
--- a/groups/exclamation-mark.json
+++ b/groups/exclamation-mark.json
@@ -16,6 +16,8 @@
     "!",
     "critical",
     "urgent",
-    "severity"
+    "severity",
+    "punctuation",
+    "symbol"
   ]
 }
diff --git a/groups/question-mark.json b/groups/question-mark.json
index 4813e035f..a81e04d6b 100644
--- a/groups/question-mark.json
+++ b/groups/question-mark.json
@@ -3,13 +3,20 @@
   "description": "Status: help, or something unknown",
   "tags": [
     "help",
+    "assistance",
+    "support",
     "guide",
     "tutorial",
     "manual",
+    "faq",
+    "hint",
+    "query",
     "unknown",
     "unidentified",
     "unspecified",
     "uncertain",
+    "unsure",
+    "doubt",
     "undetermined",
     "missing",
     "to be determined",
@@ -20,6 +27,8 @@
     "quiz",
     "inquiry",
     "enquiry",
-    "ask"
+    "ask",
+    "punctuation",
+    "symbol"
   ]
 }
diff --git a/icons/badge-question-mark.svg b/icons/badge-question-mark.svg
index 0b8f450ab..361455b55 100644
--- a/icons/badge-question-mark.svg
+++ b/icons/badge-question-mark.svg
@@ -10,6 +10,6 @@
   stroke-linejoin="round"
 >
   <path d="M3.85 8.62a4 4 0 0 1 4.78-4.77 4 4 0 0 1 6.74 0 4 4 0 0 1 4.78 4.78 4 4 0 0 1 0 6.74 4 4 0 0 1-4.77 4.78 4 4 0 0 1-6.75 0 4 4 0 0 1-4.78-4.77 4 4 0 0 1 0-6.76Z" />
-  <path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3" />
-  <line x1="12" x2="12.01" y1="17" y2="17" />
+  <path d="M9 9.5a3 2.5 0 016 0c0 2-2 2-3 3.5" />
+  <path d="M12 17h.01" />
 </svg>
diff --git a/icons/battery-exclamation-point.svg b/icons/battery-exclamation-point.svg
index 330dbed4b..bc8679af5 100644
--- a/icons/battery-exclamation-point.svg
+++ b/icons/battery-exclamation-point.svg
@@ -9,8 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M10 17h.01" />
-  <path d="M10 7v6" />
+  <path d="M10 16h.01" />
+  <path d="M10 8v4" />
   <path d="M14 6h2a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2h-2" />
   <path d="M22 14v-4" />
   <path d="M6 18H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h2" />
diff --git a/icons/circle-question-mark.svg b/icons/circle-question-mark.svg
index cf7e6efe8..1d9c17584 100644
--- a/icons/circle-question-mark.svg
+++ b/icons/circle-question-mark.svg
@@ -10,6 +10,6 @@
   stroke-linejoin="round"
 >
   <circle cx="12" cy="12" r="10" />
-  <path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3" />
+  <path d="M9 9.5a3 2.5 0 016 0c0 2-2 2-3 3.5" />
   <path d="M12 17h.01" />
 </svg>
diff --git a/icons/exclamation-mark.json b/icons/exclamation-mark.json
new file mode 100644
index 000000000..af2c2d026
--- /dev/null
+++ b/icons/exclamation-mark.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "karsa-mistmere",
+    "danielbayley",
+    "lt25106"
+  ],
+  "use-cases": [
+    "Highlighting warnings or errors in user interfaces",
+    "Marking important notices that need attention"
+  ],
+  "tags": [
+    "$group:exclamation-mark",
+    "bang",
+    "surprise",
+    "emphasis",
+    "interjection",
+    "factorial",
+    "negation"
+  ],
+  "categories": [
+    "letters-digits",
+    "text",
+    "notifications"
+  ]
+}
diff --git a/icons/exclamation-mark.svg b/icons/exclamation-mark.svg
new file mode 100644
index 000000000..abef464d9
--- /dev/null
+++ b/icons/exclamation-mark.svg
@@ -0,0 +1,14 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M12 15V4" />
+  <path d="M12 20h.01" />
+</svg>
diff --git a/icons/file-question-mark.svg b/icons/file-question-mark.svg
index e3f12b306..edaf9d7cd 100644
--- a/icons/file-question-mark.svg
+++ b/icons/file-question-mark.svg
@@ -10,6 +10,6 @@
   stroke-linejoin="round"
 >
   <path d="M6 22a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h8a2.4 2.4 0 0 1 1.704.706l3.588 3.588A2.4 2.4 0 0 1 20 8v12a2 2 0 0 1-2 2z" />
+  <path d="M9 9.5a3 2.5 0 016 0c0 2-2 2-3 3.5" />
   <path d="M12 17h.01" />
-  <path d="M9.1 9a3 3 0 0 1 5.82 1c0 2-3 3-3 3" />
 </svg>
diff --git a/icons/mail-question-mark.svg b/icons/mail-question-mark.svg
index 3b16ae767..e836ab4e1 100644
--- a/icons/mail-question-mark.svg
+++ b/icons/mail-question-mark.svg
@@ -9,8 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M22 10.5V6a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v12c0 1.1.9 2 2 2h12.5" />
-  <path d="m22 7-8.97 5.7a1.94 1.94 0 0 1-2.06 0L2 7" />
-  <path d="M18 15.28c.2-.4.5-.8.9-1a2.1 2.1 0 0 1 2.6.4c.3.4.5.8.5 1.3 0 1.3-2 2-2 2" />
-  <path d="M20 22v.01" />
+  <path d="M22 10.35V6a2 2 0 00-2-2H4a2 2 0 00-2 2v12a2 2 0 002 2h12.3" />
+  <path d="m22 7-8.97 5.7a2 2 0 01-2.06 0L2 7" />
+  <path d="M20 18.5c.5-1 2-1 2-2.5a2 2 0 00-2-2 2.5 2.5 0 00-2 1" />
+  <path d="M20 22h.01" />
 </svg>
diff --git a/icons/message-circle-question-mark.svg b/icons/message-circle-question-mark.svg
index a9c248025..f743fd5e3 100644
--- a/icons/message-circle-question-mark.svg
+++ b/icons/message-circle-question-mark.svg
@@ -10,6 +10,6 @@
   stroke-linejoin="round"
 >
   <path d="M2.992 16.342a2 2 0 0 1 .094 1.167l-1.065 3.29a1 1 0 0 0 1.236 1.168l3.413-.998a2 2 0 0 1 1.099.092 10 10 0 1 0-4.777-4.719" />
-  <path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3" />
+  <path d="M9 9.5a3 2.5 0 016 0c0 2-2 2-3 3.5" />
   <path d="M12 17h.01" />
 </svg>
diff --git a/icons/package-question-mark.svg b/icons/package-question-mark.svg
index 5359c5a37..ac85f76c1 100644
--- a/icons/package-question-mark.svg
+++ b/icons/package-question-mark.svg
@@ -10,9 +10,9 @@
   stroke-linejoin="round"
 >
   <path d="M12 22V12l8.71-5" />
-  <path d="M17 15.27c.2-.4.5-.8.9-1a2.1 2.1 0 0 1 2.6.4c.3.4.5.8.5 1.3 0 1.3-2 2-2 2" />
-  <path d="M19 21.99h.01" />
   <path d="M21 10.342V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l2.33-1.332" />
   <path d="M3.29 7 12 12" />
   <path d="m7.5 4.27 9 5.15" />
+  <path d="M19 18.5c.5-1 2-1 2-2.5a2 2 0 00-2-2 2.5 2.5 0 00-2 1" />
+  <path d="M19 22h.01" />
 </svg>
diff --git a/icons/question-mark.json b/icons/question-mark.json
new file mode 100644
index 000000000..17781cd4f
--- /dev/null
+++ b/icons/question-mark.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "karsa-mistmere",
+    "jamiemlaw"
+  ],
+  "use-cases": [
+    "Opening contextual help in user interfaces",
+    "Indicating unknown or uncertain values"
+  ],
+  "tags": [
+    "$group:question-mark"
+  ],
+  "categories": [
+    "text",
+    "notifications"
+  ]
+}
diff --git a/icons/question-mark.svg b/icons/question-mark.svg
new file mode 100644
index 000000000..f6574ca43
--- /dev/null
+++ b/icons/question-mark.svg
@@ -0,0 +1,14 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M12 15c0-2.48 5-2.99 5-6.5a5 4.5 0 00-10 0" />
+  <path d="M12 20h.01" />
+</svg>
diff --git a/icons/shield-question-mark.svg b/icons/shield-question-mark.svg
index 34e922b07..eea1ffc7b 100644
--- a/icons/shield-question-mark.svg
+++ b/icons/shield-question-mark.svg
@@ -9,7 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z" />
-  <path d="M9.1 9a3 3 0 0 1 5.82 1c0 2-3 3-3 3" />
+  <path d="M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 01-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 011-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 011.52 0C14.51 3.81 17 5 19 5a1 1 0 011 1z" />
+  <path d="M9 9.5a3 2.5 0 016 0c0 2-2 2-3 3.5" />
   <path d="M12 17h.01" />
 </svg>