diff --git a/icons/alert-circle.json b/icons/alert-circle.json
index 80fa3deab..b34137f20 100644
--- a/icons/alert-circle.json
+++ b/icons/alert-circle.json
@@ -3,10 +3,11 @@
   "tags": [
     "warning",
     "alert",
-    "danger"
+    "danger",
+    "exclamation mark"
   ],
   "categories": [
     "notifications",
     "shapes"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/alert-octagon.json b/icons/alert-octagon.json
index 80fa3deab..b34137f20 100644
--- a/icons/alert-octagon.json
+++ b/icons/alert-octagon.json
@@ -3,10 +3,11 @@
   "tags": [
     "warning",
     "alert",
-    "danger"
+    "danger",
+    "exclamation mark"
   ],
   "categories": [
     "notifications",
     "shapes"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/alert-triangle.json b/icons/alert-triangle.json
index 80fa3deab..b34137f20 100644
--- a/icons/alert-triangle.json
+++ b/icons/alert-triangle.json
@@ -3,10 +3,11 @@
   "tags": [
     "warning",
     "alert",
-    "danger"
+    "danger",
+    "exclamation mark"
   ],
   "categories": [
     "notifications",
     "shapes"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/battery-charging.json b/icons/battery-charging.json
index ad5eab370..f60102b2f 100644
--- a/icons/battery-charging.json
+++ b/icons/battery-charging.json
@@ -2,10 +2,12 @@
   "$schema": "../icon.schema.json",
   "tags": [
     "power",
-    "electricity"
+    "electricity",
+    "accumulator",
+    "charge"
   ],
   "categories": [
     "connectivity",
     "devices"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/battery-full.json b/icons/battery-full.json
index ad5eab370..f60102b2f 100644
--- a/icons/battery-full.json
+++ b/icons/battery-full.json
@@ -2,10 +2,12 @@
   "$schema": "../icon.schema.json",
   "tags": [
     "power",
-    "electricity"
+    "electricity",
+    "accumulator",
+    "charge"
   ],
   "categories": [
     "connectivity",
     "devices"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/battery-low.json b/icons/battery-low.json
index ad5eab370..f60102b2f 100644
--- a/icons/battery-low.json
+++ b/icons/battery-low.json
@@ -2,10 +2,12 @@
   "$schema": "../icon.schema.json",
   "tags": [
     "power",
-    "electricity"
+    "electricity",
+    "accumulator",
+    "charge"
   ],
   "categories": [
     "connectivity",
     "devices"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/battery-medium.json b/icons/battery-medium.json
index ad5eab370..f60102b2f 100644
--- a/icons/battery-medium.json
+++ b/icons/battery-medium.json
@@ -2,10 +2,12 @@
   "$schema": "../icon.schema.json",
   "tags": [
     "power",
-    "electricity"
+    "electricity",
+    "accumulator",
+    "charge"
   ],
   "categories": [
     "connectivity",
     "devices"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/battery-warning.json b/icons/battery-warning.json
index eb884fb0a..833b71431 100644
--- a/icons/battery-warning.json
+++ b/icons/battery-warning.json
@@ -2,7 +2,10 @@
   "$schema": "../icon.schema.json",
   "tags": [
     "power",
-    "electricity"
+    "electricity",
+    "accumulator",
+    "charge",
+    "exclamation mark"
   ],
   "categories": [
     "connectivity",
diff --git a/icons/battery.json b/icons/battery.json
index ad5eab370..f60102b2f 100644
--- a/icons/battery.json
+++ b/icons/battery.json
@@ -2,10 +2,12 @@
   "$schema": "../icon.schema.json",
   "tags": [
     "power",
-    "electricity"
+    "electricity",
+    "accumulator",
+    "charge"
   ],
   "categories": [
     "connectivity",
     "devices"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/file-warning.json b/icons/file-warning.json
index bca6079b3..3ecd40ebb 100644
--- a/icons/file-warning.json
+++ b/icons/file-warning.json
@@ -5,10 +5,11 @@
     "warning",
     "alert",
     "danger",
-    "protected"
+    "protected",
+    "exclamation mark"
   ],
   "categories": [
     "files",
     "notifications"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/mail-warning.json b/icons/mail-warning.json
index a18285eeb..acddbd0de 100644
--- a/icons/mail-warning.json
+++ b/icons/mail-warning.json
@@ -4,9 +4,10 @@
     "email",
     "message",
     "letter",
-    "delivery error"
+    "delivery error",
+    "exclamation mark"
   ],
   "categories": [
     "mail"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/power-off.json b/icons/power-off.json
index b0939f8bd..53408285b 100644
--- a/icons/power-off.json
+++ b/icons/power-off.json
@@ -1,9 +1,12 @@
 {
   "$schema": "../icon.schema.json",
   "tags": [
-    "device"
+    "on",
+    "off",
+    "device",
+    "switch"
   ],
   "categories": [
     "connectivity"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/power.json b/icons/power.json
index e24410cdf..53408285b 100644
--- a/icons/power.json
+++ b/icons/power.json
@@ -3,9 +3,10 @@
   "tags": [
     "on",
     "off",
-    "device"
+    "device",
+    "switch"
   ],
   "categories": [
     "connectivity"
   ]
-}
\ No newline at end of file
+}