diff --git a/icons/badge-help.json b/icons/badge-question-mark.json
similarity index 76%
rename from icons/badge-help.json
rename to icons/badge-question-mark.json
index 53ff2695c..65c4048a3 100644
--- a/icons/badge-help.json
+++ b/icons/badge-question-mark.json
@@ -11,6 +11,10 @@
   ],
   "categories": [
     "accessibility",
-    "social"
+    "social",
+    "shapes"
+  ],
+  "aliases": [
+    "badge-help"
   ]
 }
diff --git a/icons/badge-help.svg b/icons/badge-question-mark.svg
similarity index 100%
rename from icons/badge-help.svg
rename to icons/badge-question-mark.svg
diff --git a/icons/circle-help.json b/icons/circle-question-mark.json
similarity index 88%
rename from icons/circle-help.json
rename to icons/circle-question-mark.json
index a49677a80..c85710258 100644
--- a/icons/circle-help.json
+++ b/icons/circle-question-mark.json
@@ -16,6 +16,7 @@
     "notifications"
   ],
   "aliases": [
-    "help-circle"
+    "help-circle",
+    "circle-help"
   ]
 }
diff --git a/icons/circle-help.svg b/icons/circle-question-mark.svg
similarity index 100%
rename from icons/circle-help.svg
rename to icons/circle-question-mark.svg
diff --git a/icons/file-question.json b/icons/file-question-mark.json
similarity index 84%
rename from icons/file-question.json
rename to icons/file-question-mark.json
index 81079d8db..1dd1c2168 100644
--- a/icons/file-question.json
+++ b/icons/file-question-mark.json
@@ -12,5 +12,8 @@
   ],
   "categories": [
     "files"
+  ],
+  "aliases": [
+    "file-question"
   ]
 }
diff --git a/icons/file-question.svg b/icons/file-question-mark.svg
similarity index 100%
rename from icons/file-question.svg
rename to icons/file-question-mark.svg
diff --git a/icons/mail-question.json b/icons/mail-question-mark.json
similarity index 84%
rename from icons/mail-question.json
rename to icons/mail-question-mark.json
index db54d4dc7..2ac7a4edc 100644
--- a/icons/mail-question.json
+++ b/icons/mail-question-mark.json
@@ -12,5 +12,8 @@
   ],
   "categories": [
     "mail"
+  ],
+  "aliases": [
+    "mail-question"
   ]
 }
diff --git a/icons/mail-question.svg b/icons/mail-question-mark.svg
similarity index 100%
rename from icons/mail-question.svg
rename to icons/mail-question-mark.svg
diff --git a/icons/message-circle-question.json b/icons/message-circle-question-mark.json
similarity index 83%
rename from icons/message-circle-question.json
rename to icons/message-circle-question-mark.json
index 03bb01554..791bb1921 100644
--- a/icons/message-circle-question.json
+++ b/icons/message-circle-question-mark.json
@@ -14,5 +14,8 @@
   ],
   "categories": [
     "social"
+  ],
+  "aliases": [
+    "message-circle-question"
   ]
 }
diff --git a/icons/message-circle-question.svg b/icons/message-circle-question-mark.svg
similarity index 100%
rename from icons/message-circle-question.svg
rename to icons/message-circle-question-mark.svg
diff --git a/icons/shield-question.json b/icons/shield-question-mark.json
similarity index 95%
rename from icons/shield-question.json
rename to icons/shield-question-mark.json
index 79273fa99..c72370211 100644
--- a/icons/shield-question.json
+++ b/icons/shield-question-mark.json
@@ -56,5 +56,8 @@
     "security",
     "development",
     "gaming"
+  ],
+  "aliases": [
+    "shield-question"
   ]
 }
diff --git a/icons/shield-question.svg b/icons/shield-question-mark.svg
similarity index 100%
rename from icons/shield-question.svg
rename to icons/shield-question-mark.svg