diff --git a/package-lock.json b/package-lock.json
index 817feab7..511b07a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,6 @@
             },
             "devDependencies": {
                 "@electron/rebuild": "^4.0.2",
-                "@element-plus/icons-vue": "^2.3.2",
                 "@eslint/js": "^9.39.2",
                 "@fontsource-variable/inter": "^5.2.8",
                 "@fontsource-variable/noto-sans-jp": "^5.2.9",
@@ -106,6 +105,7 @@
             "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@babel/code-frame": "^7.27.1",
                 "@babel/generator": "^7.28.5",
@@ -1263,7 +1263,6 @@
             "dev": true,
             "license": "BSD-2-Clause",
             "optional": true,
-            "peer": true,
             "dependencies": {
                 "cross-dirname": "^0.1.0",
                 "debug": "^4.3.4",
@@ -1285,7 +1284,6 @@
             "dev": true,
             "license": "MIT",
             "optional": true,
-            "peer": true,
             "dependencies": {
                 "graceful-fs": "^4.2.0",
                 "jsonfile": "^6.0.1",
@@ -1302,7 +1300,6 @@
             "dev": true,
             "license": "MIT",
             "optional": true,
-            "peer": true,
             "dependencies": {
                 "universalify": "^2.0.0"
             },
@@ -1317,7 +1314,6 @@
             "dev": true,
             "license": "MIT",
             "optional": true,
-            "peer": true,
             "engines": {
                 "node": ">= 10.0.0"
             }
@@ -5303,6 +5299,7 @@
             "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@types/lodash": "*"
             }
@@ -6047,6 +6044,7 @@
             "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -6080,6 +6078,7 @@
             "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.1",
                 "fast-json-stable-stringify": "^2.0.0",
@@ -6844,6 +6843,7 @@
                 }
             ],
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "baseline-browser-mapping": "^2.9.0",
                 "caniuse-lite": "^1.0.30001759",
@@ -7792,8 +7792,7 @@
             "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
             "dev": true,
             "license": "MIT",
-            "optional": true,
-            "peer": true
+            "optional": true
         },
         "node_modules/cross-env": {
             "version": "10.1.0",
@@ -8094,6 +8093,7 @@
             "integrity": "sha512-ce4Ogns4VMeisIuCSK0C62umG0lFy012jd8LMZ6w/veHUeX4fqfDrGe+HTWALAEwK6JwKP+dhPvizhArSOsFbg==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "app-builder-lib": "26.4.0",
                 "builder-util": "26.3.4",
@@ -8498,7 +8498,6 @@
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "@electron/asar": "^3.2.1",
                 "debug": "^4.1.1",
@@ -8519,7 +8518,6 @@
             "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "graceful-fs": "^4.1.2",
                 "jsonfile": "^4.0.0",
@@ -8677,7 +8675,8 @@
             "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.6.0.tgz",
             "integrity": "sha512-SjWyZBHJPbqxHOzckOfo8lHisEaJWmwd23XppYFYVh10bU66/Pn5tkVkbkCMZVdbUE5eTCI2nD8OyIP4Z+uwkA==",
             "dev": true,
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/embla-carousel-reactive-utils": {
             "version": "8.6.0",
@@ -8723,17 +8722,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/encoding": {
-            "version": "0.1.13",
-            "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-            "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "iconv-lite": "^0.6.2"
-            }
-        },
         "node_modules/end-of-stream": {
             "version": "1.4.5",
             "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
@@ -8862,6 +8850,7 @@
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "esbuild": "bin/esbuild"
             },
@@ -8941,6 +8930,7 @@
             "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.8.0",
                 "@eslint-community/regexpp": "^4.12.1",
@@ -9001,6 +8991,7 @@
             "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "eslint-config-prettier": "bin/cli.js"
             },
@@ -13470,14 +13461,16 @@
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
             "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
             "dev": true,
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/lodash-es": {
             "version": "4.17.21",
             "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
             "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
             "dev": true,
-            "license": "MIT"
+            "license": "MIT",
+            "peer": true
         },
         "node_modules/lodash-unified": {
             "version": "1.0.3",
@@ -14703,6 +14696,7 @@
             "integrity": "sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@vue/devtools-api": "^7.7.7"
             },
@@ -14873,7 +14867,6 @@
             "dev": true,
             "license": "MIT",
             "optional": true,
-            "peer": true,
             "dependencies": {
                 "commander": "^9.4.0"
             },
@@ -14891,7 +14884,6 @@
             "dev": true,
             "license": "MIT",
             "optional": true,
-            "peer": true,
             "engines": {
                 "node": "^12.20.0 || >=14"
             }
@@ -14912,6 +14904,7 @@
             "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "bin": {
                 "prettier": "bin/prettier.cjs"
             },
@@ -15355,7 +15348,6 @@
             "deprecated": "Rimraf versions prior to v4 are no longer supported",
             "dev": true,
             "license": "ISC",
-            "peer": true,
             "dependencies": {
                 "glob": "^7.1.3"
             },
@@ -15370,7 +15362,6 @@
             "deprecated": "Glob versions prior to v9 are no longer supported",
             "dev": true,
             "license": "ISC",
-            "peer": true,
             "dependencies": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -15392,7 +15383,6 @@
             "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
             "dev": true,
             "license": "ISC",
-            "peer": true,
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -17230,7 +17220,6 @@
             "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "mkdirp": "^0.5.1",
                 "rimraf": "~2.6.2"
@@ -17294,7 +17283,6 @@
             "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
             "dev": true,
             "license": "MIT",
-            "peer": true,
             "dependencies": {
                 "minimist": "^1.2.6"
             },
@@ -17413,6 +17401,7 @@
             "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=12"
             },
@@ -17971,6 +17960,7 @@
             "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "esbuild": "^0.27.0",
                 "fdir": "^6.5.0",
@@ -18064,6 +18054,7 @@
             "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "engines": {
                 "node": ">=12"
             },
@@ -18077,6 +18068,7 @@
             "integrity": "sha512-SJ/NTccVyAoNUJmkM9KUqPcYlY+u8OVL1X5EW9RIs3ch5H2uERxyyIUI4MRxVCSOiEcupX9xNGde1tL9ZKpimA==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "dependencies": {
                 "@vue/compiler-dom": "3.5.26",
                 "@vue/compiler-sfc": "3.5.26",
@@ -18697,6 +18689,7 @@
             "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
             "dev": true,
             "license": "MIT",
+            "peer": true,
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
diff --git a/package.json b/package.json
index ba92f322..c85af7b3 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
     "homepage": "https://github.com/vrcx-team/VRCX#readme",
     "devDependencies": {
         "@electron/rebuild": "^4.0.2",
-        "@element-plus/icons-vue": "^2.3.2",
         "@eslint/js": "^9.39.2",
         "@fontsource-variable/inter": "^5.2.8",
         "@fontsource-variable/noto-sans-jp": "^5.2.9",
@@ -182,4 +181,4 @@
         "hazardous": "^0.3.0",
         "node-api-dotnet": "^0.9.18"
     }
-}
+}
\ No newline at end of file
diff --git a/src/app.css b/src/app.css
index 14f2a2f0..74897435 100644
--- a/src/app.css
+++ b/src/app.css
@@ -843,7 +843,7 @@ html.dark .x-friend-item > .detail > .extra,
     background: var(--color-zinc-300);
 }
 
-.el-icon.is-loading {
+.lucide.is-loading {
     animation: rotating 2s linear infinite;
 }
 
@@ -980,11 +980,11 @@ hr.x-vertical-divider {
     overflow: hidden auto;
 }
 
-.x-friend-group > .el-icon-arrow-right {
+.x-friend-group > .rotation-transition {
     transition: transform 0.3s;
 }
 
-.x-friend-group > .el-icon-arrow-right.rotate {
+.x-friend-group > .rotation-transition.is-rotated {
     transform: rotate(90deg);
 }
 
diff --git a/src/components/FullscreenImagePreview.vue b/src/components/FullscreenImagePreview.vue
index 43ab730e..99a178e5 100644
--- a/src/components/FullscreenImagePreview.vue
+++ b/src/components/FullscreenImagePreview.vue
@@ -18,25 +18,21 @@
             @load="handleImageLoad"
             @close="closeDialog">
             <template #toolbar="{ actions }">
-                <el-icon @click="copyImageToClipboard(fullscreenImageDialog.imageUrl)" class="toolbar-icon">
-                    <CopyDocument />
-                </el-icon>
-                <el-icon
+                <Copy @click="copyImageToClipboard(fullscreenImageDialog.imageUrl)" class="toolbar-icon" />
+                <Download 
                     @click="downloadAndSaveImage(fullscreenImageDialog.imageUrl, fullscreenImageDialog.fileName)"
-                    class="toolbar-icon">
-                    <Download />
-                </el-icon>
-                <el-icon @click="actions('zoomOut')" class="toolbar-icon"><ZoomOut /></el-icon>
-                <el-icon @click="actions('zoomIn')" class="toolbar-icon"><ZoomIn /></el-icon>
-                <el-icon @click="actions('clockwise')" class="toolbar-icon"><RefreshRight /></el-icon>
-                <el-icon @click="actions('anticlockwise')" class="toolbar-icon"><RefreshLeft /></el-icon>
+                    class="toolbar-icon" />
+                <ZoomOut @click="actions('zoomOut')" class="toolbar-icon" />
+                <ZoomIn @click="actions('zoomIn')" class="toolbar-icon" />
+                <RotateCw @click="actions('clockwise')" class="toolbar-icon" />
+                <RotateCcw @click="actions('anticlockwise')" class="toolbar-icon" />
             </template>
         </el-image>
     </div>
 </template>
 
 <script setup>
-    import { CopyDocument, Download, RefreshLeft, RefreshRight, ZoomIn, ZoomOut } from '@element-plus/icons-vue';
+    import { Copy, Download, RotateCcw, RotateCw, ZoomIn, ZoomOut } from 'lucide-vue-next';
     import { nextTick, ref, watch } from 'vue';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
diff --git a/src/components/InstanceInfo.vue b/src/components/InstanceInfo.vue
index f27f94c8..4be7d0dd 100644
--- a/src/components/InstanceInfo.vue
+++ b/src/components/InstanceInfo.vue
@@ -40,7 +40,7 @@
                     </template>
                 </div>
             </template>
-            <el-icon><CaretBottom /></el-icon>
+            <ChevronDown />
         </TooltipWrapper>
         <span v-if="props.location === locationStore.lastLocation.location" style="margin-left: 5px"
             >{{ locationStore.lastLocation.playerList.size }}/{{ props.instance.capacity }}</span
@@ -66,7 +66,7 @@
 <script setup>
     import { reactive, watch } from 'vue';
     import { Button } from '@/components/ui/button';
-    import { CaretBottom } from '@element-plus/icons-vue';
+    import { ChevronDown } from 'lucide-vue-next';
     import { toast } from 'vue-sonner';
     import { useI18n } from 'vue-i18n';
 
@@ -128,7 +128,7 @@
     function closeInstance(location) {
         modalStore
             .confirm({
-                description: 'Continue? Close Instance, nobody will be able to join',
+                description: 'Continue? X Instance, nobody will be able to join',
                 title: 'Confirm'
             })
             .then(async ({ ok }) => {
diff --git a/src/components/Launch.vue b/src/components/Launch.vue
index 15c7b319..ec1b2d3b 100644
--- a/src/components/Launch.vue
+++ b/src/components/Launch.vue
@@ -2,18 +2,19 @@
     <div v-if="isVisible" class="inline-block">
         <TooltipWrapper side="top" :content="t('dialog.user.info.launch_invite_tooltip')"
             ><Button
-                class="rounded-full w-6 h-6 text-xs text-muted-foreground hover:text-foreground"
-                size="icon"
+                class="rounded-full w-6 h-6 text-muted-foreground hover:text-foreground"
+                size="icon-sm"
                 variant="outline"
                 @click="confirm"
-                ><i class="ri-login-box-line"></i
-            ></Button>
+                ><Star />
+            </Button>
         </TooltipWrapper>
     </div>
 </template>
 
 <script setup>
     import { Button } from '@/components/ui/button';
+    import { Star } from 'lucide-vue-next';
     import { computed } from 'vue';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/components/Location.vue b/src/components/Location.vue
index 5b9c6125..6515a3b7 100644
--- a/src/components/Location.vue
+++ b/src/components/Location.vue
@@ -12,7 +12,7 @@
                     :class="['x-location', { 'x-link': link && location !== 'private' && location !== 'offline' }]"
                     class="inline-flex min-w-0 flex-nowrap items-center overflow-hidden"
                     @click="handleShowWorldDialog">
-                    <el-icon :class="['is-loading']" class="mr-1" v-if="isTraveling"><Loading /></el-icon>
+                    <Loader2 :class="['is-loading']" class="mr-1" v-if="isTraveling" />
                     <span class="min-w-0 truncate">{{ text }}</span>
                     <span v-if="showInstanceIdInLocation && instanceName" class="ml-1 whitespace-nowrap">{{
                         ` · #${instanceName}`
@@ -23,15 +23,15 @@
                 </div>
             </TooltipWrapper>
             <TooltipWrapper v-if="isClosed" :content="t('dialog.user.info.instance_closed')">
-                <el-icon :class="['inline-block', 'ml-5']" style="color: lightcoral"><WarnTriangleFilled /></el-icon>
+                <AlertTriangle :class="['inline-block', 'ml-5']" style="color: lightcoral" />
             </TooltipWrapper>
-            <el-icon v-if="strict" :class="['inline-block', 'ml-5']"><Lock /></el-icon>
+            <Lock v-if="strict" :class="['inline-block', 'ml-5']" />
         </div>
     </div>
 </template>
 
 <script setup>
-    import { Loading, Lock, WarnTriangleFilled } from '@element-plus/icons-vue';
+    import { Loader2, Lock, AlertTriangle } from 'lucide-vue-next';
     import { onBeforeUnmount, ref, watch } from 'vue';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
diff --git a/src/components/LocationWorld.vue b/src/components/LocationWorld.vue
index 3996464a..dad29498 100644
--- a/src/components/LocationWorld.vue
+++ b/src/components/LocationWorld.vue
@@ -2,19 +2,19 @@
     <span class="x-location-world">
         <span v-if="region" :class="['flags', 'inline-block', 'mr-1.25', region]"></span>
         <span @click="showLaunchDialog" class="x-link">
-            <el-icon v-if="isUnlocked" :class="['inline-block', 'mr-1.25']"><Unlock /></el-icon>
+            <Unlock v-if="isUnlocked" :class="['inline-block', 'mr-1.25']" />
             <span> {{ accessTypeName }} #{{ instanceName }}</span>
         </span>
         <span v-if="groupName" @click="showGroupDialog" class="x-link">({{ groupName }})</span>
         <TooltipWrapper v-if="isClosed" :content="t('dialog.user.info.instance_closed')">
-            <el-icon :class="['inline-block', 'ml-5']" style="color: lightcoral"><WarnTriangleFilled /></el-icon>
+            <AlertTriangle :class="['inline-block', 'ml-5']" style="color: lightcoral" />
         </TooltipWrapper>
-        <el-icon v-if="strict" style="display: inline-block; margin-left: 5px"><Lock /></el-icon>
+        <Lock v-if="strict" style="display: inline-block; margin-left: 5px" />
     </span>
 </template>
 
 <script setup>
-    import { Lock, Unlock, WarnTriangleFilled } from '@element-plus/icons-vue';
+    import { Lock, Unlock, AlertTriangle } from 'lucide-vue-next';
     import { ref, watch } from 'vue';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
diff --git a/src/components/dialogs/AvatarDialog/AvatarDialog.vue b/src/components/dialogs/AvatarDialog/AvatarDialog.vue
index 47747940..d169dfc1 100644
--- a/src/components/dialogs/AvatarDialog/AvatarDialog.vue
+++ b/src/components/dialogs/AvatarDialog/AvatarDialog.vue
@@ -219,7 +219,7 @@
                                 variant="outline"
                                 :disabled="currentUser.currentAvatar === avatarDialog.id"
                                 @click="selectAvatarWithoutConfirmation(avatarDialog.id)">
-                                <CircleCheck
+                                <CheckCircle
                             /></Button>
                         </TooltipWrapper>
                         <DropdownMenu>
@@ -232,12 +232,12 @@
                                 </Button>
                             </DropdownMenuTrigger>
                             <DropdownMenuContent>
-                                <DropdownMenuItem @click="avatarDialogCommand('Refresh')">
-                                    <Refresh class="size-4" />
+                                <DropdownMenuItem @click="avatarDialogCommand('RefreshCw')">
+                                    <RefreshCw class="size-4" />
                                     {{ t('dialog.avatar.actions.refresh') }}
                                 </DropdownMenuItem>
-                                <DropdownMenuItem @click="avatarDialogCommand('Share')">
-                                    <Share class="size-4" />
+                                <DropdownMenuItem @click="avatarDialogCommand('Share2')">
+                                    <Share2 class="size-4" />
                                     {{ t('dialog.avatar.actions.share') }}
                                 </DropdownMenuItem>
                                 <DropdownMenuSeparator />
@@ -245,11 +245,11 @@
                                     v-if="avatarDialog.isBlocked"
                                     variant="destructive"
                                     @click="avatarDialogCommand('Unblock Avatar')">
-                                    <CircleCheck class="size-4" />
+                                    <CheckCircle class="size-4" />
                                     {{ t('dialog.avatar.actions.unblock') }}
                                 </DropdownMenuItem>
                                 <DropdownMenuItem v-else @click="avatarDialogCommand('Block Avatar')">
-                                    <CircleClose class="size-4" />
+                                    <XCircle class="size-4" />
                                     {{ t('dialog.avatar.actions.block') }}
                                 </DropdownMenuItem>
                                 <DropdownMenuItem
@@ -271,23 +271,23 @@
                                         {{ t('dialog.avatar.actions.make_public') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem @click="avatarDialogCommand('Rename')">
-                                        <Edit class="size-4" />
+                                        <Pencil class="size-4" />
                                         {{ t('dialog.avatar.actions.rename') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem @click="avatarDialogCommand('Change Description')">
-                                        <Edit class="size-4" />
+                                        <Pencil class="size-4" />
                                         {{ t('dialog.avatar.actions.change_description') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem @click="avatarDialogCommand('Change Content Tags')">
-                                        <Edit class="size-4" />
+                                        <Pencil class="size-4" />
                                         {{ t('dialog.avatar.actions.change_content_tags') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem @click="avatarDialogCommand('Change Styles and Author Tags')">
-                                        <Edit class="size-4" />
+                                        <Pencil class="size-4" />
                                         {{ t('dialog.avatar.actions.change_styles_author_tags') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem @click="avatarDialogCommand('Change Image')">
-                                        <Picture class="size-4" />
+                                        <Image class="size-4" />
                                         {{ t('dialog.avatar.actions.change_image') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem
@@ -301,22 +301,22 @@
                                         v-if="avatarDialog.hasImposter"
                                         variant="destructive"
                                         @click="avatarDialogCommand('Regenerate Imposter')">
-                                        <Refresh class="size-4" />
+                                        <RefreshCw class="size-4" />
                                         {{ t('dialog.avatar.actions.regenerate_impostor') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem
                                         v-if="avatarDialog.hasImposter"
                                         variant="destructive"
-                                        @click="avatarDialogCommand('Delete Imposter')">
-                                        <Delete class="size-4" />
+                                        @click="avatarDialogCommand('Trash2 Imposter')">
+                                        <Trash2 class="size-4" />
                                         {{ t('dialog.avatar.actions.delete_impostor') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem v-else @click="avatarDialogCommand('Create Imposter')">
                                         <User class="size-4" />
                                         {{ t('dialog.avatar.actions.create_impostor') }}
                                     </DropdownMenuItem>
-                                    <DropdownMenuItem variant="destructive" @click="avatarDialogCommand('Delete')">
-                                        <Delete class="size-4" />
+                                    <DropdownMenuItem variant="destructive" @click="avatarDialogCommand('Trash2')">
+                                        <Trash2 class="size-4" />
                                         {{ t('dialog.avatar.actions.delete') }}
                                     </DropdownMenuItem>
                                 </template>
@@ -468,7 +468,7 @@
                                 <span class="name"
                                     >{{ t('dialog.avatar.info.time_spent')
                                     }}<TooltipWrapper side="top" :content="t('dialog.world.info.accuracy_notice')">
-                                        <el-icon style="margin-left: 3px"><Warning /></el-icon> </TooltipWrapper
+                                        <AlertTriangle style="margin-left: 3px" /> </TooltipWrapper
                                 ></span>
 
                                 <span v-if="timeSpent === 0" class="extra">-</span>
@@ -522,18 +522,22 @@
 
 <script setup>
     import {
-        CircleClose,
-        Delete,
+        AlertTriangle,
+        Check,
+        CheckCircle,
         Download,
-        Edit,
-        Picture,
-        Refresh,
-        Share,
+        Ellipsis,
+        Image,
+        Pencil,
+        RefreshCcw,
+        RefreshCw,
+        Share2,
+        Star,
+        Trash2,
         Upload,
         User,
-        Warning
-    } from '@element-plus/icons-vue';
-    import { Check, CircleCheck, Ellipsis, RefreshCcw, Star, Trash2 } from 'lucide-vue-next';
+        XCircle
+    } from 'lucide-vue-next';
     import { Carousel, CarouselContent, CarouselItem, CarouselNext, CarouselPrevious } from '@/components/ui/carousel';
     import { computed, defineAsyncComponent, nextTick, ref, watch } from 'vue';
     import { Button } from '@/components/ui/button';
@@ -734,10 +738,10 @@
     function avatarDialogCommand(command) {
         const D = avatarDialog.value;
         switch (command) {
-            case 'Refresh':
+            case 'RefreshCw':
                 showAvatarDialog(D.id);
                 break;
-            case 'Share':
+            case 'Share2':
                 copyAvatarUrl(D.id);
                 break;
             case 'Rename':
@@ -770,7 +774,7 @@
                     .then(({ ok }) => {
                         if (!ok) return;
                         switch (command) {
-                            case 'Delete Favorite':
+                            case 'Trash2 Favorite':
                                 favoriteRequest.deleteFavorite({
                                     objectId: D.id
                                 });
@@ -839,7 +843,7 @@
                                         return args;
                                     });
                                 break;
-                            case 'Delete':
+                            case 'Trash2':
                                 avatarRequest
                                     .deleteAvatar({
                                         avatarId: D.id
@@ -863,7 +867,7 @@
                                         return args;
                                     });
                                 break;
-                            case 'Delete Imposter':
+                            case 'Trash2 Imposter':
                                 avatarRequest
                                     .deleteImposter({
                                         avatarId: D.id
diff --git a/src/components/dialogs/AvatarDialog/ChangeAvatarImageDialog.vue b/src/components/dialogs/AvatarDialog/ChangeAvatarImageDialog.vue
index 9ec27a78..1947de42 100644
--- a/src/components/dialogs/AvatarDialog/ChangeAvatarImageDialog.vue
+++ b/src/components/dialogs/AvatarDialog/ChangeAvatarImageDialog.vue
@@ -33,7 +33,7 @@
 
 <script setup>
     import { Button } from '@/components/ui/button';
-    import { Upload } from '@element-plus/icons-vue';
+    import { Upload } from 'lucide-vue-next';
     import { ref } from 'vue';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
diff --git a/src/components/dialogs/AvatarDialog/SetAvatarTagsDialog.vue b/src/components/dialogs/AvatarDialog/SetAvatarTagsDialog.vue
index 262a787b..6191b2bc 100644
--- a/src/components/dialogs/AvatarDialog/SetAvatarTagsDialog.vue
+++ b/src/components/dialogs/AvatarDialog/SetAvatarTagsDialog.vue
@@ -53,9 +53,7 @@
                 >{{ props.setAvatarTagsDialog.selectedAvatarIds.length }} /
                 {{ setAvatarTagsDialog.ownAvatars.length }}</span
             >
-            <el-icon v-if="setAvatarTagsDialog.loading" class="is-loading" style="margin-left: 5px"
-                ><Loading
-            /></el-icon>
+            <Loader2 v-if="setAvatarTagsDialog.loading" class="is-loading" style="margin-left: 5px" />
             <br />
             <div class="x-friend-list" style="margin-top: 10px; min-height: 60px; max-height: 280px">
                 <div
@@ -102,7 +100,7 @@
     import { Button } from '@/components/ui/button';
     import { Checkbox } from '@/components/ui/checkbox';
     import { InputGroupTextareaField } from '@/components/ui/input-group';
-    import { Loading } from '@element-plus/icons-vue';
+    import { Loader2 } from 'lucide-vue-next';
     import { toast } from 'vue-sonner';
     import { useI18n } from 'vue-i18n';
     import { watch } from 'vue';
diff --git a/src/components/dialogs/GroupDialog/GallerySelectDialog.vue b/src/components/dialogs/GroupDialog/GallerySelectDialog.vue
index 3889177a..f8cc5204 100644
--- a/src/components/dialogs/GroupDialog/GallerySelectDialog.vue
+++ b/src/components/dialogs/GroupDialog/GallerySelectDialog.vue
@@ -17,11 +17,11 @@
                 @change="onFileChangeGallery" />
             <ButtonGroup>
                 <Button variant="outline" size="sm" @click="selectImageGallerySelect('', '')">
-                    <Close />
+                    <X />
                     {{ t('dialog.gallery_select.none') }}
                 </Button>
                 <Button variant="outline" size="sm" @click="refreshGalleryTable">
-                    <Refresh />
+                    <RefreshCw />
                     {{ t('dialog.gallery_select.refresh') }}
                 </Button>
                 <Button
@@ -55,7 +55,7 @@
 </template>
 
 <script setup>
-    import { Close, Refresh, Upload } from '@element-plus/icons-vue';
+    import { X, RefreshCw, Upload } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { ButtonGroup } from '@/components/ui/button-group';
     import { storeToRefs } from 'pinia';
diff --git a/src/components/dialogs/GroupDialog/GroupDialog.vue b/src/components/dialogs/GroupDialog/GroupDialog.vue
index 256d041d..9b032ce7 100644
--- a/src/components/dialogs/GroupDialog/GroupDialog.vue
+++ b/src/components/dialogs/GroupDialog/GroupDialog.vue
@@ -161,7 +161,7 @@
                                         size="icon-lg"
                                         :disabled="groupDialog.ref.privacy === 'private'"
                                         @click="setGroupRepresentation(groupDialog.id)">
-                                        <StarFilled />
+                                        <Star />
                                     </Button>
                                 </span>
                             </TooltipWrapper>
@@ -174,7 +174,7 @@
                                         variant="outline"
                                         size="icon-lg"
                                         @click="cancelGroupRequest(groupDialog.id)">
-                                        <Close />
+                                        <X />
                                     </Button>
                                 </span>
                             </TooltipWrapper>
@@ -202,7 +202,7 @@
                                     variant="outline"
                                     size="icon-lg"
                                     @click="joinGroup(groupDialog.id)">
-                                    <Message />
+                                    <MessageSquare />
                                 </Button>
                             </TooltipWrapper>
                             <TooltipWrapper
@@ -211,7 +211,7 @@
                                 :content="t('dialog.group.actions.invite_required_tooltip')">
                                 <span>
                                     <Button class="rounded-full mr-2" variant="outline" size="icon-lg" disabled>
-                                        <Message />
+                                        <MessageSquare />
                                     </Button>
                                 </span>
                             </TooltipWrapper>
@@ -236,16 +236,16 @@
                                         groupDialog.ref.membershipStatus === 'userblocked' ? 'destructive' : 'outline'
                                     "
                                     size="icon-lg">
-                                    <MoreFilled />
+                                    <MoreHorizontal />
                                 </Button>
                             </DropdownMenuTrigger>
                             <DropdownMenuContent>
-                                <DropdownMenuItem @click="groupDialogCommand('Refresh')">
-                                    <Refresh class="size-4" />
+                                <DropdownMenuItem @click="groupDialogCommand('RefreshCw')">
+                                    <RefreshCw class="size-4" />
                                     {{ t('dialog.group.actions.refresh') }}
                                 </DropdownMenuItem>
-                                <DropdownMenuItem @click="groupDialogCommand('Share')">
-                                    <Share class="size-4" />
+                                <DropdownMenuItem @click="groupDialogCommand('Share2')">
+                                    <Share2 class="size-4" />
                                     {{ t('dialog.group.actions.share') }}
                                 </DropdownMenuItem>
                                 <template v-if="groupDialog.inGroup">
@@ -254,7 +254,7 @@
                                         <DropdownMenuItem
                                             v-if="groupDialog.ref.myMember.isSubscribedToAnnouncements"
                                             @click="groupDialogCommand('Unsubscribe To Announcements')">
-                                            <MuteNotification class="size-4" />
+                                            <BellOff class="size-4" />
                                             {{ t('dialog.group.actions.unsubscribe') }}
                                         </DropdownMenuItem>
                                         <DropdownMenuItem
@@ -266,41 +266,41 @@
                                         <DropdownMenuItem
                                             v-if="hasGroupPermission(groupDialog.ref, 'group-invites-manage')"
                                             @click="groupDialogCommand('Invite To Group')">
-                                            <Message class="size-4" />
+                                            <MessageSquare class="size-4" />
                                             {{ t('dialog.group.actions.invite_to_group') }}
                                         </DropdownMenuItem>
                                         <template
                                             v-if="hasGroupPermission(groupDialog.ref, 'group-announcement-manage')">
                                             <DropdownMenuItem @click="groupDialogCommand('Create Post')">
-                                                <Tickets class="size-4" />
+                                                <Ticket class="size-4" />
                                                 {{ t('dialog.group.actions.create_post') }}
                                             </DropdownMenuItem>
                                         </template>
                                         <DropdownMenuItem
                                             :disabled="!hasGroupModerationPermission(groupDialog.ref)"
                                             @click="groupDialogCommand('Moderation Tools')">
-                                            <Operation class="size-4" />
+                                            <Settings class="size-4" />
                                             {{ t('dialog.group.actions.moderation_tools') }}
                                         </DropdownMenuItem>
                                         <template
                                             v-if="groupDialog.ref.myMember && groupDialog.ref.privacy === 'default'">
                                             <DropdownMenuSeparator />
                                             <DropdownMenuItem @click="groupDialogCommand('Visibility Everyone')">
-                                                <View class="size-4" />
+                                                <Eye class="size-4" />
                                                 <Check
                                                     v-if="groupDialog.ref.myMember.visibility === 'visible'"
                                                     class="size-4" />
                                                 {{ t('dialog.group.actions.visibility_everyone') }}
                                             </DropdownMenuItem>
                                             <DropdownMenuItem @click="groupDialogCommand('Visibility Friends')">
-                                                <View class="size-4" />
+                                                <Eye class="size-4" />
                                                 <Check
                                                     v-if="groupDialog.ref.myMember.visibility === 'friends'"
                                                     class="size-4" />
                                                 {{ t('dialog.group.actions.visibility_friends') }}
                                             </DropdownMenuItem>
                                             <DropdownMenuItem @click="groupDialogCommand('Visibility Hidden')">
-                                                <View class="size-4" />
+                                                <Eye class="size-4" />
                                                 <Check
                                                     v-if="groupDialog.ref.myMember.visibility === 'hidden'"
                                                     class="size-4" />
@@ -311,7 +311,7 @@
                                         <DropdownMenuItem
                                             variant="destructive"
                                             @click="groupDialogCommand('Leave Group')">
-                                            <Delete class="size-4" />
+                                            <Trash2 class="size-4" />
                                             {{ t('dialog.group.actions.leave') }}
                                         </DropdownMenuItem>
                                     </template>
@@ -322,11 +322,11 @@
                                         v-if="groupDialog.ref.membershipStatus === 'userblocked'"
                                         variant="destructive"
                                         @click="groupDialogCommand('Unblock Group')">
-                                        <CircleCheck class="size-4" />
+                                        <CheckCircle class="size-4" />
                                         {{ t('dialog.group.actions.unblock') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem v-else @click="groupDialogCommand('Block Group')">
-                                        <CircleClose class="size-4" />
+                                        <XCircle class="size-4" />
                                         {{ t('dialog.group.actions.block') }}
                                     </DropdownMenuItem>
                                 </template>
@@ -359,7 +359,7 @@
                             <div style="margin: 5px 0">
                                 <Location :location="room.tag" style="display: inline-block" />
                                 <InviteYourself :location="room.tag" style="margin-left: 5px" />
-                                <TooltipWrapper side="top" content="Refresh player count">
+                                <TooltipWrapper side="top" content="RefreshCw player count">
                                     <Button
                                         class="rounded-full ml-1 w-6 h-6 text-xs text-muted-foreground hover:text-foreground"
                                         size="icon"
@@ -392,7 +392,7 @@
                                             :style="{ color: user.$userColour }"
                                             v-text="user.displayName" />
                                         <span v-if="user.location === 'traveling'" class="extra">
-                                            <el-icon class="is-loading" style="margin-right: 3px"><Loading /></el-icon>
+                                            <Loader2 class="is-loading" style="margin-right: 3px" />
                                             <Timer :epoch="user.$travelingToTime" />
                                         </span>
                                         <span v-else class="extra">
@@ -456,7 +456,7 @@
                                                 </span>
                                             </template>
                                         </template>
-                                        <el-icon style="margin-right: 5px"><View /></el-icon>
+                                        <Eye style="margin-right: 5px" />
                                     </TooltipWrapper>
                                     <DisplayName
                                         :userid="groupDialog.announcement.authorId"
@@ -581,7 +581,7 @@
                                     <span class="name">
                                         {{ t('dialog.group.info.last_visited') }}
                                         <TooltipWrapper side="top" :content="t('dialog.user.info.accuracy_notice')">
-                                            <el-icon style="margin-left: 3px"><Warning /></el-icon>
+                                            <AlertTriangle style="margin-left: 3px" />
                                         </TooltipWrapper>
                                     </span>
                                     <span class="extra">{{ formatDateFilter(groupDialog.lastVisit, 'long') }}</span>
@@ -775,7 +775,7 @@
                                                     >
                                                 </template>
                                             </template>
-                                            <el-icon style="margin-right: 5px"><View /></el-icon>
+                                            <Eye style="margin-right: 5px" />
                                         </TooltipWrapper>
                                         <DisplayName :userid="post.authorId" style="margin-right: 5px" />
                                         <span v-if="post.editorId" style="margin-right: 5px"
@@ -934,7 +934,7 @@
                                                 v-if="user.isRepresenting"
                                                 side="top"
                                                 :content="t('dialog.group.members.representing')">
-                                                <el-icon style="margin-right: 5px"><CollectionTag /></el-icon>
+                                                <Tag style="margin-right: 5px" />
                                             </TooltipWrapper>
                                             <TooltipWrapper v-if="user.visibility !== 'visible'" side="top">
                                                 <template #content>
@@ -943,13 +943,13 @@
                                                         {{ user.visibility }}</span
                                                     >
                                                 </template>
-                                                <el-icon style="margin-right: 5px"><View /></el-icon>
+                                                <Eye style="margin-right: 5px" />
                                             </TooltipWrapper>
                                             <TooltipWrapper
                                                 v-if="!user.isSubscribedToAnnouncements"
                                                 side="top"
                                                 :content="t('dialog.group.members.unsubscribed_announcements')">
-                                                <el-icon style="margin-right: 5px"><ChatLineSquare /></el-icon>
+                                                <MessageSquare style="margin-right: 5px" />
                                             </TooltipWrapper>
                                             <TooltipWrapper v-if="user.managerNotes" side="top">
                                                 <template #content>
@@ -957,7 +957,7 @@
                                                     <br />
                                                     <span>{{ user.managerNotes }}</span>
                                                 </template>
-                                                <el-icon style="margin-right: 5px"><Edit /></el-icon>
+                                                <Pencil style="margin-right: 5px" />
                                             </TooltipWrapper>
                                         </template>
                                         <template v-for="roleId in user.roleIds" :key="roleId">
@@ -995,7 +995,7 @@
                                                 v-if="user.isRepresenting"
                                                 side="top"
                                                 :content="t('dialog.group.members.representing')">
-                                                <el-icon style="margin-right: 5px"><CollectionTag /></el-icon>
+                                                <Tag style="margin-right: 5px" />
                                             </TooltipWrapper>
                                             <TooltipWrapper v-if="user.visibility !== 'visible'" side="top">
                                                 <template #content>
@@ -1004,13 +1004,13 @@
                                                         {{ user.visibility }}</span
                                                     >
                                                 </template>
-                                                <el-icon style="margin-right: 5px"><View /></el-icon>
+                                                <Eye style="margin-right: 5px" />
                                             </TooltipWrapper>
                                             <TooltipWrapper
                                                 v-if="!user.isSubscribedToAnnouncements"
                                                 side="top"
                                                 :content="t('dialog.group.members.unsubscribed_announcements')">
-                                                <el-icon style="margin-right: 5px"><ChatLineSquare /></el-icon>
+                                                <MessageSquare style="margin-right: 5px" />
                                             </TooltipWrapper>
                                             <TooltipWrapper v-if="user.managerNotes" side="top">
                                                 <template #content>
@@ -1018,7 +1018,7 @@
                                                     <br />
                                                     <span>{{ user.managerNotes }}</span>
                                                 </template>
-                                                <el-icon style="margin-right: 5px"><Edit /></el-icon>
+                                                <Pencil style="margin-right: 5px" />
                                             </TooltipWrapper>
                                         </template>
                                         <template v-for="roleId in user.roleIds" :key="roleId">
@@ -1052,7 +1052,7 @@
                         :disabled="isGroupGalleryLoading"
                         @click="getGroupGalleries">
                         <Spinner v-if="isGroupGalleryLoading" />
-                        <Refresh v-else />
+                        <RefreshCw v-else />
                     </Button>
                     <TabsUnderline
                         v-model="groupDialogGalleryCurrentName"
@@ -1130,29 +1130,27 @@
 
 <script setup>
     import {
+        AlertTriangle,
         Bell,
-        ChatLineSquare,
+        BellOff,
         Check,
-        CircleCheck,
-        CircleClose,
-        Close,
-        CollectionTag,
-        Delete,
+        CheckCircle,
         Download,
-        Edit,
-        Loading,
-        Message,
-        MoreFilled,
-        MuteNotification,
-        Operation,
-        Refresh,
-        Share,
+        Eye,
+        Loader2,
+        MessageSquare,
+        MoreHorizontal,
+        Pencil,
+        RefreshCw,
+        Settings,
+        Share2,
         Star,
-        StarFilled,
-        Tickets,
-        View,
-        Warning
-    } from '@element-plus/icons-vue';
+        Tag,
+        Ticket,
+        Trash2,
+        X,
+        XCircle
+    } from 'lucide-vue-next';
     import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
     import { computed, nextTick, reactive, ref, watch } from 'vue';
     import { Button } from '@/components/ui/button';
@@ -1550,7 +1548,7 @@
             return;
         }
         switch (command) {
-            case 'Share':
+            case 'Share2':
                 copyToClipboard(groupDialog.value.ref.$url);
                 break;
             case 'Create Post':
@@ -1562,7 +1560,7 @@
             case 'Invite To Group':
                 showInviteGroupDialog(D.id, '');
                 break;
-            case 'Refresh':
+            case 'RefreshCw':
                 showGroupDialog(D.id);
                 break;
             case 'Leave Group':
diff --git a/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue b/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue
index 47f648a7..7b0032ca 100644
--- a/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue
+++ b/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue
@@ -21,7 +21,7 @@
                             :disabled="isGroupMembersLoading"
                             @click="loadAllGroupMembers">
                             <Spinner v-if="isGroupMembersLoading" />
-                            <Refresh v-else />
+                            <RefreshCw v-else />
                         </Button>
                         <span style="font-size: 14px; margin-left: 5px; margin-right: 5px">
                             {{ groupMemberModerationTable.data.length }}/{{
@@ -53,7 +53,7 @@
                                         @click.stop>
                                         <span>
                                             {{ t(memberSortOrder.name) }}
-                                            <el-icon style="margin-left: 5px"><ArrowDown /></el-icon>
+                                            <ArrowDown style="margin-left: 5px" />
                                         </span>
                                     </Button>
                                 </DropdownMenuTrigger>
@@ -90,7 +90,7 @@
                                         @click.stop>
                                         <span>
                                             {{ t(memberFilter.name) }}
-                                            <el-icon style="margin-left: 5px"><ArrowDown /></el-icon>
+                                            <ArrowDown style="margin-left: 5px" />
                                         </span>
                                     </Button>
                                 </DropdownMenuTrigger>
@@ -139,7 +139,7 @@
                             :disabled="isGroupMembersLoading"
                             @click="getAllGroupBans(groupMemberModeration.id)">
                             <Spinner v-if="isGroupMembersLoading" />
-                            <Refresh v-else />
+                            <RefreshCw v-else />
                         </Button>
                         <span style="font-size: 14px; margin-left: 5px; margin-right: 5px">{{
                             groupBansModerationTable.data.length
@@ -172,7 +172,7 @@
                             :disabled="isGroupMembersLoading"
                             @click="getAllGroupInvitesAndJoinRequests(groupMemberModeration.id)">
                             <Spinner v-if="isGroupMembersLoading" />
-                            <Refresh v-else />
+                            <RefreshCw v-else />
                         </Button>
                         <br />
                         <TabsUnderline default-value="sent" :items="groupInvitesTabs" :unmount-on-hide="false">
@@ -308,7 +308,7 @@
                             :disabled="isGroupMembersLoading"
                             @click="getAllGroupLogs(groupMemberModeration.id)">
                             <Spinner v-if="isGroupMembersLoading" />
-                            <Refresh v-else />
+                            <RefreshCw v-else />
                         </Button>
                         <span style="font-size: 14px; margin-left: 5px; margin-right: 5px">{{
                             groupLogsModerationTable.data.length
@@ -392,7 +392,7 @@
                     <template #content>
                         <span>{{ t('dialog.group_member_moderation.user_isnt_in_group') }}</span>
                     </template>
-                    <el-icon style="margin-left: 3px; display: inline-block"><Warning /></el-icon>
+                    <AlertTriangle style="margin-left: 3px; display: inline-block" />
                 </TooltipWrapper>
                 <span v-text="user.user?.displayName || user.userId" style="font-weight: bold; margin-left: 5px"></span>
                 <button
@@ -507,7 +507,7 @@
                     >{{ t('dialog.group_member_moderation.unban') }}</Button
                 >
                 <span v-if="progressCurrent" style="margin-top: 10px">
-                    <el-icon class="is-loading" style="margin-left: 5px; margin-right: 5px"><Loading /></el-icon>
+                    <Loader2 class="is-loading" style="margin-left: 5px; margin-right: 5px" />
                     {{ t('dialog.group_member_moderation.progress') }} {{ progressCurrent }}/{{ progressTotal }}
                 </span>
                 <Button
@@ -526,13 +526,12 @@
 </template>
 
 <script setup>
-    import { ArrowDown, Loading, Refresh, Warning } from '@element-plus/icons-vue';
+    import { AlertTriangle, ArrowDown, Loader2, RefreshCw, Trash2 } from 'lucide-vue-next';
     import { computed, reactive, ref, watch } from 'vue';
     import { InputGroupField, InputGroupTextareaField } from '@/components/ui/input-group';
     import { Button } from '@/components/ui/button';
     import { Spinner } from '@/components/ui/spinner';
     import { TabsUnderline } from '@/components/ui/tabs';
-    import { Trash2 } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
     import { useI18n } from 'vue-i18n';
diff --git a/src/components/dialogs/LaunchDialog.vue b/src/components/dialogs/LaunchDialog.vue
index 8cdd9fa0..8d308f72 100644
--- a/src/components/dialogs/LaunchDialog.vue
+++ b/src/components/dialogs/LaunchDialog.vue
@@ -24,7 +24,7 @@
                     <span class="flex items-center gap-1">
                         <span>{{ t('dialog.launch.short_url') }}</span>
                         <TooltipWrapper side="top" :content="t('dialog.launch.short_url_notice')">
-                            <el-icon><Warning /></el-icon>
+                            <AlertTriangle />
                         </TooltipWrapper>
                     </span>
                 </FieldLabel>
@@ -132,12 +132,10 @@
         DropdownMenuTrigger
     } from '@/components/ui/dropdown-menu';
     import { Field, FieldContent, FieldGroup, FieldLabel } from '@/components/ui/field';
+    import { AlertTriangle, Copy, MoreHorizontal } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { ButtonGroup } from '@/components/ui/button-group';
-    import { Copy } from 'lucide-vue-next';
     import { InputGroupField } from '@/components/ui/input-group';
-    import { MoreHorizontal } from 'lucide-vue-next';
-    import { Warning } from '@element-plus/icons-vue';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
     import { useI18n } from 'vue-i18n';
diff --git a/src/components/dialogs/UserDialog/UserActionDropdown.vue b/src/components/dialogs/UserDialog/UserActionDropdown.vue
index 8638477f..86cbef07 100644
--- a/src/components/dialogs/UserDialog/UserActionDropdown.vue
+++ b/src/components/dialogs/UserDialog/UserActionDropdown.vue
@@ -17,7 +17,7 @@
             <DropdownMenuTrigger as-child>
                 <div class="ml-2">
                     <Button variant="outline" size="icon-lg" class="rounded-full">
-                        <Ellipsis />
+                        <MoreHorizontal />
                         <span
                             v-if="dotClass"
                             class="absolute -right-0.5 -top-0.5 h-2.5 w-2.5 rounded-full ring-2 ring-background"
@@ -26,43 +26,43 @@
                 </div>
             </DropdownMenuTrigger>
             <DropdownMenuContent>
-                <DropdownMenuItem @click="onCommand('Refresh')">
-                    <Refresh class="size-4" />
+                <DropdownMenuItem @click="onCommand('RefreshCw')">
+                    <RefreshCw class="size-4" />
                     {{ t('dialog.user.actions.refresh') }}
                 </DropdownMenuItem>
-                <DropdownMenuItem @click="onCommand('Share')">
-                    <Share class="size-4" />
+                <DropdownMenuItem @click="onCommand('Share2')">
+                    <Share2 class="size-4" />
                     {{ t('dialog.user.actions.share') }}
                 </DropdownMenuItem>
                 <template v-if="userDialog.ref.id === currentUser.id">
                     <DropdownMenuItem @click="onCommand('Show Avatar Author')">
-                        <UserFilled class="size-4" />
+                        <User class="size-4" />
                         {{ t('dialog.user.actions.show_avatar_author') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem @click="onCommand('Show Fallback Avatar Details')">
-                        <UserFilled class="size-4" />
+                        <User class="size-4" />
                         {{ t('dialog.user.actions.show_fallback_avatar') }}
                     </DropdownMenuItem>
                     <DropdownMenuSeparator />
-                    <DropdownMenuItem @click="onCommand('Edit Social Status')">
-                        <Edit class="size-4" />
+                    <DropdownMenuItem @click="onCommand('Pencil Social Status')">
+                        <Pencil class="size-4" />
                         {{ t('dialog.user.actions.edit_status') }}
                     </DropdownMenuItem>
-                    <DropdownMenuItem @click="onCommand('Edit Language')">
-                        <Edit class="size-4" />
+                    <DropdownMenuItem @click="onCommand('Pencil Language')">
+                        <Pencil class="size-4" />
                         {{ t('dialog.user.actions.edit_language') }}
                     </DropdownMenuItem>
-                    <DropdownMenuItem @click="onCommand('Edit Bio')">
-                        <Edit class="size-4" />
+                    <DropdownMenuItem @click="onCommand('Pencil Bio')">
+                        <Pencil class="size-4" />
                         {{ t('dialog.user.actions.edit_bio') }}
                     </DropdownMenuItem>
-                    <DropdownMenuItem @click="onCommand('Edit Pronouns')">
-                        <Edit class="size-4" />
+                    <DropdownMenuItem @click="onCommand('Pencil Pronouns')">
+                        <Pencil class="size-4" />
                         {{ t('dialog.user.actions.edit_pronouns') }}
                     </DropdownMenuItem>
                     <DropdownMenuSeparator />
                     <DropdownMenuItem @click="onCommand('Logout')">
-                        <SwitchButton class="size-4" />
+                        <Power class="size-4" />
                         {{ t('dialog.user.actions.logout') }}
                     </DropdownMenuItem>
                 </template>
@@ -70,29 +70,29 @@
                     <template v-if="userDialog.isFriend">
                         <DropdownMenuSeparator />
                         <DropdownMenuItem @click="onCommand('Request Invite')">
-                            <Postcard class="size-4" />
+                            <Mail class="size-4" />
                             {{ t('dialog.user.actions.request_invite') }}
                         </DropdownMenuItem>
-                        <DropdownMenuItem @click="onCommand('Request Invite Message')">
-                            <Postcard class="size-4" />
+                        <DropdownMenuItem @click="onCommand('Request Invite MessageSquare')">
+                            <Mail class="size-4" />
                             {{ t('dialog.user.actions.request_invite_with_message') }}
                         </DropdownMenuItem>
                         <template v-if="isGameRunning">
                             <DropdownMenuItem
                                 :disabled="!checkCanInvite(lastLocation.location)"
                                 @click="onCommand('Invite')">
-                                <Message class="size-4" />
+                                <MessageSquare class="size-4" />
                                 {{ t('dialog.user.actions.invite') }}
                             </DropdownMenuItem>
                             <DropdownMenuItem
                                 :disabled="!checkCanInvite(lastLocation.location)"
-                                @click="onCommand('Invite Message')">
-                                <Message class="size-4" />
+                                @click="onCommand('Invite MessageSquare')">
+                                <MessageSquare class="size-4" />
                                 {{ t('dialog.user.actions.invite_with_message') }}
                             </DropdownMenuItem>
                         </template>
                         <DropdownMenuItem :disabled="!currentUser.isBoopingEnabled" @click="onCommand('Send Boop')">
-                            <Pointer class="size-4" />
+                            <MousePointer class="size-4" />
                             {{ t('dialog.user.actions.send_boop') }}
                         </DropdownMenuItem>
                     </template>
@@ -102,14 +102,14 @@
                             {{ t('dialog.user.actions.accept_friend_request') }}
                         </DropdownMenuItem>
                         <DropdownMenuItem @click="onCommand('Decline Friend Request')">
-                            <Close class="size-4" />
+                            <X class="size-4" />
                             {{ t('dialog.user.actions.decline_friend_request') }}
                         </DropdownMenuItem>
                     </template>
                     <DropdownMenuItem
                         v-else-if="userDialog.outgoingRequest"
                         @click="onCommand('Cancel Friend Request')">
-                        <Close class="size-4" />
+                        <X class="size-4" />
                         {{ t('dialog.user.actions.cancel_friend_request') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem v-else @click="onCommand('Send Friend Request')">
@@ -117,28 +117,28 @@
                         {{ t('dialog.user.actions.send_friend_request') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem @click="onCommand('Invite To Group')">
-                        <Message class="size-4" />
+                        <MessageSquare class="size-4" />
                         {{ t('dialog.user.actions.invite_to_group') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem @click="onCommand('Group Moderation')">
-                        <Operation class="size-4" />
+                        <Settings class="size-4" />
                         {{ t('dialog.user.actions.group_moderation') }}
                     </DropdownMenuItem>
-                    <DropdownMenuItem @click="onCommand('Edit Note Memo')">
-                        <Edit class="size-4" />
-                        Edit Note and Memo
+                    <DropdownMenuItem @click="onCommand('Pencil Note Memo')">
+                        <Pencil class="size-4" />
+                        Pencil Note and Memo
                     </DropdownMenuItem>
                     <DropdownMenuSeparator />
                     <DropdownMenuItem @click="onCommand('Show Avatar Author')">
-                        <UserFilled class="size-4" />
+                        <User class="size-4" />
                         {{ t('dialog.user.actions.show_avatar_author') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem @click="onCommand('Show Fallback Avatar Details')">
-                        <UserFilled class="size-4" />
+                        <User class="size-4" />
                         {{ t('dialog.user.actions.show_fallback_avatar') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem @click="onCommand('Previous Instances')">
-                        <DataLine class="size-4" />
+                        <LineChart class="size-4" />
                         {{ t('dialog.user.actions.show_previous_instances') }}
                     </DropdownMenuItem>
                     <DropdownMenuSeparator />
@@ -146,39 +146,39 @@
                         v-if="userDialog.isBlock"
                         variant="destructive"
                         @click="onCommand('Moderation Unblock')">
-                        <CircleCheck class="size-4" />
+                        <CheckCircle class="size-4" />
                         {{ t('dialog.user.actions.moderation_unblock') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem
                         v-else
                         :disabled="userDialog.ref.$isModerator"
                         @click="onCommand('Moderation Block')">
-                        <CircleClose class="size-4" />
+                        <XCircle class="size-4" />
                         {{ t('dialog.user.actions.moderation_block') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem
                         v-if="userDialog.isMute"
                         variant="destructive"
                         @click="onCommand('Moderation Unmute')">
-                        <Microphone class="size-4" />
+                        <Mic class="size-4" />
                         {{ t('dialog.user.actions.moderation_unmute') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem
                         v-else
                         :disabled="userDialog.ref.$isModerator"
-                        @click="onCommand('Moderation Mute')">
-                        <Mute class="size-4" />
+                        @click="onCommand('Moderation VolumeX')">
+                        <VolumeX class="size-4" />
                         {{ t('dialog.user.actions.moderation_mute') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem
                         v-if="userDialog.isMuteChat"
                         variant="destructive"
                         @click="onCommand('Moderation Enable Chatbox')">
-                        <ChatLineRound class="size-4" />
+                        <MessageCircle class="size-4" />
                         {{ t('dialog.user.actions.moderation_enable_chatbox') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem v-else @click="onCommand('Moderation Disable Chatbox')">
-                        <ChatDotRound class="size-4" />
+                        <MessageCircle class="size-4" />
                         {{ t('dialog.user.actions.moderation_disable_chatbox') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem @click="onCommand('Show Avatar')">
@@ -195,11 +195,11 @@
                         v-if="userDialog.isInteractOff"
                         variant="destructive"
                         @click="onCommand('Moderation Enable Avatar Interaction')">
-                        <Pointer class="size-4" />
+                        <MousePointer class="size-4" />
                         {{ t('dialog.user.actions.moderation_enable_avatar_interaction') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem v-else @click="onCommand('Moderation Disable Avatar Interaction')">
-                        <CircleClose class="size-4" />
+                        <XCircle class="size-4" />
                         {{ t('dialog.user.actions.moderation_disable_avatar_interaction') }}
                     </DropdownMenuItem>
                     <DropdownMenuItem :disabled="userDialog.ref.$isModerator" @click="onCommand('Report Hacking')">
@@ -209,7 +209,7 @@
                     <template v-if="userDialog.isFriend">
                         <DropdownMenuSeparator />
                         <DropdownMenuItem variant="destructive" @click="onCommand('Unfriend')">
-                            <Delete class="size-4" />
+                            <Trash2 class="size-4" />
                             {{ t('dialog.user.actions.unfriend') }}
                         </DropdownMenuItem>
                     </template>
@@ -221,30 +221,29 @@
 
 <script setup>
     import {
-        ChatDotRound,
-        ChatLineRound,
         Check,
-        CircleCheck,
-        CircleClose,
-        Close,
-        DataLine,
-        Delete,
-        Edit,
+        CheckCircle,
         Flag,
-        Message,
-        Microphone,
-        Mute,
-        Operation,
+        LineChart,
+        Mail,
+        MessageCircle,
+        MessageSquare,
+        Mic,
+        MoreHorizontal,
+        MousePointer,
+        Pencil,
         Plus,
-        Pointer,
-        Postcard,
-        Refresh,
-        Share,
-        SwitchButton,
+        Power,
+        RefreshCw,
+        Settings,
+        Share2,
+        Star,
+        Trash2,
         User,
-        UserFilled
-    } from '@element-plus/icons-vue';
-    import { MoreHorizontal as Ellipsis, Star } from 'lucide-vue-next';
+        VolumeX,
+        X,
+        XCircle
+    } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { computed } from 'vue';
     import { storeToRefs } from 'pinia';
diff --git a/src/components/dialogs/UserDialog/UserDialog.vue b/src/components/dialogs/UserDialog/UserDialog.vue
index eb2baea1..3293574a 100644
--- a/src/components/dialogs/UserDialog/UserDialog.vue
+++ b/src/components/dialogs/UserDialog/UserDialog.vue
@@ -96,7 +96,7 @@
                                             :style="{ color: user.$userColour }"
                                             v-text="user.displayName"></span>
                                         <span v-if="user.location === 'traveling'" class="extra">
-                                            <el-icon class="is-loading" style="margin-right: 3px"><Loading /></el-icon>
+                                            <Loader2 class="is-loading" style="margin-right: 3px" />
                                             <Timer :epoch="user.$travelingToTime" />
                                         </span>
                                         <span v-else class="extra">
@@ -173,7 +173,7 @@
                                         "
                                         side="top"
                                         :content="t('dialog.user.info.vrcplus_hides_avatar')">
-                                        <el-icon><Warning /></el-icon>
+                                        <AlertTriangle />
                                     </TooltipWrapper>
                                 </div>
                             </div>
@@ -289,7 +289,7 @@
                                     <span class="name">
                                         {{ t('dialog.user.info.last_seen') }}
                                         <TooltipWrapper side="top" :content="t('dialog.user.info.accuracy_notice')">
-                                            <el-icon style="margin-left: 3px"><Warning /></el-icon>
+                                            <AlertTriangle style="margin-left: 3px" />
                                         </TooltipWrapper>
                                     </span>
                                     <span class="extra">{{ formatDateFilter(userDialog.lastSeen, 'long') }}</span>
@@ -304,14 +304,14 @@
                                         <div>
                                             {{ t('dialog.user.info.join_count') }}
                                             <TooltipWrapper side="top" :content="t('dialog.user.info.accuracy_notice')">
-                                                <el-icon style="margin-left: 3px"><Warning /></el-icon>
+                                                <AlertTriangle style="margin-left: 3px" />
                                             </TooltipWrapper>
                                         </div>
 
                                         <TooltipWrapper
                                             side="top"
                                             :content="t('dialog.user.info.open_previous_instance')">
-                                            <el-icon style="margin-right: 16px"><MoreFilled /></el-icon>
+                                            <MoreHorizontal style="margin-right: 16px" />
                                         </TooltipWrapper>
                                     </div>
                                     <span v-if="userDialog.joinCount === 0" class="extra">-</span>
@@ -324,7 +324,7 @@
                                     <span class="name">
                                         {{ t('dialog.user.info.time_together') }}
                                         <TooltipWrapper side="top" :content="t('dialog.user.info.accuracy_notice')">
-                                            <el-icon style="margin-left: 3px"><Warning /></el-icon>
+                                            <AlertTriangle style="margin-left: 3px" />
                                         </TooltipWrapper>
                                     </span>
                                     <span v-if="userDialog.timeSpent === 0" class="extra">-</span>
@@ -342,7 +342,7 @@
                                         <span class="name">
                                             {{ t('dialog.user.info.play_time') }}
                                             <TooltipWrapper side="top" :content="t('dialog.user.info.accuracy_notice')">
-                                                <el-icon style="margin-left: 3px"><Warning /></el-icon>
+                                                <AlertTriangle style="margin-left: 3px" />
                                             </TooltipWrapper>
                                         </span>
                                         <span v-if="userDialog.timeSpent === 0" class="extra">-</span>
@@ -362,13 +362,13 @@
                                         class="name">
                                         {{ t('dialog.user.info.online_for') }}
                                         <TooltipWrapper side="top" :content="t('dialog.user.info.accuracy_notice')">
-                                            <el-icon style="margin-left: 3px"><Warning /></el-icon>
+                                            <AlertTriangle style="margin-left: 3px" />
                                         </TooltipWrapper>
                                     </span>
                                     <span v-else class="name">
                                         {{ t('dialog.user.info.offline_for') }}
                                         <TooltipWrapper side="top" :content="t('dialog.user.info.accuracy_notice')">
-                                            <el-icon style="margin-left: 3px"><Warning /></el-icon>
+                                            <AlertTriangle style="margin-left: 3px" />
                                         </TooltipWrapper>
                                     </span>
                                     <span class="extra">{{ userOnlineFor(userDialog.ref) }}</span>
@@ -415,13 +415,13 @@
                                     <span v-if="userDialog.unFriended" class="name">
                                         {{ t('dialog.user.info.unfriended') }}
                                         <TooltipWrapper side="top" :content="t('dialog.user.info.accuracy_notice')">
-                                            <el-icon style="margin-left: 3px"><Warning /></el-icon>
+                                            <AlertTriangle style="margin-left: 3px" />
                                         </TooltipWrapper>
                                     </span>
                                     <span v-else class="name">
                                         {{ t('dialog.user.info.friended') }}
                                         <TooltipWrapper side="top" :content="t('dialog.user.info.accuracy_notice')">
-                                            <el-icon style="margin-left: 3px"><Warning /></el-icon>
+                                            <AlertTriangle style="margin-left: 3px" />
                                         </TooltipWrapper>
                                     </span>
                                     <span class="extra">{{ formatDateFilter(userDialog.dateFriended, 'long') }}</span>
@@ -562,7 +562,7 @@
                                 :disabled="userDialog.isMutualFriendsLoading"
                                 @click="getUserMutualFriends(userDialog.id)">
                                 <Spinner v-if="userDialog.isMutualFriendsLoading" />
-                                <Refresh v-else />
+                                <RefreshCw v-else />
                             </Button>
                             <span style="margin-left: 5px">{{
                                 t('dialog.user.groups.total_count', { count: userDialog.mutualFriends.length })
@@ -599,7 +599,7 @@
                             color: #f56c6c;
                             cursor: pointer;
                         ">
-                        <el-icon style="margin-right: 5px"><Warning /></el-icon>
+                        <AlertTriangle style="margin-right: 5px" />
                         <span>Mutual Friends unavailable due to VRChat staged rollout, click for more info</span>
                     </div>
                     <ul
@@ -633,7 +633,7 @@
                                 :disabled="userDialog.isGroupsLoading"
                                 @click="getUserGroups(userDialog.id)">
                                 <Spinner v-if="userDialog.isGroupsLoading" />
-                                <Refresh v-else />
+                                <RefreshCw v-else />
                             </Button>
                             <span style="margin-left: 5px">{{
                                 t('dialog.user.groups.total_count', { count: userGroups.groups.length })
@@ -771,14 +771,14 @@
                                             variant="outline"
                                             style="display: block; padding: 7px; font-size: 9px; margin-left: 0"
                                             @click="moveGroupUp(group.id)">
-                                            <Top />
+                                            <ArrowUp />
                                         </Button>
                                         <Button
                                             size="icon-sm"
                                             variant="outline"
                                             style="display: block; padding: 7px; font-size: 9px; margin-left: 0"
                                             @click="moveGroupDown(group.id)">
-                                            <Bottom />
+                                            <ArrowDown />
                                         </Button>
                                     </div>
                                     <div class="avatar">
@@ -791,7 +791,7 @@
                                                 v-if="group.isRepresenting"
                                                 side="top"
                                                 :content="t('dialog.group.members.representing')">
-                                                <el-icon style="margin-right: 5px"><CollectionTag /></el-icon>
+                                                <Tag style="margin-right: 5px" />
                                             </TooltipWrapper>
                                             <TooltipWrapper v-if="group.myMember?.visibility !== 'visible'" side="top">
                                                 <template #content>
@@ -800,7 +800,7 @@
                                                         {{ group.myMember.visibility }}</span
                                                     >
                                                 </template>
-                                                <el-icon style="margin-right: 5px"><View /></el-icon>
+                                                <Eye style="margin-right: 5px" />
                                             </TooltipWrapper>
                                             <span>({{ group.memberCount }})</span>
                                         </span>
@@ -840,11 +840,11 @@
                                             setGroupSubscription(group.id, !group.myMember.isSubscribedToAnnouncements)
                                         ">
                                         <span v-if="group.myMember.isSubscribedToAnnouncements"
-                                            ><el-icon style="margin-left: 5px"><MuteNotification /></el-icon>
+                                            ><BellOff style="margin-left: 5px" />
                                             {{ t('dialog.group.tags.subscribed') }}</span
                                         >
                                         <span v-else
-                                            ><el-icon style="margin-left: 5px"><Bell /></el-icon>
+                                            ><Bell style="margin-left: 5px" />
                                             {{ t('dialog.group.tags.unsubscribed') }}</span
                                         >
                                     </Button> -->
@@ -899,7 +899,7 @@
                                                     v-if="group.isRepresenting"
                                                     side="top"
                                                     :content="t('dialog.group.members.representing')">
-                                                    <el-icon style="margin-right: 5px"><CollectionTag /></el-icon>
+                                                    <Tag style="margin-right: 5px" />
                                                 </TooltipWrapper>
                                                 <TooltipWrapper v-if="group.memberVisibility !== 'visible'" side="top">
                                                     <template #content>
@@ -908,7 +908,7 @@
                                                             {{ group.memberVisibility }}</span
                                                         >
                                                     </template>
-                                                    <el-icon style="margin-right: 5px"><View /></el-icon>
+                                                    <Eye style="margin-right: 5px" />
                                                 </TooltipWrapper>
                                                 <span>({{ group.memberCount }})</span>
                                             </span>
@@ -942,7 +942,7 @@
                                                     v-if="group.isRepresenting"
                                                     side="top"
                                                     :content="t('dialog.group.members.representing')">
-                                                    <el-icon style="margin-right: 5px"><CollectionTag /></el-icon>
+                                                    <Tag style="margin-right: 5px" />
                                                 </TooltipWrapper>
                                                 <TooltipWrapper v-if="group.memberVisibility !== 'visible'" side="top">
                                                     <template #content>
@@ -951,7 +951,7 @@
                                                             {{ group.memberVisibility }}</span
                                                         >
                                                     </template>
-                                                    <el-icon style="margin-right: 5px"><View /></el-icon>
+                                                    <Eye style="margin-right: 5px" />
                                                 </TooltipWrapper>
                                                 <span>({{ group.memberCount }})</span>
                                             </span>
@@ -993,7 +993,7 @@
                                                     v-if="group.isRepresenting"
                                                     side="top"
                                                     :content="t('dialog.group.members.representing')">
-                                                    <el-icon style="margin-right: 5px"><CollectionTag /></el-icon>
+                                                    <Tag style="margin-right: 5px" />
                                                 </TooltipWrapper>
                                                 <TooltipWrapper v-if="group.memberVisibility !== 'visible'" side="top">
                                                     <template #content>
@@ -1002,7 +1002,7 @@
                                                             {{ group.memberVisibility }}</span
                                                         >
                                                     </template>
-                                                    <el-icon style="margin-right: 5px"><View /></el-icon>
+                                                    <Eye style="margin-right: 5px" />
                                                 </TooltipWrapper>
                                                 <span>({{ group.memberCount }})</span>
                                             </span>
@@ -1024,7 +1024,7 @@
                                 :disabled="userDialog.isWorldsLoading"
                                 @click="refreshUserDialogWorlds()">
                                 <Spinner v-if="userDialog.isWorldsLoading" />
-                                <Refresh v-else />
+                                <RefreshCw v-else />
                             </Button>
                             <span style="margin-left: 5px">{{
                                 t('dialog.user.worlds.total_count', { count: userDialog.worlds.length })
@@ -1094,7 +1094,7 @@
                         type="default"
                         :loading="userDialog.isFavoriteWorldsLoading"
                         size="small"
-                        :icon="Refresh"
+                        :icon="RefreshCw"
                         circle
                         style="position: absolute; right: 15px; bottom: 15px; z-index: 99"
                         @click="getUserFavoriteWorlds(userDialog.id)">
@@ -1166,7 +1166,7 @@
                                 :disabled="userDialog.isAvatarsLoading"
                                 @click="refreshUserDialogAvatars()">
                                 <Spinner v-if="userDialog.isAvatarsLoading" />
-                                <Refresh v-else />
+                                <RefreshCw v-else />
                             </Button>
                             <Button
                                 v-else
@@ -1176,7 +1176,7 @@
                                 :disabled="userDialog.isAvatarsLoading"
                                 @click="setUserDialogAvatarsRemote(userDialog.id)">
                                 <Spinner v-if="userDialog.isAvatarsLoading" />
-                                <Refresh v-else />
+                                <RefreshCw v-else />
                             </Button>
                             <span style="margin-left: 5px">{{
                                 t('dialog.user.avatars.total_count', { count: userDialogAvatars.length })
@@ -1299,16 +1299,18 @@
 
 <script setup>
     import {
-        Bottom,
-        CollectionTag,
-        Download as DownloadIcon,
-        Loading,
-        MoreFilled,
-        Refresh,
-        Top,
-        View,
-        Warning
-    } from '@element-plus/icons-vue';
+        AlertTriangle,
+        ArrowDown,
+        ArrowUp,
+        Download,
+        Eye,
+        Loader2,
+        LogOut,
+        MoreHorizontal,
+        RefreshCcw,
+        RefreshCw,
+        Tag
+    } from 'lucide-vue-next';
     import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
     import { computed, defineAsyncComponent, nextTick, ref, watch } from 'vue';
     import {
@@ -1317,7 +1319,6 @@
         DropdownMenuItem,
         DropdownMenuTrigger
     } from '@/components/ui/dropdown-menu';
-    import { Download, LogOut, RefreshCcw } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { Checkbox } from '@/components/ui/checkbox';
     import { Spinner } from '@/components/ui/spinner';
@@ -1800,19 +1801,19 @@
         if (D.visible === false) {
             return;
         }
-        if (command === 'Refresh') {
+        if (command === 'RefreshCw') {
             showUserDialog(D.id);
-        } else if (command === 'Share') {
+        } else if (command === 'Share2') {
             copyUserURL(D.id);
         } else if (command === 'Add Favorite') {
             showFavoriteDialog('friend', D.id);
-        } else if (command === 'Edit Social Status') {
+        } else if (command === 'Pencil Social Status') {
             showSocialStatusDialog();
-        } else if (command === 'Edit Language') {
+        } else if (command === 'Pencil Language') {
             showLanguageDialog();
-        } else if (command === 'Edit Bio') {
+        } else if (command === 'Pencil Bio') {
             showBioDialog();
-        } else if (command === 'Edit Pronouns') {
+        } else if (command === 'Pencil Pronouns') {
             showPronounsDialog();
         } else if (command === 'Logout') {
             logout();
@@ -1828,7 +1829,7 @@
                     toast('Request invite sent');
                     return args;
                 });
-        } else if (command === 'Invite Message') {
+        } else if (command === 'Invite MessageSquare') {
             L = parseLocation(lastLocation.value.location);
             worldRequest
                 .getCachedWorld({
@@ -1844,7 +1845,7 @@
                         D.id
                     );
                 });
-        } else if (command === 'Request Invite Message') {
+        } else if (command === 'Request Invite MessageSquare') {
             showSendInviteRequestDialog(
                 {
                     platform: 'standalonewindows'
@@ -1909,7 +1910,7 @@
             } else {
                 setPlayerModeration(D.id, 5);
             }
-        } else if (command === 'Edit Note Memo') {
+        } else if (command === 'Pencil Note Memo') {
             isEditNoteAndMemoDialogVisible.value = true;
         } else {
             const i18nPreFix = 'dialog.user.actions.';
@@ -2003,7 +2004,7 @@
         let args;
         let key;
         switch (command) {
-            case 'Delete Favorite':
+            case 'Trash2 Favorite':
                 favoriteRequest.deleteFavorite({
                     objectId: userId
                 });
@@ -2070,7 +2071,7 @@
                 });
                 handlePlayerModerationDelete(args);
                 break;
-            case 'Moderation Mute': {
+            case 'Moderation VolumeX': {
                 args = await playerModerationRequest.sendPlayerModeration({
                     moderated: userId,
                     type: 'mute'
diff --git a/src/components/dialogs/UserDialog/UserSummaryHeader.vue b/src/components/dialogs/UserDialog/UserSummaryHeader.vue
index 03ec275c..fcdd019f 100644
--- a/src/components/dialogs/UserDialog/UserSummaryHeader.vue
+++ b/src/components/dialogs/UserDialog/UserSummaryHeader.vue
@@ -40,7 +40,7 @@
                                     >
                                 </div>
                             </template>
-                            <el-icon><CaretBottom /></el-icon>
+                            <ChevronDown />
                         </TooltipWrapper>
                     </template>
                     <span
@@ -260,7 +260,7 @@
 </template>
 
 <script setup>
-    import { CaretBottom } from '@element-plus/icons-vue';
+    import { ChevronDown } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/components/dialogs/WorldDialog/ChangeWorldImageDialog.vue b/src/components/dialogs/WorldDialog/ChangeWorldImageDialog.vue
index 42b9182a..fb982c52 100644
--- a/src/components/dialogs/WorldDialog/ChangeWorldImageDialog.vue
+++ b/src/components/dialogs/WorldDialog/ChangeWorldImageDialog.vue
@@ -29,7 +29,7 @@
 
 <script setup>
     import { Button } from '@/components/ui/button';
-    import { Upload } from '@element-plus/icons-vue';
+    import { Upload } from 'lucide-vue-next';
     import { ref } from 'vue';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
diff --git a/src/components/dialogs/WorldDialog/WorldDialog.vue b/src/components/dialogs/WorldDialog/WorldDialog.vue
index bcd41b86..e7fe5cd8 100644
--- a/src/components/dialogs/WorldDialog/WorldDialog.vue
+++ b/src/components/dialogs/WorldDialog/WorldDialog.vue
@@ -21,14 +21,12 @@
                                 class="dialog-title"
                                 style="margin-right: 5px; cursor: pointer"
                                 @click="copyWorldName">
-                                <el-icon
+                                <Home
                                     v-if="
                                         currentUser.$homeLocation &&
                                         currentUser.$homeLocation.worldId === worldDialog.id
                                     "
-                                    style="margin-right: 5px"
-                                    ><HomeFilled
-                                /></el-icon>
+                                    style="margin-right: 5px" />
                                 {{ worldDialog.ref.name }}
                             </span>
                         </div>
@@ -198,12 +196,12 @@
                                 </Button>
                             </DropdownMenuTrigger>
                             <DropdownMenuContent>
-                                <DropdownMenuItem @click="worldDialogCommand('Refresh')">
-                                    <Refresh class="size-4" />
+                                <DropdownMenuItem @click="worldDialogCommand('RefreshCw')">
+                                    <RefreshCw class="size-4" />
                                     {{ t('dialog.world.actions.refresh') }}
                                 </DropdownMenuItem>
-                                <DropdownMenuItem @click="worldDialogCommand('Share')">
-                                    <Share class="size-4" />
+                                <DropdownMenuItem @click="worldDialogCommand('Share2')">
+                                    <Share2 class="size-4" />
                                     {{ t('dialog.world.actions.share') }}
                                 </DropdownMenuItem>
                                 <DropdownMenuSeparator />
@@ -212,7 +210,7 @@
                                     {{ t('dialog.world.actions.new_instance') }}
                                 </DropdownMenuItem>
                                 <DropdownMenuItem @click="worldDialogCommand('New Instance and Self Invite')">
-                                    <Message class="size-4" />
+                                    <MessageSquare class="size-4" />
                                     {{
                                         canOpenInstanceInGame
                                             ? t('dialog.world.actions.new_instance_and_open_ingame')
@@ -226,56 +224,56 @@
                                         currentUser.$homeLocation.worldId === worldDialog.id
                                     "
                                     @click="worldDialogCommand('Reset Home')">
-                                    <MagicStick class="size-4" />
+                                    <Wand2 class="size-4" />
                                     {{ t('dialog.world.actions.reset_home') }}
                                 </DropdownMenuItem>
                                 <DropdownMenuItem v-else @click="worldDialogCommand('Make Home')">
-                                    <HomeFilled class="size-4" />
+                                    <Home class="size-4" />
                                     {{ t('dialog.world.actions.make_home') }}
                                 </DropdownMenuItem>
                                 <DropdownMenuItem @click="worldDialogCommand('Previous Instances')">
-                                    <DataLine class="size-4" />
+                                    <LineChart class="size-4" />
                                     {{ t('dialog.world.actions.show_previous_instances') }}
                                 </DropdownMenuItem>
                                 <template v-if="currentUser.id !== worldDialog.ref.authorId">
                                     <DropdownMenuItem
                                         :disabled="!worldDialog.hasPersistData"
-                                        @click="worldDialogCommand('Delete Persistent Data')">
+                                        @click="worldDialogCommand('Trash2 Persistent Data')">
                                         <Upload class="size-4" />
                                         {{ t('dialog.world.actions.delete_persistent_data') }}
                                     </DropdownMenuItem>
                                 </template>
                                 <template v-else>
                                     <DropdownMenuItem @click="worldDialogCommand('Rename')">
-                                        <Edit class="size-4" />
+                                        <Pencil class="size-4" />
                                         {{ t('dialog.world.actions.rename') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem @click="worldDialogCommand('Change Description')">
-                                        <Edit class="size-4" />
+                                        <Pencil class="size-4" />
                                         {{ t('dialog.world.actions.change_description') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem @click="worldDialogCommand('Change Capacity')">
-                                        <Edit class="size-4" />
+                                        <Pencil class="size-4" />
                                         {{ t('dialog.world.actions.change_capacity') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem @click="worldDialogCommand('Change Recommended Capacity')">
-                                        <Edit class="size-4" />
+                                        <Pencil class="size-4" />
                                         {{ t('dialog.world.actions.change_recommended_capacity') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem @click="worldDialogCommand('Change YouTube Preview')">
-                                        <Edit class="size-4" />
+                                        <Pencil class="size-4" />
                                         {{ t('dialog.world.actions.change_preview') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem @click="worldDialogCommand('Change Tags')">
-                                        <Edit class="size-4" />
+                                        <Pencil class="size-4" />
                                         {{ t('dialog.world.actions.change_warnings_settings_tags') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem @click="worldDialogCommand('Change Allowed Domains')">
-                                        <Edit class="size-4" />
+                                        <Pencil class="size-4" />
                                         {{ t('dialog.world.actions.change_allowed_video_player_domains') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem v-if="isWindows" @click="worldDialogCommand('Change Image')">
-                                        <Picture class="size-4" />
+                                        <Image class="size-4" />
                                         {{ t('dialog.world.actions.change_image') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem
@@ -291,21 +289,21 @@
                                             worldDialog.ref?.tags?.includes('system_labs')
                                         "
                                         @click="worldDialogCommand('Unpublish')">
-                                        <View class="size-4" />
+                                        <Eye class="size-4" />
                                         {{ t('dialog.world.actions.unpublish') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem v-else @click="worldDialogCommand('Publish')">
-                                        <View class="size-4" />
+                                        <Eye class="size-4" />
                                         {{ t('dialog.world.actions.publish_to_labs') }}
                                     </DropdownMenuItem>
                                     <DropdownMenuItem
                                         :disabled="!worldDialog.hasPersistData"
-                                        @click="worldDialogCommand('Delete Persistent Data')">
+                                        @click="worldDialogCommand('Trash2 Persistent Data')">
                                         <Upload class="size-4" />
                                         {{ t('dialog.world.actions.delete_persistent_data') }}
                                     </DropdownMenuItem>
-                                    <DropdownMenuItem variant="destructive" @click="worldDialogCommand('Delete')">
-                                        <Delete class="size-4" />
+                                    <DropdownMenuItem variant="destructive" @click="worldDialogCommand('Trash2')">
+                                        <Trash2 class="size-4" />
                                         {{ t('dialog.world.actions.delete') }}
                                     </DropdownMenuItem>
                                 </template>
@@ -320,16 +318,16 @@
                 :unmount-on-hide="false"
                 @update:modelValue="worldDialogTabClick">
                 <template #Instances>
-                    <div class="">
-                        <el-icon><User /></el-icon>
+                    <div>
+                        <User />
                         {{ t('dialog.world.instances.public_count', { count: worldDialog.ref.publicOccupants }) }}
-                        <el-icon style="margin-left: 10px"><UserFilled /></el-icon>
+                        <User style="margin-left: 10px" />
                         {{
                             t('dialog.world.instances.private_count', {
                                 count: worldDialog.ref.privateOccupants
                             })
                         }}
-                        <el-icon style="margin-left: 10px"><Check /></el-icon>
+                        <Check style="margin-left: 10px" />
                         {{
                             t('dialog.world.instances.capacity_count', {
                                 count: worldDialog.ref.recommendedCapacity,
@@ -419,9 +417,7 @@
                                                 :style="{ color: user.$userColour }"
                                                 v-text="user.displayName" />
                                             <span v-if="user.location === 'traveling'" class="extra">
-                                                <el-icon class="is-loading" style="margin-right: 3px"
-                                                    ><Loading
-                                                /></el-icon>
+                                                <Loader2 class="is-loading" style="margin-right: 3px" />
                                                 <Timer :epoch="user.$travelingToTime" />
                                             </span>
                                             <span v-else class="extra">
@@ -615,7 +611,7 @@
                                             {{ timeInLab }}
                                         </span>
                                     </template>
-                                    <el-icon><ArrowDown /></el-icon>
+                                    <ArrowDown />
                                 </TooltipWrapper>
                                 <span class="extra">
                                     {{ formatDateFilter(worldDialog.ref.publicationDate, 'long') }}
@@ -664,33 +660,7 @@
                                 <span class="name">
                                     {{ t('dialog.world.info.last_visited') }}
                                     <TooltipWrapper side="top" :content="t('dialog.world.info.accuracy_notice')"
-                                        ><el-icon style="margin-left: 3px"><Warning /></el-icon
-                                    ></TooltipWrapper>
-                                </span>
-                                <span class="extra">{{ formatDateFilter(worldDialog.lastVisit, 'long') }}</span>
-                            </div>
-                        </div>
-                        <TooltipWrapper side="top" :content="t('dialog.user.info.open_previous_instance')">
-                            <div class="x-friend-item" @click="showPreviousInstancesWorldDialog(worldDialog.ref)">
-                                <div class="detail">
-                                    <span class="name">
-                                        {{ t('dialog.world.info.visit_count') }}
-                                        <TooltipWrapper side="top" :content="t('dialog.world.info.accuracy_notice')"
-                                            ><el-icon style="margin-left: 3px"><Warning /></el-icon
-                                        ></TooltipWrapper>
-                                    </span>
-                                    <span class="extra">
-                                        {{ worldDialog.visitCount }}
-                                    </span>
-                                </div>
-                            </div>
-                        </TooltipWrapper>
-                        <div class="x-friend-item" style="cursor: default">
-                            <div class="detail">
-                                <span class="name"
-                                    >{{ t('dialog.world.info.time_spent') }}
-                                    <TooltipWrapper side="top" :content="t('dialog.world.info.accuracy_notice')">
-                                        <el-icon style="margin-left: 3px"><Warning /></el-icon>
+                                        ><AlertTriangle style="margin-left: 3px" />
                                     </TooltipWrapper>
                                 </span>
                                 <span class="extra">
@@ -747,28 +717,29 @@
 
 <script setup>
     import {
+        AlertTriangle,
         ArrowDown,
         Check,
-        DataLine,
-        Delete,
         Download,
-        Edit,
+        Ellipsis,
+        Eye,
         Flag,
-        HomeFilled,
-        Loading,
-        MagicStick,
-        Message,
-        Picture,
-        Refresh,
-        Share,
+        Home,
+        Image,
+        LineChart,
+        Loader2,
+        MessageSquare,
+        Pencil,
+        RefreshCcw,
+        RefreshCw,
+        Share2,
+        Star,
+        Trash2,
         Upload,
         User,
-        UserFilled,
-        View,
-        Warning
-    } from '@element-plus/icons-vue';
+        Wand2
+    } from 'lucide-vue-next';
     import { computed, defineAsyncComponent, nextTick, ref, watch } from 'vue';
-    import { Ellipsis, RefreshCcw, Star, Trash2 } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { ElMessageBox } from 'element-plus';
     import { InputGroupTextareaField } from '@/components/ui/input-group';
@@ -993,13 +964,13 @@
             return;
         }
         switch (command) {
-            case 'Delete Favorite':
+            case 'Trash2 Favorite':
             case 'Make Home':
             case 'Reset Home':
             case 'Publish':
             case 'Unpublish':
-            case 'Delete Persistent Data':
-            case 'Delete':
+            case 'Trash2 Persistent Data':
+            case 'Trash2':
                 modalStore
                     .confirm({
                         description: `Continue? ${command}`,
@@ -1008,7 +979,7 @@
                     .then(({ ok }) => {
                         if (!ok) return;
                         switch (command) {
-                            case 'Delete Favorite':
+                            case 'Trash2 Favorite':
                                 favoriteRequest.deleteFavorite({
                                     objectId: D.id
                                 });
@@ -1053,7 +1024,7 @@
                                         return args;
                                     });
                                 break;
-                            case 'Delete Persistent Data':
+                            case 'Trash2 Persistent Data':
                                 miscRequest
                                     .deleteWorldPersistData({
                                         worldId: D.id
@@ -1066,7 +1037,7 @@
                                         return args;
                                     });
                                 break;
-                            case 'Delete':
+                            case 'Trash2':
                                 worldRequest
                                     .deleteWorld({
                                         worldId: D.id
@@ -1096,7 +1067,7 @@
             case 'Previous Instances':
                 showPreviousInstancesWorldDialog(D.ref);
                 break;
-            case 'Share':
+            case 'Share2':
                 copyWorldUrl();
                 break;
             case 'Change Allowed Domains':
@@ -1111,7 +1082,7 @@
             case 'Change Image':
                 showChangeWorldImageDialog();
                 break;
-            case 'Refresh':
+            case 'RefreshCw':
                 showWorldDialog(D.id);
                 break;
             case 'New Instance':
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 9e69d82d..434fd491 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -133,7 +133,6 @@
 }
 
 .lucide {
-    width: 16px;
-    height: 16px;
-    stroke-width: 1.5px;
+    width: 1em;
+    height: 1em;
 }
diff --git a/src/views/Charts/components/InstanceActivity.vue b/src/views/Charts/components/InstanceActivity.vue
index d5b52b2b..542613cb 100644
--- a/src/views/Charts/components/InstanceActivity.vue
+++ b/src/views/Charts/components/InstanceActivity.vue
@@ -5,7 +5,7 @@
                 <span>{{ t('view.charts.instance_activity.header') }}</span>
                 <HoverCard>
                     <HoverCardTrigger as-child>
-                        <el-icon style="margin-left: 5px; font-size: 12px; opacity: 0.7"><InfoFilled /></el-icon>
+                        <Info style="margin-left: 5px; font-size: 12px; opacity: 0.7" />
                     </HoverCardTrigger>
                     <HoverCardContent side="bottom" align="start" class="w-[300px]">
                         <div class="tips-popover">
@@ -13,8 +13,8 @@
                             <div>{{ t('view.charts.instance_activity.tips.click_Y_axis') }}</div>
                             <div>{{ t('view.charts.instance_activity.tips.click_instance_name') }}</div>
                             <div>
-                                <el-icon><WarningFilled /></el-icon
-                                ><i>{{ t('view.charts.instance_activity.tips.accuracy_notice') }}</i>
+                                <AlertTriangle />
+                                <i>{{ t('view.charts.instance_activity.tips.accuracy_notice') }}</i>
                             </div>
                         </div>
                     </HoverCardContent>
@@ -145,9 +145,8 @@
 
 <script setup>
     import { computed, nextTick, onBeforeMount, onBeforeUnmount, onMounted, ref, watch } from 'vue';
-    import { ArrowLeft, ArrowRight, InfoFilled, WarningFilled } from '@element-plus/icons-vue';
+    import { AlertTriangle, ArrowLeft, ArrowRight, Info, RefreshCcw, Settings } from 'lucide-vue-next';
     import { HoverCard, HoverCardContent, HoverCardTrigger } from '@/components/ui/hover-card';
-    import { RefreshCcw, Settings } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { ButtonGroup } from '@/components/ui/button-group';
     import { storeToRefs } from 'pinia';
@@ -671,9 +670,6 @@
                 margin-right: 3px;
             }
         }
-        & .el-icon-warning-outline {
-            font-size: 12px;
-        }
     }
     .settings {
         & > div {
diff --git a/src/views/Favorites/FavoritesAvatar.vue b/src/views/Favorites/FavoritesAvatar.vue
index 68343485..c99b745e 100644
--- a/src/views/Favorites/FavoritesAvatar.vue
+++ b/src/views/Favorites/FavoritesAvatar.vue
@@ -97,7 +97,7 @@
                                     :disabled="isFavoriteLoading"
                                     @click.stop="handleRefreshFavorites">
                                     <Spinner v-if="isFavoriteLoading" />
-                                    <Refresh v-else />
+                                    <RefreshCw v-else />
                                 </Button>
                             </TooltipWrapper>
                         </div>
@@ -126,7 +126,7 @@
                                             ">
                                             <DropdownMenuTrigger asChild>
                                                 <Button class="rounded-full" variant="ghost" size="icon-sm" @click.stop>
-                                                    <MoreFilled />
+                                                    <MoreHorizontal />
                                                 </Button>
                                             </DropdownMenuTrigger>
                                             <DropdownMenuContent side="right" class="w-55 p-1 rounded-lg">
@@ -290,7 +290,7 @@
                                         { 'is-disabled': !isLocalUserVrcPlusSupporter }
                                     ]"
                                     @click="startLocalGroupCreation">
-                                    <el-icon><Plus /></el-icon>
+                                    <Plus />
                                     <span>{{ t('view.favorite.avatars.new_group') }}</span>
                                 </div>
                             </TooltipWrapper>
@@ -526,8 +526,7 @@
 
 <script setup>
     import { computed, markRaw, nextTick, onBeforeMount, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue';
-    import { Ellipsis, Loader, RefreshCcw } from 'lucide-vue-next';
-    import { MoreFilled, Plus, Refresh } from '@element-plus/icons-vue';
+    import { Ellipsis, Loader, MoreHorizontal, Plus, RefreshCcw, RefreshCw } from 'lucide-vue-next';
     import { InputGroupField, InputGroupSearch } from '@/components/ui/input-group';
     import { Button } from '@/components/ui/button';
     import { ElMessageBox } from 'element-plus';
@@ -1194,7 +1193,7 @@
 
         const result = await modalStore.confirm({
             description: `Are you sure you want to unfavorite ${total} favorites?\nThis action cannot be undone.`,
-            title: `Delete ${total} favorites?`
+            title: `Trash2 ${total} favorites?`
         });
 
         if (!result.ok) {
@@ -1448,7 +1447,7 @@
     function promptLocalAvatarFavoriteGroupDelete(group) {
         modalStore
             .confirm({
-                description: `Delete Group? ${group}`,
+                description: `Trash2 Group? ${group}`,
                 title: 'Confirm'
             })
             .then(() => deleteLocalAvatarFavoriteGroup(group))
diff --git a/src/views/Favorites/FavoritesFriend.vue b/src/views/Favorites/FavoritesFriend.vue
index aca09634..6160410e 100644
--- a/src/views/Favorites/FavoritesFriend.vue
+++ b/src/views/Favorites/FavoritesFriend.vue
@@ -97,7 +97,7 @@
                                     :disabled="isFavoriteLoading"
                                     @click.stop="handleRefreshFavorites">
                                     <Spinner v-if="isFavoriteLoading" />
-                                    <Refresh v-else />
+                                    <RefreshCw v-else />
                                 </Button>
                             </TooltipWrapper>
                         </div>
@@ -106,10 +106,7 @@
                                 <div
                                     v-for="group in favoriteFriendGroups"
                                     :key="group.key"
-                                    :class="[
-                                        'group-item',
-                                        { 'is-active': !hasSearchInput && isGroupActive('remote', group.key) }
-                                    ]"
+                                    :class="[ 'group-item', { 'is-active': !hasSearchInput && isGroupActive('remote', group.key) } ]"
                                     @click="handleGroupClick('remote', group.key)">
                                     <div class="group-item__top">
                                         <span class="group-item__name">{{ group.displayName }}</span>
@@ -126,7 +123,7 @@
                                             ">
                                             <DropdownMenuTrigger asChild>
                                                 <Button class="rounded-full" variant="ghost" size="icon-sm" @click.stop>
-                                                    <MoreFilled />
+                                                    <MoreHorizontal />
                                                 </Button>
                                             </DropdownMenuTrigger>
                                             <DropdownMenuContent side="right" class="w-55 p-1 rounded-lg">
@@ -152,13 +149,7 @@
                                                                         v-for="visibility in friendGroupVisibilityOptions"
                                                                         :key="visibility"
                                                                         type="button"
-                                                                        :class="[
-                                                                            'group-visibility-menu__item',
-                                                                            {
-                                                                                'is-active':
-                                                                                    group.visibility === visibility
-                                                                            }
-                                                                        ]"
+                                                                        :class="[ 'group-visibility-menu__item', { 'is-active': group.visibility === visibility } ]"
                                                                         @click="
                                                                             handleVisibilitySelection(group, visibility)
                                                                         ">
@@ -310,7 +301,7 @@
 
 <script setup>
     import { computed, nextTick, onBeforeMount, onMounted, onUnmounted, ref, watch } from 'vue';
-    import { MoreFilled, Refresh } from '@element-plus/icons-vue';
+    import { MoreHorizontal, RefreshCw } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { ElMessageBox } from 'element-plus';
     import { Ellipsis } from 'lucide-vue-next';
@@ -762,7 +753,7 @@
         modalStore
             .confirm({
                 description: `Are you sure you want to unfavorite ${total} favorites?\n            This action cannot be undone.`,
-                title: `Delete ${total} favorites?`
+                title: `Trash2 ${total} favorites?`
             })
             .then(({ ok }) => ok && bulkUnfavoriteSelectedFriends([...selectedFavoriteFriends.value]))
             .catch(() => {});
diff --git a/src/views/Favorites/FavoritesWorld.vue b/src/views/Favorites/FavoritesWorld.vue
index cf369839..2bc05ede 100644
--- a/src/views/Favorites/FavoritesWorld.vue
+++ b/src/views/Favorites/FavoritesWorld.vue
@@ -97,7 +97,7 @@
                                     :disabled="isFavoriteLoading"
                                     @click.stop="handleRefreshFavorites">
                                     <Spinner v-if="isFavoriteLoading" />
-                                    <Refresh v-else />
+                                    <RefreshCw v-else />
                                 </Button>
                             </TooltipWrapper>
                         </div>
@@ -126,7 +126,7 @@
                                             ">
                                             <DropdownMenuTrigger asChild>
                                                 <Button class="rounded-full" variant="ghost" size="icon-sm" @click.stop>
-                                                    <MoreFilled />
+                                                    <MoreHorizontal />
                                                 </Button>
                                             </DropdownMenuTrigger>
                                             <DropdownMenuContent side="right" class="w-50 p-1 rounded-lg">
@@ -274,7 +274,7 @@
                                 v-if="!isCreatingLocalGroup"
                                 class="group-item group-item--new"
                                 @click="startLocalGroupCreation">
-                                <el-icon><Plus /></el-icon>
+                                <Plus />
                                 <span>{{ t('view.favorite.worlds.new_group') }}</span>
                             </div>
                             <InputGroupField
@@ -437,8 +437,7 @@
 
 <script setup>
     import { computed, nextTick, onBeforeMount, onBeforeUnmount, onMounted, ref, watch } from 'vue';
-    import { MoreFilled, Plus, Refresh } from '@element-plus/icons-vue';
-    import { Ellipsis, RefreshCcw } from 'lucide-vue-next';
+    import { Ellipsis, MoreHorizontal, Plus, RefreshCcw, RefreshCw } from 'lucide-vue-next';
     import { InputGroupField, InputGroupSearch } from '@/components/ui/input-group';
     import { Button } from '@/components/ui/button';
     import { ElMessageBox } from 'element-plus';
@@ -1063,7 +1062,7 @@
             .confirm({
                 description: `Are you sure you want to unfavorite ${total} favorites?
             This action cannot be undone.`,
-                title: `Delete ${total} favorites?`
+                title: `Trash2 ${total} favorites?`
             })
             .then(() => bulkUnfavoriteSelectedWorlds([...selectedFavoriteWorlds.value]))
             .catch(() => {});
@@ -1174,7 +1173,7 @@
     function promptLocalWorldFavoriteGroupDelete(group) {
         modalStore
             .confirm({
-                description: `Delete Group? ${group}`,
+                description: `Trash2 Group? ${group}`,
                 title: 'Confirm'
             })
             .then(() => deleteLocalWorldFavoriteGroup(group))
diff --git a/src/views/Favorites/dialogs/AvatarImportDialog.vue b/src/views/Favorites/dialogs/AvatarImportDialog.vue
index 8bb1b4b5..c4608a6c 100644
--- a/src/views/Favorites/dialogs/AvatarImportDialog.vue
+++ b/src/views/Favorites/dialogs/AvatarImportDialog.vue
@@ -10,7 +10,7 @@
                 <div v-if="avatarImportDialog.progress">
                     {{ t('dialog.avatar_import.process_progress') }} {{ avatarImportDialog.progress }} /
                     {{ avatarImportDialog.progressTotal }}
-                    <el-icon style="margin: 0 5px"><Loading /></el-icon>
+                    <Loader2 style="margin: 0 5px" />
                 </div>
                 <Button v-if="avatarImportDialog.loading" size="sm" variant="secondary" @click="cancelAvatarImport">
                     {{ t('dialog.avatar_import.cancel') }}
@@ -89,7 +89,7 @@
             </div>
         </div>
         <span v-if="avatarImportDialog.importProgress" style="margin: 10px">
-            <el-icon style="margin-right: 5px"><Loading /></el-icon>
+            <Loader2 style="margin-right: 5px" />
             {{ t('dialog.avatar_import.import_progress') }}
             {{ avatarImportDialog.importProgress }}/{{ avatarImportDialog.importProgressTotal }}
         </span>
@@ -119,7 +119,7 @@
     import { Button } from '@/components/ui/button';
     import { DataTableLayout } from '@/components/ui/data-table';
     import { InputGroupTextareaField } from '@/components/ui/input-group';
-    import { Loading } from '@element-plus/icons-vue';
+    import { Loader2 } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
     import { useI18n } from 'vue-i18n';
diff --git a/src/views/Favorites/dialogs/FriendImportDialog.vue b/src/views/Favorites/dialogs/FriendImportDialog.vue
index 4202494f..2fff9f82 100644
--- a/src/views/Favorites/dialogs/FriendImportDialog.vue
+++ b/src/views/Favorites/dialogs/FriendImportDialog.vue
@@ -10,7 +10,7 @@
                 <div v-if="friendImportDialog.progress">
                     {{ t('dialog.friend_import.process_progress') }} {{ friendImportDialog.progress }} /
                     {{ friendImportDialog.progressTotal }}
-                    <el-icon style="margin: 0 5px"><Loading /></el-icon>
+                    <Loader2 style="margin: 0 5px" />
                 </div>
                 <Button v-if="friendImportDialog.loading" size="sm" variant="secondary" @click="cancelFriendImport">
                     {{ t('dialog.friend_import.cancel') }}
@@ -71,7 +71,7 @@
             </div>
         </div>
         <span v-if="friendImportDialog.importProgress" style="margin: 10px">
-            <el-icon style="margin-right: 5px"><Loading /></el-icon>
+            <Loader2 style="margin-right: 5px" />
             {{ t('dialog.friend_import.import_progress') }} {{ friendImportDialog.importProgress }}/{{
                 friendImportDialog.importProgressTotal
             }}
@@ -100,7 +100,7 @@
     import { Button } from '@/components/ui/button';
     import { DataTableLayout } from '@/components/ui/data-table';
     import { InputGroupTextareaField } from '@/components/ui/input-group';
-    import { Loading } from '@element-plus/icons-vue';
+    import { Loader2 } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
     import { useI18n } from 'vue-i18n';
diff --git a/src/views/Favorites/dialogs/WorldImportDialog.vue b/src/views/Favorites/dialogs/WorldImportDialog.vue
index b18f0805..1204bc8b 100644
--- a/src/views/Favorites/dialogs/WorldImportDialog.vue
+++ b/src/views/Favorites/dialogs/WorldImportDialog.vue
@@ -11,7 +11,7 @@
                 <div v-if="worldImportDialog.progress">
                     {{ t('dialog.world_import.process_progress') }}
                     {{ worldImportDialog.progress }} / {{ worldImportDialog.progressTotal }}
-                    <el-icon style="margin: 0 5px"><Loading /></el-icon>
+                    <Loader2 style="margin: 0 5px" />
                 </div>
                 <Button v-if="worldImportDialog.loading" size="sm" variant="outline" @click="cancelWorldImport">
                     {{ t('dialog.world_import.cancel') }}
@@ -94,7 +94,7 @@
             </div>
         </div>
         <span v-if="worldImportDialog.importProgress" style="margin: 10px">
-            <el-icon style="margin-right: 5px"><Loading /></el-icon>
+            <Loader2 style="margin-right: 5px" />
             {{ t('dialog.world_import.import_progress') }}
             {{ worldImportDialog.importProgress }}/{{ worldImportDialog.importProgressTotal }}
         </span>
@@ -124,7 +124,7 @@
     import { Button } from '@/components/ui/button';
     import { DataTableLayout } from '@/components/ui/data-table';
     import { InputGroupTextareaField } from '@/components/ui/input-group';
-    import { Loading } from '@element-plus/icons-vue';
+    import { Loader2 } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
     import { useI18n } from 'vue-i18n';
diff --git a/src/views/FriendsLocations/FriendsLocations.vue b/src/views/FriendsLocations/FriendsLocations.vue
index 5d74ce29..24356030 100644
--- a/src/views/FriendsLocations/FriendsLocations.vue
+++ b/src/views/FriendsLocations/FriendsLocations.vue
@@ -148,16 +148,12 @@
                 <div v-else class="friend-view__empty">{{ t('view.friends_locations.no_matching_friends') }}</div>
             </template>
             <div v-if="isLoadingMore" class="friend-view__loading">
-                <el-icon class="friend-view__loading-icon" :size="18">
-                    <Loading />
-                </el-icon>
+                <Loader2 class="friend-view__loading-icon" :size="18" />
                 <span>{{ t('view.friends_locations.loading_more') }}</span>
             </div>
         </el-scrollbar>
         <div v-else class="friend-view__initial-loading">
-            <el-icon class="friend-view__loading-icon" :size="22">
-                <Loading />
-            </el-icon>
+            <Loader2 class="friend-view__loading-icon" :size="22" />
         </div>
     </div>
 </template>
@@ -165,10 +161,9 @@
 <script setup>
     import { computed, nextTick, onBeforeMount, onBeforeUnmount, onMounted, ref, watch } from 'vue';
     import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';
+    import { Loader2, Settings } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { InputGroupSearch } from '@/components/ui/input-group';
-    import { Loading } from '@element-plus/icons-vue';
-    import { Settings } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/views/Moderation/Moderation.vue b/src/views/Moderation/Moderation.vue
index adef9741..6cc38447 100644
--- a/src/views/Moderation/Moderation.vue
+++ b/src/views/Moderation/Moderation.vue
@@ -32,7 +32,7 @@
                     :disabled="playerModerationTable.loading"
                     @click="refreshPlayerModerations()">
                     <Spinner v-if="playerModerationTable.loading" />
-                    <Refresh v-else />
+                    <RefreshCw v-else />
                 </Button>
             </TooltipWrapper>
         </div>
@@ -52,7 +52,7 @@
     import { computed, ref, watch } from 'vue';
     import { Button } from '@/components/ui/button';
     import { InputGroupField } from '@/components/ui/input-group';
-    import { Refresh } from '@element-plus/icons-vue';
+    import { RefreshCw } from 'lucide-vue-next';
     import { Spinner } from '@/components/ui/spinner';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
@@ -112,7 +112,7 @@
     function deletePlayerModerationPrompt(row) {
         modalStore
             .confirm({
-                description: `Continue? Delete Moderation ${row.type}`,
+                description: `Continue? Trash2 Moderation ${row.type}`,
                 title: 'Confirm'
             })
             .then(({ ok }) => ok && deletePlayerModeration(row))
diff --git a/src/views/Notifications/Notification.vue b/src/views/Notifications/Notification.vue
index f5d7ee60..42022ae4 100644
--- a/src/views/Notifications/Notification.vue
+++ b/src/views/Notifications/Notification.vue
@@ -66,7 +66,7 @@
                             style="flex: none"
                             @click="refreshNotifications()">
                             <Spinner v-if="isNotificationsLoading" />
-                            <Refresh v-else />
+                            <RefreshCw v-else />
                         </Button>
                     </TooltipWrapper>
                 </div>
@@ -86,7 +86,7 @@
     import { computed, ref, watch } from 'vue';
     import { Button } from '@/components/ui/button';
     import { InputGroupField } from '@/components/ui/input-group';
-    import { Refresh } from '@element-plus/icons-vue';
+    import { RefreshCw } from 'lucide-vue-next';
     import { Spinner } from '@/components/ui/spinner';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
@@ -483,7 +483,7 @@
     function deleteNotificationLogPrompt(row) {
         modalStore
             .confirm({
-                description: `Continue? Delete ${row.type}`,
+                description: `Continue? Trash2 ${row.type}`,
                 title: 'Confirm'
             })
             .then(({ ok }) => {
diff --git a/src/views/PlayerList/PlayerList.vue b/src/views/PlayerList/PlayerList.vue
index f2ee1a35..f5bd3276 100644
--- a/src/views/PlayerList/PlayerList.vue
+++ b/src/views/PlayerList/PlayerList.vue
@@ -25,14 +25,12 @@
                                 line-clamp: 1;
                             "
                             @click="showWorldDialog(currentInstanceWorld.ref.id)">
-                            <el-icon
+                            <Home
                                 v-if="
                                     currentUser.$homeLocation &&
                                     currentUser.$homeLocation.worldId === currentInstanceWorld.ref.id
                                 "
-                                style="margin-right: 5px"
-                                ><HomeFilled
-                            /></el-icon>
+                                style="margin-right: 5px" />
                             {{ currentInstanceWorld.ref.name }}
                         </span>
                     </div>
@@ -169,7 +167,7 @@
 
 <script setup>
     import { computed, defineAsyncComponent, onActivated, onMounted, ref, watch } from 'vue';
-    import { HomeFilled } from '@element-plus/icons-vue';
+    import { Home } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/views/PlayerList/components/photonEventColumns.jsx b/src/views/PlayerList/components/photonEventColumns.jsx
index 802ccd48..55068ebb 100644
--- a/src/views/PlayerList/components/photonEventColumns.jsx
+++ b/src/views/PlayerList/components/photonEventColumns.jsx
@@ -1,4 +1,4 @@
-import { ArrowRight, Download } from '@element-plus/icons-vue';
+import { ArrowRight, Download } from 'lucide-vue-next';
 
 import Location from '@/components/Location.vue';
 import { TooltipWrapper } from '@/components/ui/tooltip';
@@ -46,9 +46,7 @@ function DetailCell({ row, isPrevious, onShowAvatar, onShowGroup, onShowWorld, o
                 &nbsp;
                 {!r.inCache ? (
                     <span style="color: #aaa">
-                        <el-icon>
-                            <Download />
-                        </el-icon>
+                        <Download />
                         &nbsp;
                     </span>
                 ) : null}
@@ -90,9 +88,7 @@ function DetailCell({ row, isPrevious, onShowAvatar, onShowGroup, onShowWorld, o
                             ></i>
                         </TooltipWrapper>
                         <span>
-                            <el-icon>
-                                <ArrowRight />
-                            </el-icon>
+                            <ArrowRight / />
                         </span>
                         <TooltipWrapper
                             side="top"
@@ -130,9 +126,7 @@ function DetailCell({ row, isPrevious, onShowAvatar, onShowGroup, onShowWorld, o
                     {r.previousGroupName || r.previousGroupId}
                 </span>
                 <span>
-                    <el-icon>
-                        <ArrowRight />
-                    </el-icon>
+                    <ArrowRight / />
                 </span>
                 <span
                     class="x-link"
@@ -198,9 +192,7 @@ function DetailCell({ row, isPrevious, onShowAvatar, onShowGroup, onShowWorld, o
                 &nbsp;
                 {!r.inCache ? (
                     <span style="color: #aaa">
-                        <el-icon>
-                            <Download />
-                        </el-icon>
+                        <Download / />
                         &nbsp;
                     </span>
                 ) : null}
diff --git a/src/views/Search/Search.vue b/src/views/Search/Search.vue
index 27de2812..658e0640 100644
--- a/src/views/Search/Search.vue
+++ b/src/views/Search/Search.vue
@@ -60,7 +60,7 @@
                             size="sm"
                             :disabled="!searchUserParams.offset"
                             @click="handleMoreSearchUser(-1)">
-                            <Back />
+                            <ArrowLeft />
                             {{ t('view.search.prev_page') }}
                         </Button>
                         <Button
@@ -68,7 +68,7 @@
                             size="sm"
                             :disabled="searchUserResults.length < 10"
                             @click="handleMoreSearchUser(1)">
-                            <Right />
+                            <ArrowRight />
                             {{ t('view.search.next_page') }}
                         </Button>
                     </ButtonGroup>
@@ -124,7 +124,7 @@
                             size="sm"
                             :disabled="!searchWorldParams.offset"
                             @click="moreSearchWorld(-1)">
-                            <Back />
+                            <ArrowLeft />
                             {{ t('view.search.prev_page') }}
                         </Button>
                         <Button
@@ -132,7 +132,7 @@
                             size="sm"
                             :disabled="searchWorldResults.length < 10"
                             @click="moreSearchWorld(1)">
-                            <Right />
+                            <ArrowRight />
                             {{ t('view.search.next_page') }}
                         </Button>
                     </ButtonGroup>
@@ -169,7 +169,7 @@
                                     :disabled="userDialog.isAvatarsLoading"
                                     @click="refreshUserDialogAvatars">
                                     <Spinner v-if="userDialog.isAvatarsLoading" />
-                                    <Refresh v-else />
+                                    <RefreshCw v-else />
                                 </Button>
                             </TooltipWrapper>
                             <span style="font-size: 14px; margin-left: 5px; margin-right: 5px">{{
@@ -281,7 +281,7 @@
                             size="sm"
                             :disabled="!searchAvatarPageNum"
                             @click="moreSearchAvatar(-1)">
-                            <Back />
+                            <ArrowLeft />
                             {{ t('view.search.prev_page') }}
                         </Button>
                         <Button
@@ -292,7 +292,7 @@
                                 (searchAvatarPageNum + 1) * 10 >= searchAvatarResults.length
                             "
                             @click="moreSearchAvatar(1)">
-                            <Right />
+                            <ArrowRight />
                             {{ t('view.search.next_page') }}
                         </Button>
                     </ButtonGroup>
@@ -334,7 +334,7 @@
                             size="sm"
                             :disabled="!searchGroupParams.offset"
                             @click="moreSearchGroup(-1)">
-                            <Back />
+                            <ArrowLeft />
                             {{ t('view.search.prev_page') }}
                         </Button>
                         <Button
@@ -342,7 +342,7 @@
                             size="sm"
                             :disabled="searchGroupResults.length < 10"
                             @click="moreSearchGroup(1)">
-                            <Right />
+                            <ArrowRight />
                             {{ t('view.search.next_page') }}
                         </Button>
                     </ButtonGroup>
@@ -354,7 +354,7 @@
 
 <script setup>
     import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
-    import { Back, Refresh, Right } from '@element-plus/icons-vue';
+    import { ArrowLeft, ArrowRight, RefreshCw, Trash2 } from 'lucide-vue-next';
     import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
     import { computed, ref } from 'vue';
     import { Button } from '@/components/ui/button';
@@ -363,7 +363,6 @@
     import { InputGroupField } from '@/components/ui/input-group';
     import { Spinner } from '@/components/ui/spinner';
     import { TabsUnderline } from '@/components/ui/tabs';
-    import { Trash2 } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/views/Settings/components/SimpleSwitch.vue b/src/views/Settings/components/SimpleSwitch.vue
index 24665b75..73231695 100644
--- a/src/views/Settings/components/SimpleSwitch.vue
+++ b/src/views/Settings/components/SimpleSwitch.vue
@@ -2,9 +2,9 @@
     <div class="simple-switch">
         <div class="name" :style="{ width: longLabel ? '300px' : undefined }">
             {{ label }}
-            <TooltipWrapper v-if="tooltip" side="top" :content="tooltip"
-                ><el-icon size="small" class="tooltip"><InfoFilled /></el-icon
-            ></TooltipWrapper>
+            <TooltipWrapper v-if="tooltip" side="top" :content="tooltip">
+                <Info size="small" class="tooltip" />
+            </TooltipWrapper>
         </div>
 
         <Switch class="switch" :model-value="value" @update:modelValue="change" :disabled="disabled" />
@@ -12,7 +12,7 @@
 </template>
 
 <script setup>
-    import { InfoFilled } from '@element-plus/icons-vue';
+    import { Info } from 'lucide-vue-next';
 
     import { Switch } from '../../../components/ui/switch';
     defineProps({
diff --git a/src/views/Settings/components/Tabs/AdvancedTab.vue b/src/views/Settings/components/Tabs/AdvancedTab.vue
index d55c7e56..1ee07cb6 100644
--- a/src/views/Settings/components/Tabs/AdvancedTab.vue
+++ b/src/views/Settings/components/Tabs/AdvancedTab.vue
@@ -5,15 +5,15 @@
             <div class="options-container-item" style="margin-top: 15px">
                 <ButtonGroup>
                     <Button variant="outline" size="sm" @click="showVRChatConfig()">
-                        <Operation />
+                        <Settings />
                         VRChat config.json
                     </Button>
                     <Button variant="outline" size="sm" @click="showLaunchOptions()">
-                        <Operation />
+                        <Settings />
                         {{ t('view.settings.advanced.advanced.launch_options') }}
                     </Button>
                     <Button variant="outline" size="sm" @click="showRegistryBackupDialog()">
-                        <Goods />
+                        <Package />
                         {{ t('view.settings.advanced.advanced.vrc_registry_backup') }}
                     </Button>
                 </ButtonGroup>
@@ -384,9 +384,8 @@
 </template>
 
 <script setup>
-    import { Folder, Goods, Operation } from '@element-plus/icons-vue';
+    import { Folder, Package, RefreshCcw, Settings, Trash2 } from 'lucide-vue-next';
     import { computed, reactive, ref } from 'vue';
-    import { RefreshCcw, Trash2 } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { ButtonGroup } from '@/components/ui/button-group';
     import { storeToRefs } from 'pinia';
diff --git a/src/views/Settings/components/Tabs/AppearanceTab.vue b/src/views/Settings/components/Tabs/AppearanceTab.vue
index c1a5aead..ae2c2cb1 100644
--- a/src/views/Settings/components/Tabs/AppearanceTab.vue
+++ b/src/views/Settings/components/Tabs/AppearanceTab.vue
@@ -220,7 +220,7 @@
                         <SelectItem value="Sort by Status">{{
                             t('view.settings.appearance.side_panel.sorting.status')
                         }}</SelectItem>
-                        <SelectItem value="Sort Private to Bottom">{{
+                        <SelectItem value="Sort Private to ArrowDown">{{
                             t('view.settings.appearance.side_panel.sorting.private_to_bottom')
                         }}</SelectItem>
                         <SelectItem value="Sort by Last Active">{{
@@ -237,7 +237,7 @@
                         }}</SelectItem>
                     </SelectContent>
                 </Select>
-                <el-icon style="margin: 5px"><ArrowRight /></el-icon>
+                <ArrowRight style="margin: 5px" />
                 <Select
                     :model-value="sidebarSortMethod2"
                     :disabled="!sidebarSortMethod1"
@@ -253,7 +253,7 @@
                         <SelectItem value="Sort by Status">{{
                             t('view.settings.appearance.side_panel.sorting.status')
                         }}</SelectItem>
-                        <SelectItem value="Sort Private to Bottom">{{
+                        <SelectItem value="Sort Private to ArrowDown">{{
                             t('view.settings.appearance.side_panel.sorting.private_to_bottom')
                         }}</SelectItem>
                         <SelectItem value="Sort by Last Active">{{
@@ -270,7 +270,7 @@
                         }}</SelectItem>
                     </SelectContent>
                 </Select>
-                <el-icon style="margin: 5px"><ArrowRight /></el-icon>
+                <ArrowRight style="margin: 5px" />
                 <Select
                     :model-value="sidebarSortMethod3"
                     :disabled="!sidebarSortMethod2"
@@ -286,7 +286,7 @@
                         <SelectItem value="Sort by Status">{{
                             t('view.settings.appearance.side_panel.sorting.status')
                         }}</SelectItem>
-                        <SelectItem value="Sort Private to Bottom">{{
+                        <SelectItem value="Sort Private to ArrowDown">{{
                             t('view.settings.appearance.side_panel.sorting.private_to_bottom')
                         }}</SelectItem>
                         <SelectItem value="Sort by Last Active">{{
@@ -438,9 +438,8 @@
     } from '@/components/ui/tags-input';
     import { Popover, PopoverAnchor, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
     import { computed, onBeforeUnmount, ref, watch } from 'vue';
-    import { CheckIcon, ChevronDown } from 'lucide-vue-next';
+    import { ArrowRight, CheckIcon, ChevronDown } from 'lucide-vue-next';
     import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
-    import { ArrowRight } from '@element-plus/icons-vue';
     import { Button } from '@/components/ui/button';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
diff --git a/src/views/Settings/components/Tabs/GeneralTab.vue b/src/views/Settings/components/Tabs/GeneralTab.vue
index 9857fab1..9ea3000a 100644
--- a/src/views/Settings/components/Tabs/GeneralTab.vue
+++ b/src/views/Settings/components/Tabs/GeneralTab.vue
@@ -244,7 +244,7 @@
                         side="top"
                         style="margin-left: 5px"
                         :content="t('view.settings.general.automation.auto_invite_request_accept_tooltip')">
-                        <el-icon><InfoFilled /></el-icon>
+                        <Info />
                     </TooltipWrapper>
                 </span>
                 <br />
@@ -303,7 +303,7 @@
 <script setup>
     import { computed, defineAsyncComponent, ref } from 'vue';
     import { Button } from '@/components/ui/button';
-    import { InfoFilled } from '@element-plus/icons-vue';
+    import { Info } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/views/Settings/components/Tabs/PicturesTab.vue b/src/views/Settings/components/Tabs/PicturesTab.vue
index 43c1d67f..8316e46d 100644
--- a/src/views/Settings/components/Tabs/PicturesTab.vue
+++ b/src/views/Settings/components/Tabs/PicturesTab.vue
@@ -67,7 +67,7 @@
         <TooltipWrapper
             side="top"
             :content="t('view.settings.advanced.advanced.save_instance_prints_to_file.header_tooltip')">
-            <el-icon><InfoFilled /></el-icon>
+            <Info />
         </TooltipWrapper>
         <simple-switch
             :label="t('view.settings.advanced.advanced.save_instance_prints_to_file.description')"
@@ -93,7 +93,7 @@
         <TooltipWrapper
             side="top"
             :content="t('view.settings.advanced.advanced.save_instance_prints_to_file.header_tooltip')">
-            <el-icon><InfoFilled /></el-icon>
+            <Info />
         </TooltipWrapper>
         <simple-switch
             :label="t('view.settings.advanced.advanced.save_instance_emoji_to_file.description')"
@@ -105,7 +105,7 @@
 
 <script setup>
     import { Button } from '@/components/ui/button';
-    import { InfoFilled } from '@element-plus/icons-vue';
+    import { Info } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/views/Settings/dialogs/FeedFiltersDialog.vue b/src/views/Settings/dialogs/FeedFiltersDialog.vue
index a6e03e28..e4b30947 100644
--- a/src/views/Settings/dialogs/FeedFiltersDialog.vue
+++ b/src/views/Settings/dialogs/FeedFiltersDialog.vue
@@ -14,8 +14,8 @@
                         side="top"
                         style="margin-left: 5px"
                         :content="setting.tooltip">
-                        <el-icon v-if="setting.tooltipWarning"><Warning /></el-icon>
-                        <el-icon v-else><InfoFilled /></el-icon>
+                        <AlertTriangle v-if="setting.tooltipWarning" />
+                        <Info v-else />
                     </TooltipWrapper>
                 </span>
 
@@ -76,7 +76,7 @@
 </template>
 
 <script setup>
-    import { InfoFilled, Warning } from '@element-plus/icons-vue';
+    import { Info, AlertTriangle } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { computed } from 'vue';
     import { storeToRefs } from 'pinia';
diff --git a/src/views/Settings/dialogs/VRChatConfigDialog.vue b/src/views/Settings/dialogs/VRChatConfigDialog.vue
index a57f6d84..be4a4433 100644
--- a/src/views/Settings/dialogs/VRChatConfigDialog.vue
+++ b/src/views/Settings/dialogs/VRChatConfigDialog.vue
@@ -25,7 +25,7 @@
                     style="margin-left: 5px"
                     @click="getVRChatCacheSize">
                     <Spinner v-if="VRChatCacheSizeLoading" />
-                    <Refresh v-else />
+                    <RefreshCw v-else />
                 </Button>
             </TooltipWrapper>
 
@@ -175,7 +175,7 @@
     import { Button } from '@/components/ui/button';
     import { Checkbox } from '@/components/ui/checkbox';
     import { InputGroupAction } from '@/components/ui/input-group';
-    import { Refresh } from '@element-plus/icons-vue';
+    import { RefreshCw } from 'lucide-vue-next';
     import { Spinner } from '@/components/ui/spinner';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
@@ -324,7 +324,7 @@
     function showDeleteAllVRChatCacheConfirm() {
         modalStore
             .confirm({
-                description: 'Continue? Delete all VRChat cache',
+                description: 'Continue? Trash2 all VRChat cache',
                 title: 'Confirm'
             })
             .then(({ ok }) => {
diff --git a/src/views/Sidebar/Sidebar.vue b/src/views/Sidebar/Sidebar.vue
index b3881438..532673c0 100644
--- a/src/views/Sidebar/Sidebar.vue
+++ b/src/views/Sidebar/Sidebar.vue
@@ -68,7 +68,7 @@
                         style="margin-right: 10px"
                         @click="refreshFriendsList">
                         <Spinner v-if="isRefreshFriendsLoading" />
-                        <Refresh v-else />
+                        <RefreshCw v-else />
                     </Button>
                 </TooltipWrapper>
             </div>
@@ -108,7 +108,7 @@
     import { computed, ref, watch } from 'vue';
     import { Button } from '@/components/ui/button';
     import { Input } from '@/components/ui/input';
-    import { Refresh } from '@element-plus/icons-vue';
+    import { RefreshCw } from 'lucide-vue-next';
     import { Spinner } from '@/components/ui/spinner';
     import { TabsUnderline } from '@/components/ui/tabs';
     import { storeToRefs } from 'pinia';
diff --git a/src/views/Sidebar/components/FriendItem.vue b/src/views/Sidebar/components/FriendItem.vue
index 2abc5780..47a984bc 100644
--- a/src/views/Sidebar/components/FriendItem.vue
+++ b/src/views/Sidebar/components/FriendItem.vue
@@ -17,13 +17,11 @@
                 <span v-if="isFriendActiveOrOffline" class="extra">{{ friend.ref.statusDescription }}</span>
                 <template v-else>
                     <div v-if="friend.pendingOffline" class="extra">
-                        <el-icon><WarningFilled /></el-icon> {{ t('side_panel.pending_offline') }}
+                        <AlertTriangle /> {{ t('side_panel.pending_offline') }}
                     </div>
                     <template v-else-if="isGroupByInstance">
                         <div class="flex items-center">
-                            <el-icon v-if="isFriendTraveling" class="is-loading" style="margin-right: 3px"
-                                ><Loading
-                            /></el-icon>
+                            <Loader2 v-if="isFriendTraveling" class="is-loading" style="margin-right: 3px" />
                             <Timer
                                 class="extra"
                                 :epoch="epoch"
@@ -62,7 +60,7 @@
 </template>
 
 <script setup>
-    import { Loading, WarningFilled } from '@element-plus/icons-vue';
+    import { Loader2, AlertTriangle } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { computed } from 'vue';
     import { storeToRefs } from 'pinia';
diff --git a/src/views/Sidebar/components/FriendsSidebar.vue b/src/views/Sidebar/components/FriendsSidebar.vue
index 05146ed7..7f075754 100644
--- a/src/views/Sidebar/components/FriendsSidebar.vue
+++ b/src/views/Sidebar/components/FriendsSidebar.vue
@@ -7,7 +7,7 @@
                 isFriendsGroupMe = !isFriendsGroupMe;
                 saveFriendsGroupStates();
             ">
-            <el-icon class="rotation-transition" :class="{ 'is-rotated': isFriendsGroupMe }"><ArrowRight /></el-icon>
+            <ArrowRight class="rotation-transition" :class="{ 'is-rotated': isFriendsGroupMe }" />
             <span style="margin-left: 5px">{{ t('side_panel.me') }}</span>
         </div>
         <div v-show="isFriendsGroupMe">
@@ -43,7 +43,7 @@
                 isVIPFriends = !isVIPFriends;
                 saveFriendsGroupStates();
             ">
-            <el-icon class="rotation-transition" :class="{ 'is-rotated': isVIPFriends }"><ArrowRight /></el-icon>
+            <ArrowRight class="rotation-transition" :class="{ 'is-rotated': isVIPFriends }" />
             <span style="margin-left: 5px">
                 {{ t('side_panel.favorite') }} &horbar;
                 {{ vipFriendsDisplayNumber }}
@@ -79,9 +79,9 @@
 
         <template v-if="isSidebarGroupByInstance && friendsInSameInstance.length">
             <div class="x-friend-group x-link" @click="toggleSwitchGroupByInstanceCollapsed">
-                <el-icon class="rotation-transition" :class="{ 'is-rotated': !isSidebarGroupByInstanceCollapsed }"
-                    ><ArrowRight
-                /></el-icon>
+                <ArrowRight
+                    class="rotation-transition"
+                    :class="{ 'is-rotated': !isSidebarGroupByInstanceCollapsed }" />
                 <span style="margin-left: 5px"
                     >{{ t('side_panel.same_instance') }} &horbar; {{ friendsInSameInstance.length }}</span
                 >
@@ -116,7 +116,7 @@
                 isOnlineFriends = !isOnlineFriends;
                 saveFriendsGroupStates();
             ">
-            <el-icon class="rotation-transition" :class="{ 'is-rotated': isOnlineFriends }"><ArrowRight /></el-icon>
+            <ArrowRight class="rotation-transition" :class="{ 'is-rotated': isOnlineFriends }" />
             <span style="margin-left: 5px"
                 >{{ t('side_panel.online') }} &horbar; {{ onlineFriendsByGroupStatus.length }}</span
             >
@@ -135,7 +135,7 @@
                 isActiveFriends = !isActiveFriends;
                 saveFriendsGroupStates();
             ">
-            <el-icon class="rotation-transition" :class="{ 'is-rotated': isActiveFriends }"><ArrowRight /></el-icon>
+            <ArrowRight class="rotation-transition" :class="{ 'is-rotated': isActiveFriends }" />
             <span style="margin-left: 5px">{{ t('side_panel.active') }} &horbar; {{ activeFriends.length }}</span>
         </div>
         <div v-if="isActiveFriends">
@@ -152,7 +152,7 @@
                 isOfflineFriends = !isOfflineFriends;
                 saveFriendsGroupStates();
             ">
-            <el-icon class="rotation-transition" :class="{ 'is-rotated': isOfflineFriends }"><ArrowRight /></el-icon>
+            <ArrowRight class="rotation-transition" :class="{ 'is-rotated': isOfflineFriends }" />
             <span style="margin-left: 5px">{{ t('side_panel.offline') }} &horbar; {{ offlineFriends.length }}</span>
         </div>
         <div v-if="isOfflineFriends">
@@ -167,7 +167,7 @@
 
 <script setup>
     import { computed, ref, watch } from 'vue';
-    import { ArrowRight } from '@element-plus/icons-vue';
+    import { ArrowRight } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/views/Sidebar/components/GroupsSidebar.vue b/src/views/Sidebar/components/GroupsSidebar.vue
index 10381079..6c248151 100644
--- a/src/views/Sidebar/components/GroupsSidebar.vue
+++ b/src/views/Sidebar/components/GroupsSidebar.vue
@@ -3,13 +3,9 @@
         <template v-for="(group, index) in groupedGroupInstances" :key="getGroupId(group)">
             <div class="x-friend-group x-link" :style="{ paddingTop: index === 0 ? '0px' : '10px' }">
                 <div @click="toggleGroupSidebarCollapse(getGroupId(group))" style="display: flex; align-items: center">
-                    <el-icon
+                    <ArrowRight
                         class="rotation-transition"
-                        :class="{
-                            'is-rotated': !groupInstancesCfg[getGroupId(group)]?.isCollapsed
-                        }"
-                        ><ArrowRight
-                    /></el-icon>
+                        :class="{ 'is-rotated': !groupInstancesCfg[getGroupId(group)]?.isCollapsed }" />
                     <span style="margin-left: 5px">{{ group[0].group.name }} – {{ group.length }}</span>
                 </div>
             </div>
@@ -42,7 +38,7 @@
 
 <script setup>
     import { computed, ref } from 'vue';
-    import { ArrowRight } from '@element-plus/icons-vue';
+    import { ArrowRight } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
 
     import { useAppearanceSettingsStore, useGroupStore } from '../../../stores';
diff --git a/src/views/Tools/Gallery.vue b/src/views/Tools/Gallery.vue
index 8b7c8df8..d9918410 100644
--- a/src/views/Tools/Gallery.vue
+++ b/src/views/Tools/Gallery.vue
@@ -62,7 +62,7 @@
                     <br />
                     <ButtonGroup>
                         <Button variant="outline" size="sm" @click="refreshGalleryTable">
-                            <Refresh />
+                            <RefreshCw />
                             {{ t('dialog.gallery_icons.refresh') }}
                         </Button>
                         <Button
@@ -78,7 +78,7 @@
                             size="sm"
                             :disabled="!currentUser.profilePicOverride"
                             @click="setProfilePicOverride('')">
-                            <Close />
+                            <X />
                             {{ t('dialog.gallery_icons.clear') }}
                         </Button>
                     </ButtonGroup>
@@ -135,7 +135,7 @@
                     <br />
                     <ButtonGroup>
                         <Button variant="outline" size="sm" @click="refreshVRCPlusIconsTable">
-                            <Refresh />
+                            <RefreshCw />
                             {{ t('dialog.gallery_icons.refresh') }}
                         </Button>
                         <Button
@@ -151,7 +151,7 @@
                             size="sm"
                             :disabled="!currentUser.userIcon"
                             @click="setVRCPlusIcon('')">
-                            <Close />
+                            <X />
                             {{ t('dialog.gallery_icons.clear') }}
                         </Button>
                     </ButtonGroup>
@@ -208,7 +208,7 @@
                     <div>
                         <ButtonGroup style="margin-right: 10px">
                             <Button variant="outline" size="sm" @click="refreshEmojiTable">
-                                <Refresh />
+                                <RefreshCw />
                                 {{ t('dialog.gallery_icons.refresh') }}
                             </Button>
                             <Button
@@ -316,7 +316,7 @@
                             </div>
                             <div style="display: inline-block; margin: 5px">
                                 <span v-if="image.loopStyle === 'pingpong'">
-                                    <el-icon style="margin-right: 5px"><Refresh /></el-icon>
+                                    <RefreshCw style="margin-right: 5px" />
                                 </span>
                                 <span style="margin-right: 5px">{{ image.animationStyle }}</span>
                                 <span v-if="image.framesOverTime" style="margin-right: 5px"
@@ -363,7 +363,7 @@
                     <br />
                     <ButtonGroup>
                         <Button variant="outline" size="sm" @click="refreshStickerTable">
-                            <Refresh />
+                            <RefreshCw />
                             {{ t('dialog.gallery_icons.refresh') }}
                         </Button>
                         <Button
@@ -428,7 +428,7 @@
                     <div style="display: flex; align-items: center">
                         <ButtonGroup>
                             <Button variant="outline" size="sm" @click="refreshPrintTable">
-                                <Refresh />
+                                <RefreshCw />
                                 {{ t('dialog.gallery_icons.refresh') }}
                             </Button>
                             <Button
@@ -516,11 +516,11 @@
                     <div style="display: flex; align-items: center">
                         <ButtonGroup>
                             <Button variant="outline" size="sm" @click="getInventory">
-                                <Refresh />
+                                <RefreshCw />
                                 {{ t('dialog.gallery_icons.refresh') }}
                             </Button>
                             <Button variant="outline" size="sm" @click="redeemReward">
-                                <Present />
+                                <Gift />
                                 {{ t('dialog.gallery_icons.redeem') }}
                             </Button>
                         </ButtonGroup>
@@ -568,6 +568,7 @@
 </template>
 
 <script setup>
+    import { Gift, Maximize2, RefreshCw, Trash2, Upload, X } from 'lucide-vue-next';
     import {
         NumberField,
         NumberFieldContent,
@@ -575,9 +576,7 @@
         NumberFieldIncrement,
         NumberFieldInput
     } from '@/components/ui/number-field';
-    import { Close, Present, Refresh, Upload } from '@element-plus/icons-vue';
     import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
-    import { Maximize2, Trash2 } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { ButtonGroup } from '@/components/ui/button-group';
     import { Checkbox } from '@/components/ui/checkbox';
diff --git a/src/views/Tools/Tools.vue b/src/views/Tools/Tools.vue
index 1c93aedf..2cdaf796 100644
--- a/src/views/Tools/Tools.vue
+++ b/src/views/Tools/Tools.vue
@@ -6,9 +6,7 @@
             <div class="tool-categories">
                 <div class="tool-category">
                     <div class="category-header" @click="toggleCategory('group')">
-                        <el-icon class="rotation-transition" :class="{ 'is-rotated': !categoryCollapsed['group'] }"
-                            ><ArrowRight
-                        /></el-icon>
+                        <ArrowRight class="rotation-transition" :class="{ 'is-rotated': !categoryCollapsed['group'] }" />
                         <span class="category-title">{{ t('view.tools.group.header') }}</span>
                     </div>
                     <div class="tools-grid" v-show="!categoryCollapsed['group']">
@@ -28,9 +26,7 @@
 
                 <div class="tool-category">
                     <div class="category-header" @click="toggleCategory('image')">
-                        <el-icon class="rotation-transition" :class="{ 'is-rotated': !categoryCollapsed['image'] }"
-                            ><ArrowRight
-                        /></el-icon>
+                        <ArrowRight class="rotation-transition" :class="{ 'is-rotated': !categoryCollapsed['image'] }" />
                         <span class="category-title">{{ t('view.tools.pictures.header') }}</span>
                     </div>
                     <div class="tools-grid" v-show="!categoryCollapsed['image']">
@@ -93,9 +89,7 @@
 
                 <div class="tool-category">
                     <div class="category-header" @click="toggleCategory('user')">
-                        <el-icon class="rotation-transition" :class="{ 'is-rotated': !categoryCollapsed['user'] }"
-                            ><ArrowRight
-                        /></el-icon>
+                        <ArrowRight class="rotation-transition" :class="{ 'is-rotated': !categoryCollapsed['user'] }" />
                         <span class="category-title">{{ t('view.tools.export.header') }}</span>
                     </div>
 
@@ -158,9 +152,7 @@
 
                 <div class="tool-category">
                     <div class="category-header" @click="toggleCategory('other')">
-                        <el-icon class="rotation-transition" :class="{ 'is-rotated': !categoryCollapsed['other'] }"
-                            ><ArrowRight
-                        /></el-icon>
+                        <ArrowRight class="rotation-transition" :class="{ 'is-rotated': !categoryCollapsed['other'] }" />
                         <span class="category-title">{{ t('view.tools.other.header') }}</span>
                     </div>
                     <div class="tools-grid" v-show="!categoryCollapsed['other']">
@@ -205,7 +197,7 @@
 <script setup>
     import { computed, defineAsyncComponent, ref } from 'vue';
     import { useRoute, useRouter } from 'vue-router';
-    import { ArrowRight } from '@element-plus/icons-vue';
+    import { ArrowRight } from 'lucide-vue-next';
     import { Card } from '@/components/ui/card';
     import { storeToRefs } from 'pinia';
     import { toast } from 'vue-sonner';
@@ -317,7 +309,7 @@
                 background-color: var(--el-color-primary-light-9);
             }
 
-            .el-icon-arrow-right {
+            .rotation-transition {
                 font-size: 14px;
                 margin-right: 8px;
                 transition: transform 0.3s;
diff --git a/src/views/Tools/components/GroupCalendarEventCard.vue b/src/views/Tools/components/GroupCalendarEventCard.vue
index d86726ee..a0ac6c5c 100644
--- a/src/views/Tools/components/GroupCalendarEventCard.vue
+++ b/src/views/Tools/components/GroupCalendarEventCard.vue
@@ -92,20 +92,20 @@
         </div>
         <div class="badges">
             <div @click="copyEventLink(event)" class="share-badge">
-                <el-icon><Share /></el-icon>
+                <Share2 />
             </div>
             <div v-if="isFollowing" @click="toggleEventFollow(event)" class="following-badge is-following">
-                <el-icon><Star /></el-icon>
+                <Star />
             </div>
             <div v-else @click="toggleEventFollow(event)" class="following-badge">
-                <el-icon><StarFilled /></el-icon>
+                <Star />
             </div>
         </div>
     </Card>
 </template>
 
 <script setup>
-    import { Calendar, Download, Share, Star, StarFilled } from '@element-plus/icons-vue';
+    import { Calendar, Download, Share2, Star } from 'lucide-vue-next';
     import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
     import { computed, ref } from 'vue';
     import { Button } from '@/components/ui/button';
diff --git a/src/views/Tools/dialogs/GroupCalendarDialog.vue b/src/views/Tools/dialogs/GroupCalendarDialog.vue
index c51a45f3..5aa00b5a 100644
--- a/src/views/Tools/dialogs/GroupCalendarDialog.vue
+++ b/src/views/Tools/dialogs/GroupCalendarDialog.vue
@@ -54,18 +54,12 @@
                                 <div class="date">
                                     <div
                                         class="calendar-date-content"
-                                        :class="{
-                                            'has-events': filteredCalendar[formatDateKey(data.date)]?.length
-                                        }">
+                                        :class="{ 'has-events': filteredCalendar[formatDateKey(data.date)]?.length }">
                                         {{ dayjs(data.date).format('D') }}
                                         <div
                                             v-if="filteredCalendar[formatDateKey(data.date)]?.length"
                                             class="calendar-event-badge"
-                                            :class="
-                                                followingCalendarDate[formatDateKey(data.date)]
-                                                    ? 'has-following'
-                                                    : 'no-following'
-                                            ">
+                                            :class="followingCalendarDate[formatDateKey(data.date)] ? 'has-following' : 'no-following'">
                                             {{ filteredCalendar[formatDateKey(data.date)]?.length }}
                                         </div>
                                     </div>
@@ -87,11 +81,9 @@
                         <div v-if="filteredGroupEvents.length" class="groups-container">
                             <div v-for="group in filteredGroupEvents" :key="group.groupId" class="group-row">
                                 <div class="group-header" @click="toggleGroup(group.groupId)">
-                                    <el-icon
-                                        class="el-icon-arrow-right rotation-transition"
-                                        :class="{ rotate: !groupCollapsed[group.groupId] }"
-                                        ><ArrowRight
-                                    /></el-icon>
+                                    <ArrowRight
+                                        class="rotation-transition"
+                                        :class="{ rotate: !groupCollapsed[group.groupId] }" />
                                     {{ group.groupName }}
                                 </div>
                                 <div class="events-row" v-show="!groupCollapsed[group.groupId]">
@@ -123,7 +115,7 @@
 
 <script setup>
     import { computed, onMounted, ref, watch } from 'vue';
-    import { ArrowRight } from '@element-plus/icons-vue';
+    import { ArrowRight } from 'lucide-vue-next';
     import { Button } from '@/components/ui/button';
     import { InputGroupSearch } from '@/components/ui/input-group';
     import { useI18n } from 'vue-i18n';
@@ -638,7 +630,7 @@
                         display: flex;
                         align-items: center;
 
-                        .el-icon-arrow-right {
+                        .rotation-transition {
                             font-size: 14px;
                             margin-right: 8px;
                             transition: transform 0.3s;
diff --git a/src/views/Tools/dialogs/NoteExportDialog.vue b/src/views/Tools/dialogs/NoteExportDialog.vue
index 213da79f..a1818e9a 100644
--- a/src/views/Tools/dialogs/NoteExportDialog.vue
+++ b/src/views/Tools/dialogs/NoteExportDialog.vue
@@ -38,7 +38,7 @@
             {{ t('dialog.note_export.cancel') }}
         </Button>
         <span v-if="loading" style="margin: 10px">
-            <el-icon style="margin-right: 5px"><Loading /></el-icon>
+            <Loader2 style="margin-right: 5px" />
             {{ t('dialog.note_export.progress') }} {{ progress }}/{{ progressTotal }}
         </span>
 
@@ -66,7 +66,7 @@
     import { computed, ref, watch } from 'vue';
     import { Button } from '@/components/ui/button';
     import { DataTableLayout } from '@/components/ui/data-table';
-    import { Loading } from '@element-plus/icons-vue';
+    import { Loader2 } from 'lucide-vue-next';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';