diff --git a/package-lock.json b/package-lock.json
index 9f5d85d1624..74592d12b0e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,9 +8,9 @@
       "name": "sunshine",
       "version": "0.0.0",
       "dependencies": {
+        "@lucide/vue": "1.16.0",
         "bootstrap": "5.3.8",
         "date-fns": "4.3.0",
-        "lucide-vue-next": "1.0.0",
         "marked": "18.0.4",
         "vue": "3.5.34",
         "vue-i18n": "11.4.4",
@@ -680,6 +680,15 @@
       "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "license": "MIT"
     },
+    "node_modules/@lucide/vue": {
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@lucide/vue/-/vue-1.16.0.tgz",
+      "integrity": "sha512-kiHx0fe49DMjQuvNaEOu9Jou6u9FwdqQ8xbZIKlD47sXrOI8g59kIeeQL42NBLI4AvO+UJsbaPX0hEK/4rHSBQ==",
+      "license": "ISC",
+      "peerDependencies": {
+        "vue": ">=3.0.1"
+      }
+    },
     "node_modules/@octokit/auth-token": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz",
@@ -2163,15 +2172,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lucide-vue-next": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lucide-vue-next/-/lucide-vue-next-1.0.0.tgz",
-      "integrity": "sha512-V6SPvx1IHTj/UY+FrIYWV5faISsPSb8BnWSFDxAtezWKvWc9ZZ40PDrdu1/Qb5vg4lHWr1hs1BAMGVGm6V1Xdg==",
-      "license": "ISC",
-      "peerDependencies": {
-        "vue": ">=3.0.1"
-      }
-    },
     "node_modules/magic-string": {
       "version": "0.30.21",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
diff --git a/package.json b/package.json
index 59367731011..daa8963d4da 100644
--- a/package.json
+++ b/package.json
@@ -9,9 +9,9 @@
   },
   "type": "module",
   "dependencies": {
+    "@lucide/vue": "1.16.0",
     "bootstrap": "5.3.8",
     "date-fns": "4.3.0",
-    "lucide-vue-next": "1.0.0",
     "marked": "18.0.4",
     "vue": "3.5.34",
     "vue-i18n": "11.4.4",
diff --git a/src_assets/common/assets/web/Navbar.vue b/src_assets/common/assets/web/Navbar.vue
index a943b51ad2f..dc5afd68d2f 100644
--- a/src_assets/common/assets/web/Navbar.vue
+++ b/src_assets/common/assets/web/Navbar.vue
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-import { CircleUserRound, Home, Info, Layers, Lock, LogOut, Settings, Shield, Star } from 'lucide-vue-next'
+import { CircleUserRound, Home, Info, Layers, Lock, LogOut, Settings, Shield, Star } from '@lucide/vue'
 import ThemeToggle from './ThemeToggle.vue'
 import Notification from './Notification.vue'
 
diff --git a/src_assets/common/assets/web/Notification.vue b/src_assets/common/assets/web/Notification.vue
index 482a64b926e..129aed0fdd9 100644
--- a/src_assets/common/assets/web/Notification.vue
+++ b/src_assets/common/assets/web/Notification.vue
@@ -21,7 +21,7 @@
 
 <script>
 import { reactive } from 'vue'
-import { AlertCircle, AlertTriangle, CheckCircle, Info } from 'lucide-vue-next'
+import { AlertCircle, AlertTriangle, CheckCircle, Info } from '@lucide/vue'
 
 /**
  * Singleton reactive notification state shared across the app instance.
@@ -57,7 +57,7 @@ function pushKey(type, messageKey, titleKey) {
 }
 
 /**
- * Map a Bootstrap color variant to its corresponding lucide-vue-next icon name.
+ * Map a Bootstrap color variant to its corresponding @lucide/vue icon name.
  *
  * @param {'danger'|'warning'|'success'|'info'} type - Bootstrap color variant.
  * @returns {string} The lucide icon component name.
diff --git a/src_assets/common/assets/web/ResourceCard.vue b/src_assets/common/assets/web/ResourceCard.vue
index 6a54ef163f4..eff92ada124 100644
--- a/src_assets/common/assets/web/ResourceCard.vue
+++ b/src_assets/common/assets/web/ResourceCard.vue
@@ -50,7 +50,7 @@ import {
   BookOpen,
   FileText,
   Globe,
-} from 'lucide-vue-next'
+} from '@lucide/vue'
 import SimpleIcon from './SimpleIcon.vue'
 
 export default {
diff --git a/src_assets/common/assets/web/ThemeToggle.vue b/src_assets/common/assets/web/ThemeToggle.vue
index 459cf88f006..0ae5a58b1bd 100644
--- a/src_assets/common/assets/web/ThemeToggle.vue
+++ b/src_assets/common/assets/web/ThemeToggle.vue
@@ -17,7 +17,7 @@ import {
   Sunrise,
   Trees,
   Waves,
-} from 'lucide-vue-next'
+} from '@lucide/vue'
 
 onMounted(() => {
   loadAutoTheme()
diff --git a/src_assets/common/assets/web/apps.html b/src_assets/common/assets/web/apps.html
index 16a5e3e3c61..8525749092e 100644
--- a/src_assets/common/assets/web/apps.html
+++ b/src_assets/common/assets/web/apps.html
@@ -538,7 +538,7 @@ <h5 class="modal-title">{{ fileBrowserTitle || $t('file_browser.title') }}</h5>
     Terminal,
     Trash2,
     X,
-  } from 'lucide-vue-next'
+  } from '@lucide/vue'
 
   const app = createApp({
     components: {
diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 2e4ab7ca7bd..27d84205dc4 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -146,7 +146,7 @@ <h1 class="my-4">{{ $t('config.configuration') }}</h1>
     Settings,
     Sliders,
     Volume2,
-  } from 'lucide-vue-next'
+  } from '@lucide/vue'
 
   const app = createApp({
     components: {
diff --git a/src_assets/common/assets/web/configs/tabs/General.vue b/src_assets/common/assets/web/configs/tabs/General.vue
index bd59f6f9ce4..c6498988022 100644
--- a/src_assets/common/assets/web/configs/tabs/General.vue
+++ b/src_assets/common/assets/web/configs/tabs/General.vue
@@ -7,7 +7,7 @@ import {
   Shield,
   Trash2,
   Undo,
-} from 'lucide-vue-next'
+} from '@lucide/vue'
 
 const props = defineProps({
   platform: String,
diff --git a/src_assets/common/assets/web/configs/tabs/Network.vue b/src_assets/common/assets/web/configs/tabs/Network.vue
index a89fc743f0a..aff9555a978 100644
--- a/src_assets/common/assets/web/configs/tabs/Network.vue
+++ b/src_assets/common/assets/web/configs/tabs/Network.vue
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue'
 import {
   Info,
   TriangleAlert,
-} from 'lucide-vue-next'
+} from '@lucide/vue'
 import Checkbox from "../../Checkbox.vue";
 
 const props = defineProps([
diff --git a/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue b/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue
index 66802d4e3a7..4496badb96b 100644
--- a/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue
+++ b/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { ref } from 'vue'
-import { Trash2 } from 'lucide-vue-next'
+import { Trash2 } from '@lucide/vue'
 import PlatformLayout from '../../../PlatformLayout.vue'
 import Checkbox from "../../../Checkbox.vue";
 
diff --git a/src_assets/common/assets/web/featured.html b/src_assets/common/assets/web/featured.html
index d33b738acb3..662fe987e13 100644
--- a/src_assets/common/assets/web/featured.html
+++ b/src_assets/common/assets/web/featured.html
@@ -248,7 +248,7 @@ <h5 class="card-title mb-1">{{ app.name }}</h5>
     Smartphone,
     Star,
     Tv,
-  } from 'lucide-vue-next'
+  } from '@lucide/vue'
 
   const app = createApp({
     components: {
diff --git a/src_assets/common/assets/web/index.html b/src_assets/common/assets/web/index.html
index 6b332e30da1..57ab0bc298e 100644
--- a/src_assets/common/assets/web/index.html
+++ b/src_assets/common/assets/web/index.html
@@ -142,7 +142,7 @@ <h5 class="mb-0">{{ githubVersion.release.name }}</h5>
     Info,
     CheckCircle,
     Download
-  } from 'lucide-vue-next'
+  } from '@lucide/vue'
 
   // Configure marked to allow HTML
   marked.setOptions({
diff --git a/src_assets/common/assets/web/logout.html b/src_assets/common/assets/web/logout.html
index 41bc8f5b241..84ff3a42bcd 100644
--- a/src_assets/common/assets/web/logout.html
+++ b/src_assets/common/assets/web/logout.html
@@ -27,7 +27,7 @@ <h1 class="h3 mb-3">{{ $t('logout.logged_out') }}</h1>
 <script type="module">
   import { createApp } from 'vue'
   import { initApp } from './init'
-  import { LogIn } from 'lucide-vue-next'
+  import { LogIn } from '@lucide/vue'
 
   const app = createApp({
     components: {
diff --git a/src_assets/common/assets/web/password.html b/src_assets/common/assets/web/password.html
index ac648491713..a86f11323f1 100644
--- a/src_assets/common/assets/web/password.html
+++ b/src_assets/common/assets/web/password.html
@@ -65,7 +65,7 @@ <h4>{{ $t('password.new_creds') }}</h4>
   import { initApp } from './init'
   import Navbar from './Navbar.vue'
   import { apiFetch } from './fetch_utils'
-  import { Save } from 'lucide-vue-next'
+  import { Save } from '@lucide/vue'
 
   const app = createApp({
     components: {
diff --git a/src_assets/common/assets/web/pin.html b/src_assets/common/assets/web/pin.html
index 0ccc2491fcc..6be11b2d125 100644
--- a/src_assets/common/assets/web/pin.html
+++ b/src_assets/common/assets/web/pin.html
@@ -45,7 +45,7 @@ <h1 class="my-4 text-center">{{ $t('pin.pin_pairing') }}</h1>
     Forward,
     Hash,
     Monitor,
-  } from 'lucide-vue-next'
+  } from '@lucide/vue'
 
   let app = createApp({
     components: {
diff --git a/src_assets/common/assets/web/troubleshooting.html b/src_assets/common/assets/web/troubleshooting.html
index 33d79c934ce..d47a1099dc7 100644
--- a/src_assets/common/assets/web/troubleshooting.html
+++ b/src_assets/common/assets/web/troubleshooting.html
@@ -219,7 +219,7 @@ <h2 id="logs">{{ $t('troubleshooting.logs') }}</h2>
       Search,
       Trash2,
       XCircle,
-    } from 'lucide-vue-next'
+    } from '@lucide/vue'
 
     const app = createApp({
       components: {