diff --git a/icons/circle-ellipsis.json b/icons/circle-ellipsis.json
index 1ed12b579..1fe5cf0d9 100644
--- a/icons/circle-ellipsis.json
+++ b/icons/circle-ellipsis.json
@@ -5,13 +5,29 @@
     "ericfennis"
   ],
   "tags": [
-    "pending",
     "ellipsis",
+    "et cetera",
+    "etc",
+    "loader",
+    "loading",
     "progress",
+    "pending",
+    "throbber",
+    "menu",
+    "options",
+    "operator",
+    "code",
+    "spread",
+    "rest",
     "…",
     "..."
   ],
   "categories": [
+    "layout",
+    "development",
     "shapes"
+  ],
+  "aliases": [
+    "circle-ellipsis"
   ]
 }
diff --git a/icons/more-vertical.json b/icons/ellipsis-vertical.json
similarity index 69%
rename from icons/more-vertical.json
rename to icons/ellipsis-vertical.json
index 3f3003ac1..2d93d6e40 100644
--- a/icons/more-vertical.json
+++ b/icons/ellipsis-vertical.json
@@ -4,11 +4,14 @@
     "colebemis"
   ],
   "tags": [
-    "ellipsis",
     "menu",
-    "options"
+    "options",
+    "..."
   ],
   "categories": [
     "layout"
+  ],
+  "aliases": [
+    "more-vertical"
   ]
 }
diff --git a/icons/more-vertical.svg b/icons/ellipsis-vertical.svg
similarity index 100%
rename from icons/more-vertical.svg
rename to icons/ellipsis-vertical.svg
diff --git a/icons/more-horizontal.json b/icons/ellipsis.json
similarity index 78%
rename from icons/more-horizontal.json
rename to icons/ellipsis.json
index 4e96c6c82..ec9f2ecb8 100644
--- a/icons/more-horizontal.json
+++ b/icons/ellipsis.json
@@ -4,14 +4,15 @@
     "colebemis"
   ],
   "tags": [
-    "ellipsis",
+    "et cetera",
+    "etc",
+    "loader",
+    "loading",
+    "progress",
+    "pending",
+    "throbber",
     "menu",
     "options",
-    "loading",
-    "loader",
-    "throber",
-    "etc",
-    "et cetera",
     "operator",
     "code",
     "coding",
@@ -23,5 +24,8 @@
   "categories": [
     "layout",
     "development"
+  ],
+  "aliases": [
+    "more-horizontal"
   ]
 }
diff --git a/icons/more-horizontal.svg b/icons/ellipsis.svg
similarity index 100%
rename from icons/more-horizontal.svg
rename to icons/ellipsis.svg
diff --git a/icons/form-input.json b/icons/form-input.json
deleted file mode 100644
index c8c2eb58b..000000000
--- a/icons/form-input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "$schema": "../icon.schema.json",
-  "contributors": [
-    "mittalyashu",
-    "ericfennis"
-  ],
-  "tags": [
-    "2fa",
-    "authenticate",
-    "login",
-    "field",
-    "text"
-  ],
-  "categories": [
-    "text"
-  ]
-}
diff --git a/icons/rectangle-ellipsis.json b/icons/rectangle-ellipsis.json
new file mode 100644
index 000000000..f3a56e9e7
--- /dev/null
+++ b/icons/rectangle-ellipsis.json
@@ -0,0 +1,39 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "mittalyashu",
+    "ericfennis"
+  ],
+  "tags": [
+    "login",
+    "password",
+    "authenticate",
+    "2fa",
+    "field",
+    "fill",
+    "ellipsis",
+    "et cetera",
+    "etc",
+    "loader",
+    "loading",
+    "progress",
+    "pending",
+    "throbber",
+    "menu",
+    "options",
+    "operator",
+    "code",
+    "spread",
+    "rest",
+    "…",
+    "..."
+  ],
+  "categories": [
+    "text",
+    "development",
+    "shapes"
+  ],
+  "aliases": [
+    "form-input"
+  ]
+}
diff --git a/icons/form-input.svg b/icons/rectangle-ellipsis.svg
similarity index 100%
rename from icons/form-input.svg
rename to icons/rectangle-ellipsis.svg