diff --git a/icons/user-square.json b/icons/circle-user-round.json
similarity index 82%
rename from icons/user-square.json
rename to icons/circle-user-round.json
index 3278267ce..a358c090c 100644
--- a/icons/user-square.json
+++ b/icons/circle-user-round.json
@@ -11,5 +11,8 @@
   "categories": [
     "account",
     "shapes"
+  ],
+  "aliases": [
+    "user-circle-2"
   ]
 }
\ No newline at end of file
diff --git a/icons/user-circle-2.svg b/icons/circle-user-round.svg
similarity index 100%
rename from icons/user-circle-2.svg
rename to icons/circle-user-round.svg
diff --git a/icons/user-square-2.json b/icons/circle-user.json
similarity index 82%
rename from icons/user-square-2.json
rename to icons/circle-user.json
index 3278267ce..2187471de 100644
--- a/icons/user-square-2.json
+++ b/icons/circle-user.json
@@ -11,5 +11,8 @@
   "categories": [
     "account",
     "shapes"
+  ],
+  "aliases": [
+    "user-circle"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/user-circle.svg b/icons/circle-user.svg
similarity index 100%
rename from icons/user-circle.svg
rename to icons/circle-user.svg
diff --git a/icons/user-circle-2.json b/icons/square-user-round.json
similarity index 82%
rename from icons/user-circle-2.json
rename to icons/square-user-round.json
index 3278267ce..628284006 100644
--- a/icons/user-circle-2.json
+++ b/icons/square-user-round.json
@@ -11,5 +11,8 @@
   "categories": [
     "account",
     "shapes"
+  ],
+  "aliases": [
+    "user-square-2"
   ]
 }
\ No newline at end of file
diff --git a/icons/user-square-2.svg b/icons/square-user-round.svg
similarity index 100%
rename from icons/user-square-2.svg
rename to icons/square-user-round.svg
diff --git a/icons/user-circle.json b/icons/square-user.json
similarity index 82%
rename from icons/user-circle.json
rename to icons/square-user.json
index 3278267ce..18379762a 100644
--- a/icons/user-circle.json
+++ b/icons/square-user.json
@@ -11,5 +11,8 @@
   "categories": [
     "account",
     "shapes"
+  ],
+  "aliases": [
+    "user-square"
   ]
-}
\ No newline at end of file
+}
diff --git a/icons/user-square.svg b/icons/square-user.svg
similarity index 100%
rename from icons/user-square.svg
rename to icons/square-user.svg
diff --git a/icons/user-cog-2.svg b/icons/user-cog-2.svg
deleted file mode 100644
index d31884ee6..000000000
--- a/icons/user-cog-2.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <circle cx="18" cy="15" r="3" />
-  <circle cx="8" cy="9" r="4" />
-  <path d="M10.5 13.5A6 6 0 0 0 2 19" />
-  <path d="m21.7 16.4-.9-.3" />
-  <path d="m15.2 13.9-.9-.3" />
-  <path d="m16.6 18.7.3-.9" />
-  <path d="m19.1 12.2.3-.9" />
-  <path d="m19.6 18.7-.4-1" />
-  <path d="m16.8 12.3-.4-1" />
-  <path d="m14.3 16.6 1-.4" />
-  <path d="m20.7 13.8 1-.4" />
-</svg>
diff --git a/icons/user-plus-2.svg b/icons/user-plus-2.svg
deleted file mode 100644
index 5cb7cc060..000000000
--- a/icons/user-plus-2.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M14 19a6 6 0 0 0-12 0" />
-  <circle cx="8" cy="9" r="4" />
-  <line x1="19" x2="19" y1="8" y2="14" />
-  <line x1="22" x2="16" y1="11" y2="11" />
-</svg>
diff --git a/icons/user-check-2.json b/icons/user-round-check.json
similarity index 85%
rename from icons/user-check-2.json
rename to icons/user-round-check.json
index c2bf5b2ba..09b9fe2ad 100644
--- a/icons/user-check-2.json
+++ b/icons/user-round-check.json
@@ -14,5 +14,8 @@
   ],
   "categories": [
     "account"
+  ],
+  "aliases": [
+    "user-check-2"
   ]
 }
\ No newline at end of file
diff --git a/icons/user-check-2.svg b/icons/user-round-check.svg
similarity index 65%
rename from icons/user-check-2.svg
rename to icons/user-round-check.svg
index 01e962013..dbd78b850 100644
--- a/icons/user-check-2.svg
+++ b/icons/user-round-check.svg
@@ -9,7 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M14 19a6 6 0 0 0-12 0" />
-  <circle cx="8" cy="9" r="4" />
-  <polyline points="16 11 18 13 22 9" />
+  <path d="M2 21a8 8 0 0 1 13.292-6" />
+  <circle cx="10" cy="8" r="5" />
+  <path d="m16 19 2 2 4-4" />
 </svg>
diff --git a/icons/user-cog-2.json b/icons/user-round-cog.json
similarity index 83%
rename from icons/user-cog-2.json
rename to icons/user-round-cog.json
index 05a65b43b..81da30262 100644
--- a/icons/user-cog-2.json
+++ b/icons/user-round-cog.json
@@ -11,5 +11,8 @@
   ],
   "categories": [
     "account"
+  ],
+  "aliases": [
+    "user-cog-2"
   ]
 }
\ No newline at end of file
diff --git a/icons/user-round-cog.svg b/icons/user-round-cog.svg
new file mode 100644
index 000000000..0876c0ea5
--- /dev/null
+++ b/icons/user-round-cog.svg
@@ -0,0 +1,23 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M2 21a8 8 0 0 1 10.434-7.62" />
+  <circle cx="10" cy="8" r="5" />
+  <circle cx="18" cy="18" r="3" />
+  <path d="m19.5 14.3-.4.9" />
+  <path d="m16.9 20.8-.4.9" />
+  <path d="m21.7 19.5-.9-.4" />
+  <path d="m15.2 16.9-.9-.4" />
+  <path d="m21.7 16.5-.9.4" />
+  <path d="m15.2 19.1-.9.4" />
+  <path d="m19.5 21.7-.4-.9" />
+  <path d="m16.9 15.2-.4-.9" />
+</svg>
diff --git a/icons/user-minus-2.json b/icons/user-round-minus.json
similarity index 83%
rename from icons/user-minus-2.json
rename to icons/user-round-minus.json
index 09a320045..d5b43582b 100644
--- a/icons/user-minus-2.json
+++ b/icons/user-round-minus.json
@@ -11,5 +11,8 @@
   ],
   "categories": [
     "account"
+  ],
+  "aliases": [
+    "user-minus-2"
   ]
 }
\ No newline at end of file
diff --git a/icons/user-minus-2.svg b/icons/user-round-minus.svg
similarity index 64%
rename from icons/user-minus-2.svg
rename to icons/user-round-minus.svg
index b38777a24..c9987de02 100644
--- a/icons/user-minus-2.svg
+++ b/icons/user-round-minus.svg
@@ -9,7 +9,7 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M14 19a6 6 0 0 0-12 0" />
-  <circle cx="8" cy="9" r="4" />
-  <line x1="22" x2="16" y1="11" y2="11" />
+  <path d="M2 21a8 8 0 0 1 13.292-6" />
+  <circle cx="10" cy="8" r="5" />
+  <path d="M22 19h-6" />
 </svg>
diff --git a/icons/user-plus-2.json b/icons/user-round-plus.json
similarity index 84%
rename from icons/user-plus-2.json
rename to icons/user-round-plus.json
index df57e1a7a..76b84100e 100644
--- a/icons/user-plus-2.json
+++ b/icons/user-round-plus.json
@@ -12,5 +12,8 @@
   ],
   "categories": [
     "account"
+  ],
+  "aliases": [
+    "user-plus-2"
   ]
 }
\ No newline at end of file
diff --git a/icons/users-2.svg b/icons/user-round-plus.svg
similarity index 62%
rename from icons/users-2.svg
rename to icons/user-round-plus.svg
index a61d622db..d161a5d09 100644
--- a/icons/users-2.svg
+++ b/icons/user-round-plus.svg
@@ -9,7 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <path d="M14 19a6 6 0 0 0-12 0" />
-  <circle cx="8" cy="9" r="4" />
-  <path d="M22 19a6 6 0 0 0-6-6 4 4 0 1 0 0-8" />
+  <path d="M2 21a8 8 0 0 1 13.292-6" />
+  <circle cx="10" cy="8" r="5" />
+  <path d="M19 16v6" />
+  <path d="M22 19h-6" />
 </svg>
diff --git a/icons/user-x-2.json b/icons/user-round-x.json
similarity index 86%
rename from icons/user-x-2.json
rename to icons/user-round-x.json
index 744684e67..4dff279fc 100644
--- a/icons/user-x-2.json
+++ b/icons/user-round-x.json
@@ -12,5 +12,8 @@
   ],
   "categories": [
     "account"
+  ],
+  "aliases": [
+    "user-x-2"
   ]
 }
\ No newline at end of file
diff --git a/icons/user-round-x.svg b/icons/user-round-x.svg
new file mode 100644
index 000000000..53dd7c79a
--- /dev/null
+++ b/icons/user-round-x.svg
@@ -0,0 +1,16 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M2 21a8 8 0 0 1 11.873-7" />
+  <circle cx="10" cy="8" r="5" />
+  <path d="m17 17 5 5" />
+  <path d="m22 17-5 5" />
+</svg>
diff --git a/icons/user-2.json b/icons/user-round.json
similarity index 84%
rename from icons/user-2.json
rename to icons/user-round.json
index 5fec047a2..524b80b6e 100644
--- a/icons/user-2.json
+++ b/icons/user-round.json
@@ -10,5 +10,8 @@
   ],
   "categories": [
     "account"
+  ],
+  "aliases": [
+    "user-2"
   ]
 }
\ No newline at end of file
diff --git a/icons/user-2.svg b/icons/user-round.svg
similarity index 86%
rename from icons/user-2.svg
rename to icons/user-round.svg
index 41d09483a..5f27e339c 100644
--- a/icons/user-2.svg
+++ b/icons/user-round.svg
@@ -10,5 +10,5 @@
   stroke-linejoin="round"
 >
   <circle cx="12" cy="8" r="5" />
-  <path d="M20 21a8 8 0 1 0-16 0" />
+  <path d="M20 21a8 8 0 0 0-16 0" />
 </svg>
diff --git a/icons/user-x-2.svg b/icons/user-x-2.svg
deleted file mode 100644
index cab0457f2..000000000
--- a/icons/user-x-2.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M14 19a6 6 0 0 0-12 0" />
-  <circle cx="8" cy="9" r="4" />
-  <line x1="17" x2="22" y1="8" y2="13" />
-  <line x1="22" x2="17" y1="8" y2="13" />
-</svg>
diff --git a/icons/users-2.json b/icons/users-round.json
similarity index 82%
rename from icons/users-2.json
rename to icons/users-round.json
index df69abdec..22823fd67 100644
--- a/icons/users-2.json
+++ b/icons/users-round.json
@@ -9,5 +9,8 @@
   ],
   "categories": [
     "account"
+  ],
+  "aliases": [
+    "users-2"
   ]
 }
\ No newline at end of file
diff --git a/icons/users-round.svg b/icons/users-round.svg
new file mode 100644
index 000000000..60fa609a5
--- /dev/null
+++ b/icons/users-round.svg
@@ -0,0 +1,15 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M18 21a8 8 0 0 0-16 0" />
+  <circle cx="10" cy="8" r="5" />
+  <path d="M22 20c0-3.37-2-6.5-4-8a5 5 0 0 0-.45-8.3" />
+</svg>