diff --git a/icons/angry.json b/icons/face-angry.json
similarity index 52%
rename from icons/angry.json
rename to icons/face-angry.json
index 178069075..b05521ac3 100644
--- a/icons/angry.json
+++ b/icons/face-angry.json
@@ -6,12 +6,23 @@
   ],
   "use-cases": [],
   "tags": [
-    "emoji",
     "anger",
-    "face",
+    "rage",
+    "fury",
+    "resentment",
+    "irritation",
+    "disgust",
+    "emoji",
     "emotion"
   ],
   "categories": [
     "emoji"
+  ],
+  "aliases": [
+    {
+      "name": "angry",
+      "deprecated": true,
+      "deprecationReason": "alias.name"
+    }
   ]
 }
diff --git a/icons/laugh.svg b/icons/face-angry.svg
similarity index 60%
rename from icons/laugh.svg
rename to icons/face-angry.svg
index 41b443c7f..b7c18de72 100644
--- a/icons/laugh.svg
+++ b/icons/face-angry.svg
@@ -9,8 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
+  <path d="M15 11V9.416" />
+  <path d="M17 9a5 5 0 00-3 1" />
+  <path d="M7 9a5 5 0 013 1" />
+  <path d="M9 11V9.416" />
+  <path d="M9 16a5 5 0 016.001 0" />
   <circle cx="12" cy="12" r="10" />
-  <path d="M18 13a6 6 0 0 1-6 5 6 6 0 0 1-6-5h12Z" />
-  <line x1="9" x2="9.01" y1="9" y2="9" />
-  <line x1="15" x2="15.01" y1="9" y2="9" />
 </svg>
diff --git a/icons/annoyed.json b/icons/face-expressionless.json
similarity index 53%
rename from icons/annoyed.json
rename to icons/face-expressionless.json
index b38f2e28e..a01567e4b 100644
--- a/icons/annoyed.json
+++ b/icons/face-expressionless.json
@@ -5,12 +5,21 @@
   ],
   "use-cases": [],
   "tags": [
-    "emoji",
     "nuisance",
-    "face",
+    "annoyed",
+    "annoyance",
+    "frustration",
+    "emoji",
     "emotion"
   ],
   "categories": [
     "emoji"
+  ],
+  "aliases": [
+    {
+      "name": "annoyed",
+      "deprecated": true,
+      "deprecationReason": "alias.name"
+    }
   ]
 }
diff --git a/icons/annoyed.svg b/icons/face-expressionless.svg
similarity index 77%
rename from icons/annoyed.svg
rename to icons/face-expressionless.svg
index 3279b6621..a10550bbb 100644
--- a/icons/annoyed.svg
+++ b/icons/face-expressionless.svg
@@ -9,8 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
+  <path d="M14 10h2" />
+  <path d="M8 10h2" />
+  <path d="M8 16h8" />
   <circle cx="12" cy="12" r="10" />
-  <path d="M8 15h8" />
-  <path d="M8 9h2" />
-  <path d="M14 9h2" />
 </svg>
diff --git a/icons/face-grinning.json b/icons/face-grinning.json
new file mode 100644
index 000000000..d90e6de32
--- /dev/null
+++ b/icons/face-grinning.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "karsa-mistmere",
+    "ericfennis"
+  ],
+  "use-cases": [],
+  "tags": [
+    "happy",
+    "happiness",
+    "good",
+    "laugh",
+    "broad smile",
+    "pleasure",
+    "good cheer",
+    "humour",
+    "funny",
+    "emoji",
+    "emotion"
+  ],
+  "categories": [
+    "emoji"
+  ],
+  "aliases": [
+    {
+      "name": "laugh",
+      "deprecated": true,
+      "deprecationReason": "alias.name"
+    }
+  ]
+}
diff --git a/icons/angry.svg b/icons/face-grinning.svg
similarity index 62%
rename from icons/angry.svg
rename to icons/face-grinning.svg
index 41e4361ad..ada21a91b 100644
--- a/icons/angry.svg
+++ b/icons/face-grinning.svg
@@ -9,10 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
+  <path d="M15 10V9" />
+  <path d="M7.084 14.302a5.12 5.12 0 009.833 0 .24.24 0 00-.235-.302H7.32a.24.24 0 00-.235.302" />
+  <path d="M9 10V9" />
   <circle cx="12" cy="12" r="10" />
-  <path d="M16 16s-1.5-2-4-2-4 2-4 2" />
-  <path d="M7.5 8 10 9" />
-  <path d="m14 9 2.5-1" />
-  <path d="M9 10h.01" />
-  <path d="M15 10h.01" />
 </svg>
diff --git a/icons/face-neutral.json b/icons/face-neutral.json
new file mode 100644
index 000000000..abbf36413
--- /dev/null
+++ b/icons/face-neutral.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "colebemis",
+    "csandman",
+    "mittalyashu",
+    "ericfennis"
+  ],
+  "use-cases": [],
+  "tags": [
+    "emoji",
+    "neutral",
+    "emotion",
+    "meh",
+    "blank stare",
+    "social masking",
+    "irritation",
+    "concern",
+    "deadpan"
+  ],
+  "categories": [
+    "emoji"
+  ],
+  "aliases": [
+    {
+      "name": "meh",
+      "deprecated": true,
+      "deprecationReason": "alias.name"
+    }
+  ]
+}
diff --git a/icons/smile.svg b/icons/face-neutral.svg
similarity index 66%
rename from icons/smile.svg
rename to icons/face-neutral.svg
index 59e020763..afa79b090 100644
--- a/icons/smile.svg
+++ b/icons/face-neutral.svg
@@ -9,8 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
+  <path d="M15 10V9" />
+  <path d="M8 16h8" />
+  <path d="M9 10V9" />
   <circle cx="12" cy="12" r="10" />
-  <path d="M8 14s1.5 2 4 2 4-2 4-2" />
-  <line x1="9" x2="9.01" y1="9" y2="9" />
-  <line x1="15" x2="15.01" y1="9" y2="9" />
 </svg>
diff --git a/icons/frown.json b/icons/face-slightly-frowning.json
similarity index 56%
rename from icons/frown.json
rename to icons/face-slightly-frowning.json
index 39d33df13..3fc21e638 100644
--- a/icons/frown.json
+++ b/icons/face-slightly-frowning.json
@@ -9,13 +9,21 @@
   "use-cases": [],
   "tags": [
     "emoji",
-    "face",
     "bad",
-    "sad",
-    "emotion"
+    "sadness",
+    "emotion",
+    "concern",
+    "disappointment"
   ],
   "categories": [
     "emoji",
     "account"
+  ],
+  "aliases": [
+    {
+      "name": "frown",
+      "deprecated": true,
+      "deprecationReason": "alias.name"
+    }
   ]
 }
diff --git a/icons/frown.svg b/icons/face-slightly-frowning.svg
similarity index 65%
rename from icons/frown.svg
rename to icons/face-slightly-frowning.svg
index 370dbc736..61c813289 100644
--- a/icons/frown.svg
+++ b/icons/face-slightly-frowning.svg
@@ -9,8 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
+  <path d="M15 10V9" />
+  <path d="M9 10V9" />
+  <path d="M9 16a5 5 0 016 0" />
   <circle cx="12" cy="12" r="10" />
-  <path d="M16 16s-1.5-2-4-2-4 2-4 2" />
-  <line x1="9" x2="9.01" y1="9" y2="9" />
-  <line x1="15" x2="15.01" y1="9" y2="9" />
 </svg>
diff --git a/icons/smile-plus.json b/icons/face-slightly-smiling-plus.json
similarity index 64%
rename from icons/smile-plus.json
rename to icons/face-slightly-smiling-plus.json
index faa6caa98..5641fbcc2 100644
--- a/icons/smile-plus.json
+++ b/icons/face-slightly-smiling-plus.json
@@ -6,19 +6,26 @@
   ],
   "use-cases": [],
   "tags": [
-    "emoji",
-    "face",
+    "smile",
     "happy",
     "good",
-    "emotion",
     "react",
     "reaction",
-    "add"
+    "emoji",
+    "add",
+    "emotion"
   ],
   "categories": [
     "emoji",
     "social",
     "notifications",
     "communication"
+  ],
+  "aliases": [
+    {
+      "name": "smile-plus",
+      "deprecated": true,
+      "deprecationReason": "alias.name"
+    }
   ]
 }
diff --git a/icons/smile-plus.svg b/icons/face-slightly-smiling-plus.svg
similarity index 60%
rename from icons/smile-plus.svg
rename to icons/face-slightly-smiling-plus.svg
index 47bbf6b0f..3c58cc0b2 100644
--- a/icons/smile-plus.svg
+++ b/icons/face-slightly-smiling-plus.svg
@@ -9,10 +9,10 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M22 11v1a10 10 0 1 1-9-10" />
-  <path d="M8 14s1.5 2 4 2 4-2 4-2" />
-  <line x1="9" x2="9.01" y1="9" y2="9" />
-  <line x1="15" x2="15.01" y1="9" y2="9" />
+  <path d="M13.267 2.08a10 10 0 108.653 8.653" />
+  <path d="M15 10V9" />
   <path d="M16 5h6" />
+  <path d="M16.472 15a6 6 0 01-8.943 0" />
   <path d="M19 2v6" />
+  <path d="M9 10V9" />
 </svg>
diff --git a/icons/smile.json b/icons/face-slightly-smiling.json
similarity index 52%
rename from icons/smile.json
rename to icons/face-slightly-smiling.json
index b622e70e8..d083317e6 100644
--- a/icons/smile.json
+++ b/icons/face-slightly-smiling.json
@@ -8,14 +8,27 @@
   ],
   "use-cases": [],
   "tags": [
-    "emoji",
-    "face",
+    "smile",
     "happy",
+    "happiness",
     "good",
+    "positive",
+    "friendly",
+    "patronizing",
+    "passive aggressive",
+    "ironic",
+    "emoji",
     "emotion"
   ],
   "categories": [
     "emoji",
     "account"
+  ],
+  "aliases": [
+    {
+      "name": "smile",
+      "deprecated": true,
+      "deprecationReason": "alias.name"
+    }
   ]
 }
diff --git a/icons/meh.svg b/icons/face-slightly-smiling.svg
similarity index 65%
rename from icons/meh.svg
rename to icons/face-slightly-smiling.svg
index 78ac8d1e2..750065b43 100644
--- a/icons/meh.svg
+++ b/icons/face-slightly-smiling.svg
@@ -9,8 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
+  <path d="M15 10V9" />
+  <path d="M16.472 15a6 6 0 01-8.943 0" />
+  <path d="M9 10V9" />
   <circle cx="12" cy="12" r="10" />
-  <line x1="8" x2="16" y1="15" y2="15" />
-  <line x1="9" x2="9.01" y1="9" y2="9" />
-  <line x1="15" x2="15.01" y1="9" y2="9" />
 </svg>
diff --git a/icons/laugh.json b/icons/laugh.json
deleted file mode 100644
index 1c07dc1da..000000000
--- a/icons/laugh.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "$schema": "../icon.schema.json",
-  "contributors": [
-    "karsa-mistmere",
-    "ericfennis"
-  ],
-  "use-cases": [],
-  "tags": [
-    "emoji",
-    "face",
-    "happy",
-    "good",
-    "emotion"
-  ],
-  "categories": [
-    "emoji"
-  ]
-}
diff --git a/icons/meh.json b/icons/meh.json
deleted file mode 100644
index 8676a7377..000000000
--- a/icons/meh.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "$schema": "../icon.schema.json",
-  "contributors": [
-    "colebemis",
-    "csandman",
-    "mittalyashu",
-    "ericfennis"
-  ],
-  "use-cases": [],
-  "tags": [
-    "emoji",
-    "face",
-    "neutral",
-    "emotion"
-  ],
-  "categories": [
-    "emoji"
-  ]
-}