diff --git a/icons/shield-alert.json b/icons/shield-alert.json
index 0b66e36d1..8eb18f325 100644
--- a/icons/shield-alert.json
+++ b/icons/shield-alert.json
@@ -5,16 +5,76 @@
     "ericfennis"
   ],
   "tags": [
-    "security",
-    "secure",
-    "virus",
-    "admin",
+    "unshielded",
+    "cybersecurity",
+    "insecure",
+    "unsecured",
     "safety",
-    "savety"
+    "unsafe",
+    "protection",
+    "unprotected",
+    "guardian",
+    "unguarded",
+    "unarmored",
+    "unarmoured",
+    "defenseless",
+    "defenceless",
+    "undefended",
+    "defender",
+    "blocked",
+    "stopped",
+    "intercepted",
+    "interception",
+    "saved",
+    "thwarted",
+    "threat",
+    "prevention",
+    "unprevented",
+    "antivirus",
+    "vigilance",
+    "vigilant",
+    "detection",
+    "detected",
+    "scanned",
+    "found",
+    "exploit",
+    "vulnerability",
+    "vulnerable",
+    "weakness",
+    "infection",
+    "infected",
+    "comprimised",
+    "data leak",
+    "audited",
+    "admin",
+    "verification",
+    "unverified",
+    "uncertified",
+    "warning",
+    "emergency",
+    "attention",
+    "urgent",
+    "alarm",
+    "crest",
+    "bravery",
+    "strength",
+    "tough",
+    "attacked",
+    "damaged",
+    "injured",
+    "hit",
+    "expired",
+    "disabled",
+    "inactive",
+    "error",
+    "exclamation mark",
+    "!"
   ],
   "categories": [
     "account",
     "security",
-    "notifications"
+    "development",
+    "notifications",
+    "gaming"
   ]
 }
\ No newline at end of file
diff --git a/icons/shield-check.json b/icons/shield-check.json
index edfbc3b25..67f21d7b7 100644
--- a/icons/shield-check.json
+++ b/icons/shield-check.json
@@ -5,17 +5,64 @@
     "ericfennis"
   ],
   "tags": [
-    "security",
-    "secure",
-    "done",
-    "save",
+    "cybersecurity",
+    "secured",
+    "safety",
+    "protection",
+    "protected",
+    "guardian",
+    "guarded",
+    "armored",
+    "armoured",
+    "defense",
+    "defence",
+    "defended",
+    "blocked",
+    "threat",
+    "prevention",
+    "prevented",
+    "antivirus",
+    "vigilance",
+    "vigilant",
+    "active",
+    "activated",
+    "enabled",
+    "detection",
+    "scanned",
+    "found",
+    "strength",
+    "strong",
+    "tough",
+    "invincible",
+    "invincibility",
+    "invulnerable",
+    "undamaged",
+    "audited",
+    "admin",
+    "verification",
+    "verified",
+    "certification",
+    "certified",
+    "tested",
+    "passed",
+    "qualified",
+    "cleared",
+    "cleaned",
+    "disinfected",
+    "uninfected",
+    "task",
+    "completed",
     "todo",
-    "tick",
-    "complete",
-    "task"
+    "done",
+    "ticked",
+    "checked",
+    "crest",
+    "bravery"
   ],
   "categories": [
     "account",
-    "security"
+    "security",
+    "development",
+    "gaming"
   ]
 }
\ No newline at end of file
diff --git a/icons/shield-off.json b/icons/shield-off.json
index 978df4bec..7a39a6980 100644
--- a/icons/shield-off.json
+++ b/icons/shield-off.json
@@ -7,11 +7,56 @@
     "karsa-mistmere"
   ],
   "tags": [
-    "security",
-    "secure",
-    "insecure"
+    "unshielded",
+    "cybersecurity",
+    "insecure",
+    "unsecured",
+    "safety",
+    "unsafe",
+    "protection",
+    "unprotected",
+    "guardian",
+    "unguarded",
+    "unarmored",
+    "unarmoured",
+    "defenseless",
+    "defenceless",
+    "undefended",
+    "defender",
+    "interception",
+    "threat",
+    "prevention",
+    "unprevented",
+    "antivirus",
+    "detection",
+    "undetected",
+    "exploit",
+    "vulnerability",
+    "vulnerable",
+    "weakness",
+    "infected",
+    "infection",
+    "comprimised",
+    "data leak",
+    "unaudited",
+    "admin",
+    "verification",
+    "unverified",
+    "inactive",
+    "cancelled",
+    "error",
+    "crest",
+    "bravery",
+    "damaged",
+    "injured",
+    "hit",
+    "expired",
+    "eliminated"
   ],
   "categories": [
-    "security"
+    "account",
+    "security",
+    "development",
+    "gaming"
   ]
 }
\ No newline at end of file
diff --git a/icons/shield-question.json b/icons/shield-question.json
index ac3273ccc..71de71822 100644
--- a/icons/shield-question.json
+++ b/icons/shield-question.json
@@ -5,11 +5,55 @@
     "jguddas"
   ],
   "tags": [
-    "security",
-    "secure",
-    "insecure"
+    "unshielded",
+    "cybersecurity",
+    "insecure",
+    "unsecured",
+    "safety",
+    "unsafe",
+    "protection",
+    "unprotected",
+    "guardian",
+    "unguarded",
+    "unarmored",
+    "unarmoured",
+    "defenseless",
+    "defenceless",
+    "undefended",
+    "defender",
+    "threat",
+    "prevention",
+    "unprevented",
+    "antivirus",
+    "vigilance",
+    "vigilant",
+    "detection",
+    "undetected",
+    "scan",
+    "find",
+    "exploit",
+    "vulnerability",
+    "vulnerable",
+    "weakness",
+    "infection",
+    "comprimised",
+    "data leak",
+    "audit",
+    "admin",
+    "verification",
+    "unverified",
+    "uncertified",
+    "uncertain",
+    "unknown",
+    "inactive",
+    "crest",
+    "question mark",
+    "?"
   ],
   "categories": [
-    "security"
+    "account",
+    "security",
+    "development",
+    "gaming"
   ]
 }
\ No newline at end of file
diff --git a/icons/shield.json b/icons/shield.json
index 33d91a429..c6872642d 100644
--- a/icons/shield.json
+++ b/icons/shield.json
@@ -4,13 +4,54 @@
     "colebemis"
   ],
   "tags": [
-    "security",
-    "secure"
+    "cybersecurity",
+    "secure",
+    "safety",
+    "protection",
+    "guardian",
+    "armored",
+    "armoured",
+    "defense",
+    "defence",
+    "defender",
+    "block",
+    "threat",
+    "prevention",
+    "antivirus",
+    "vigilance",
+    "vigilant",
+    "detection",
+    "scan",
+    "find",
+    "strength",
+    "strong",
+    "tough",
+    "invincible",
+    "invincibility",
+    "invulnerable",
+    "undamaged",
+    "audit",
+    "admin",
+    "verification",
+    "crest",
+    "bravery",
+    "knight",
+    "foot soldier",
+    "infantry",
+    "trooper",
+    "pawn",
+    "battle",
+    "war",
+    "military",
+    "army",
+    "cadet",
+    "scout"
   ],
   "categories": [
     "account",
     "security",
+    "development",
     "gaming",
-    "development"
+    "shapes"
   ]
 }
\ No newline at end of file