diff --git a/icons/airplay.json b/icons/airplay.json
index 8a52d4e4c..c813d2cd9 100644
--- a/icons/airplay.json
+++ b/icons/airplay.json
@@ -3,7 +3,9 @@
   "tags": [
     "stream",
     "cast",
-    "mirroring"
+    "mirroring",
+    "screen",
+    "monitor"
   ],
   "categories": [
     "multimedia",
diff --git a/icons/cast.json b/icons/cast.json
index a643397dc..324ab5816 100644
--- a/icons/cast.json
+++ b/icons/cast.json
@@ -2,7 +2,8 @@
   "$schema": "../icon.schema.json",
   "tags": [
     "chromecast",
-    "airplay"
+    "airplay",
+    "screen"
   ],
   "categories": [
     "devices",
diff --git a/icons/laptop-2.json b/icons/laptop-2.json
index 66904aa06..284e67be3 100644
--- a/icons/laptop-2.json
+++ b/icons/laptop-2.json
@@ -1,7 +1,9 @@
 {
   "$schema": "../icon.schema.json",
   "tags": [
-    "computer"
+    "computer",
+    "screen",
+    "remote"
   ],
   "categories": [
     "devices"
diff --git a/icons/laptop.json b/icons/laptop.json
index 66904aa06..284e67be3 100644
--- a/icons/laptop.json
+++ b/icons/laptop.json
@@ -1,7 +1,9 @@
 {
   "$schema": "../icon.schema.json",
   "tags": [
-    "computer"
+    "computer",
+    "screen",
+    "remote"
   ],
   "categories": [
     "devices"
diff --git a/icons/monitor-smartphone.json b/icons/monitor-smartphone.json
index 74a7885c4..77376c83a 100644
--- a/icons/monitor-smartphone.json
+++ b/icons/monitor-smartphone.json
@@ -8,7 +8,8 @@
     "mobile",
     "desktop",
     "monitor",
-    "responsive"
+    "responsive",
+    "screens"
   ],
   "categories": [
     "connectivity",
diff --git a/icons/screen-share-off.json b/icons/screen-share-off.json
index 281c9f3a4..c9f00b377 100644
--- a/icons/screen-share-off.json
+++ b/icons/screen-share-off.json
@@ -2,7 +2,8 @@
   "$schema": "../icon.schema.json",
   "tags": [
     "desktop",
-    "disconnect"
+    "disconnect",
+    "monitor"
   ],
   "categories": [
     "connectivity",
diff --git a/icons/screen-share.json b/icons/screen-share.json
index 0a545dd91..51f25bdc6 100644
--- a/icons/screen-share.json
+++ b/icons/screen-share.json
@@ -2,7 +2,8 @@
   "$schema": "../icon.schema.json",
   "tags": [
     "host",
-    "desktop"
+    "desktop",
+    "monitor"
   ],
   "categories": [
     "connectivity",
diff --git a/icons/smartphone-charging.json b/icons/smartphone-charging.json
index 89fccb70b..a042ada58 100644
--- a/icons/smartphone-charging.json
+++ b/icons/smartphone-charging.json
@@ -4,7 +4,8 @@
     "phone",
     "cellphone",
     "device",
-    "power"
+    "power",
+    "screen"
   ],
   "categories": [
     "connectivity",
diff --git a/icons/smartphone-nfc.json b/icons/smartphone-nfc.json
index b619ade88..35e152760 100644
--- a/icons/smartphone-nfc.json
+++ b/icons/smartphone-nfc.json
@@ -3,7 +3,8 @@
   "tags": [
     "contactless",
     "payment",
-    "near-field communication"
+    "near-field communication",
+    "screen"
   ],
   "categories": [
     "communication",
diff --git a/icons/smartphone.json b/icons/smartphone.json
index 06ffde391..1c2ff542c 100644
--- a/icons/smartphone.json
+++ b/icons/smartphone.json
@@ -3,7 +3,8 @@
   "tags": [
     "phone",
     "cellphone",
-    "device"
+    "device",
+    "screen"
   ],
   "categories": [
     "connectivity",
diff --git a/icons/vibrate-off.json b/icons/vibrate-off.json
index 11ee4f0e2..03789c841 100644
--- a/icons/vibrate-off.json
+++ b/icons/vibrate-off.json
@@ -5,7 +5,8 @@
     "notification",
     "rumble",
     "haptic feedback",
-    "notifications"
+    "notifications",
+    "screen"
   ],
   "categories": [
     "devices",
diff --git a/icons/vibrate.json b/icons/vibrate.json
index 705e4056b..3aacecafb 100644
--- a/icons/vibrate.json
+++ b/icons/vibrate.json
@@ -4,7 +4,8 @@
     "smartphone",
     "notification",
     "rumble",
-    "haptic feedback"
+    "haptic feedback",
+    "screen"
   ],
   "categories": [
     "devices",