From 28e98bfe92e788bdcb1135b528e76842324d42ff Mon Sep 17 00:00:00 2001
From: Warinyourself <warinyourself@gmail.com>
Date: Thu, 11 Jun 2026 01:16:14 +0300
Subject: [PATCH] Migrate generic UI icons to @lucide/vue

Replace custom SVG icons (settings, eye, arrow, checkbox, loader,
collapse, restart, suspend, hibernate, user, shutdown) with Lucide
components, keeping custom SVGs only for brand/DE logos and
decorative theme assets. Remove the now-unused icon files and the
dangling AppBar/battery/brightness/currentOs leftovers from the
previous cleanup. Also disable svgo's removeViewBox so custom icons
scale correctly inside their containers.
---
 package-lock.json                             | 10 ++++++
 package.json                                  |  1 +
 src/assets/icons/arrow.svg                    | 12 -------
 src/assets/icons/brightness.svg               | 11 ------
 src/assets/icons/charge.svg                   | 12 -------
 src/assets/icons/checkbox.svg                 |  3 --
 src/assets/icons/close.svg                    | 12 -------
 src/assets/icons/collapse.svg                 | 14 --------
 src/assets/icons/eye.svg                      | 32 -----------------
 src/assets/icons/hibernate.svg                | 19 ----------
 src/assets/icons/loader.svg                   |  5 ---
 src/assets/icons/restart.svg                  | 11 ------
 src/assets/icons/settings.svg                 | 12 -------
 src/assets/icons/shutdown.svg                 | 12 -------
 src/assets/icons/suspend.svg                  | 12 -------
 src/assets/icons/user.svg                     | 35 -------------------
 src/components/app/AppBar.tsx                 | 23 ------------
 src/components/app/AppButton.tsx              |  4 +--
 src/components/app/AppCheckbox.tsx            |  4 +--
 src/components/app/AppSelector.tsx            |  3 +-
 src/components/base/SettingsComponent.tsx     |  5 ++-
 src/components/base/ShutdownButton.tsx        |  4 +--
 src/components/base/ShutdownMenu.tsx          | 17 +++++----
 src/components/base/UserAvatar.tsx            | 13 ++-----
 src/components/base/UserInput.tsx             | 17 ++++-----
 .../base/settings/general/SettingsUsers.tsx   |  6 ++--
 src/models/app.ts                             |  1 -
 src/store/app.ts                              |  2 --
 src/style/components/button.styl              |  9 +++++
 src/style/components/selector.styl            |  9 ++---
 vite.config.ts                                | 15 +++++++-
 31 files changed, 71 insertions(+), 274 deletions(-)
 delete mode 100644 src/assets/icons/arrow.svg
 delete mode 100644 src/assets/icons/brightness.svg
 delete mode 100644 src/assets/icons/charge.svg
 delete mode 100644 src/assets/icons/checkbox.svg
 delete mode 100644 src/assets/icons/close.svg
 delete mode 100644 src/assets/icons/collapse.svg
 delete mode 100644 src/assets/icons/eye.svg
 delete mode 100644 src/assets/icons/hibernate.svg
 delete mode 100644 src/assets/icons/loader.svg
 delete mode 100644 src/assets/icons/restart.svg
 delete mode 100644 src/assets/icons/settings.svg
 delete mode 100644 src/assets/icons/shutdown.svg
 delete mode 100644 src/assets/icons/suspend.svg
 delete mode 100644 src/assets/icons/user.svg
 delete mode 100644 src/components/app/AppBar.tsx

diff --git a/package-lock.json b/package-lock.json
index 89adf53..526d7a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
       "name": "osmos-v3",
       "version": "0.0.0",
       "dependencies": {
+        "@lucide/vue": "^1.17.0",
         "css-doodle": "^0.51.0",
         "lodash": "^4.18.1",
         "mousetrap": "^1.6.5",
@@ -660,6 +661,15 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@lucide/vue": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/@lucide/vue/-/vue-1.17.0.tgz",
+      "integrity": "sha512-6Q1ZHgr5FbmJzKWe5BxlNdjLj2lbmuH1zwDtVzUJofX0w9UREwKgq4F4jwKqFYyyIS4Rj3FiJvDi2k6djukmmw==",
+      "license": "ISC",
+      "peerDependencies": {
+        "vue": ">=3.0.1"
+      }
+    },
     "node_modules/@napi-rs/wasm-runtime": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz",
diff --git a/package.json b/package.json
index 39c10b4..405d3b9 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "type-check": "vue-tsc --build"
   },
   "dependencies": {
+    "@lucide/vue": "^1.17.0",
     "css-doodle": "^0.51.0",
     "lodash": "^4.18.1",
     "mousetrap": "^1.6.5",
diff --git a/src/assets/icons/arrow.svg b/src/assets/icons/arrow.svg
deleted file mode 100644
index cc13071..0000000
--- a/src/assets/icons/arrow.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg
-    width="26"
-    height="26"
-    viewBox="0 0 26 26"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M13 26C20.1797 26 26 20.1797 26 13C26 5.8203 20.1797 0 13 0C5.8203 0 0 5.8203 0 13C0 20.1797 5.8203 26 13 26ZM18.353 12.5199L14.2351 8.19887C13.9824 7.93371 13.5727 7.93371 13.32 8.19887C13.0673 8.46403 13.0673 8.89394 13.32 9.1591L16.3333 12.321H7.54248C6.81917 12.4847 6.81917 13.5153 7.54248 13.679H16.3333L13.32 16.8409C13.0673 17.1061 13.0673 17.536 13.32 17.8011C13.5727 18.0663 13.9824 18.0663 14.2351 17.8011L18.353 13.4801C18.6057 13.215 18.6057 12.785 18.353 12.5199Z"
-    />
-  </svg>
diff --git a/src/assets/icons/brightness.svg b/src/assets/icons/brightness.svg
deleted file mode 100644
index ffea846..0000000
--- a/src/assets/icons/brightness.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-    <path d="M8.00002 12.9033C7.57246 12.9033 7.22583 13.2499 7.22583 13.6774V15.2258C7.22583 15.6534 7.57246 16 8.00002 16C8.42758 16 8.7742 15.6534 8.7742 15.2259V13.6775C8.7742 13.2499 8.42758 12.9033 8.00002 12.9033Z" />
-    <path d="M8.00002 0C7.57246 0 7.22583 0.346625 7.22583 0.774188V2.32256C7.22583 2.75012 7.57246 3.09675 8.00002 3.09675C8.42758 3.09675 8.7742 2.75012 8.7742 2.32256V0.774188C8.7742 0.346625 8.42758 0 8.00002 0Z" />
-    <path d="M8.0001 4.64517C6.15035 4.64523 4.64539 6.1502 4.64539 8.00001C4.64539 9.84982 6.15026 11.3548 8.00001 11.3549C9.84991 11.3549 11.355 9.84988 11.355 8.00001C11.355 6.15013 9.85001 4.64517 8.0001 4.64517Z" />
-    <path d="M16 7.99999C16 7.57242 15.6534 7.2258 15.2259 7.2258H13.6775C13.2499 7.2258 12.9033 7.57242 12.9033 7.99999C12.9033 8.42755 13.2499 8.77417 13.6775 8.77417H15.2259C15.6534 8.77417 16 8.42755 16 7.99999Z" />
-    <path d="M0 7.99999C0 8.42755 0.346625 8.77417 0.774188 8.77417H2.32256C2.75012 8.77417 3.09675 8.42755 3.09675 7.99999C3.09675 7.57242 2.75012 7.2258 2.32256 7.2258H0.774188C0.346625 7.2258 0 7.57242 0 7.99999Z" />
-    <path d="M12.0145 4.75962C12.2126 4.75962 12.4108 4.684 12.5619 4.53284L13.6569 3.43796C13.9591 3.13562 13.9591 2.64544 13.6569 2.34309C13.3545 2.04075 12.8644 2.04075 12.5619 2.34309L11.4671 3.43796C11.1647 3.74031 11.1647 4.2305 11.4671 4.53284C11.6183 4.68402 11.8164 4.75962 12.0145 4.75962Z" />
-    <path d="M2.89062 13.8836C3.08877 13.8836 3.2869 13.808 3.43802 13.6569L4.53292 12.562C4.83527 12.2597 4.83527 11.7694 4.53292 11.4671C4.23061 11.1647 3.7404 11.1647 3.43805 11.4671L2.34315 12.562C2.04081 12.8642 2.04081 13.3545 2.34315 13.6569C2.49431 13.808 2.69246 13.8836 2.89062 13.8836Z" />
-    <path d="M12.562 11.4671C12.2597 11.1647 11.7695 11.1647 11.4671 11.4671C11.1648 11.7694 11.1648 12.2596 11.4671 12.562L12.562 13.6569C12.7133 13.808 12.9114 13.8836 13.1094 13.8836C13.3076 13.8836 13.5058 13.808 13.6569 13.6569C13.9591 13.3546 13.9591 12.8644 13.6569 12.562L12.562 11.4671Z" />
-    <path d="M3.43805 4.53284C3.58923 4.68403 3.78737 4.75963 3.98552 4.75963C4.18368 4.75963 4.3818 4.684 4.53292 4.53284C4.83527 4.2305 4.83527 3.74032 4.53292 3.43797L3.43802 2.34307C3.13573 2.04075 2.6455 2.04075 2.34315 2.34307C2.04081 2.6454 2.04081 3.13559 2.34315 3.43794L3.43805 4.53284Z" />
-  </svg>
diff --git a/src/assets/icons/charge.svg b/src/assets/icons/charge.svg
deleted file mode 100644
index 109976d..0000000
--- a/src/assets/icons/charge.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg
-    width="29"
-    height="12"
-    viewBox="0 0 29 12"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M12.7573 6.98762L12.142 0.419995C12.1171 0.15406 12.3907 -0.0543317 12.6768 0.0126378L28.8393 3.79557C29.0764 3.85104 29.0417 4.16413 28.7973 4.1762L17.2789 4.74482C17.0429 4.75647 16.8619 4.9383 16.8741 5.15137L17.2434 11.5926C17.2584 11.8538 16.9882 12.053 16.7077 11.9874L0.160717 8.11679C-0.0792939 8.06065 -0.0397734 7.74266 0.208049 7.73595L12.3429 7.40719C12.5887 7.40053 12.778 7.2089 12.7573 6.98762Z"
-      fill="currentColor"
-    />
-  </svg>
diff --git a/src/assets/icons/checkbox.svg b/src/assets/icons/checkbox.svg
deleted file mode 100644
index a779df8..0000000
--- a/src/assets/icons/checkbox.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0.5 8.06838L7.30838 16.5001L16.5 0.500061" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
diff --git a/src/assets/icons/close.svg b/src/assets/icons/close.svg
deleted file mode 100644
index 13eccd1..0000000
--- a/src/assets/icons/close.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    style="isolation:isolate"
-    viewBox="0 0 70.055 70.055"
-    width="70.055"
-    height="70.055"
-  >
-    <path
-      d=" M 42.013 35.028 L 68.615 8.426 C 69.532 7.499 70.055 6.246 70.055 4.933 C 70.055 3.621 69.532 2.368 68.615 1.441 C 67.687 0.523 66.434 0 65.122 0 C 63.809 0 62.556 0.523 61.629 1.441 L 35.028 28.042 L 8.426 1.441 C 7.499 0.523 6.246 0 4.933 0 C 3.621 0 2.368 0.523 1.441 1.441 C 0.523 2.368 0 3.621 0 4.933 C 0 6.246 0.523 7.499 1.441 8.426 L 28.042 35.028 L 1.441 61.629 C 0.523 62.556 0 63.809 0 65.122 C 0 66.434 0.523 67.687 1.441 68.615 C 2.368 69.532 3.621 70.055 4.933 70.055 C 6.246 70.055 7.499 69.532 8.426 68.615 L 35.028 42.013 L 61.629 68.615 C 62.556 69.532 63.809 70.055 65.122 70.055 C 66.434 70.055 67.687 69.532 68.615 68.615 C 69.532 67.687 70.055 66.434 70.055 65.122 C 70.055 63.809 69.532 62.556 68.615 61.629 L 42.013 35.028 Z "
-    />
-  </svg>
diff --git a/src/assets/icons/collapse.svg b/src/assets/icons/collapse.svg
deleted file mode 100644
index ec6d74d..0000000
--- a/src/assets/icons/collapse.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg
-    width="18"
-    height="18"
-    viewBox="0 0 18 18"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      fill-rule="evenodd"
-      clip-rule="evenodd"
-      d="M17.8535 0.646508C18.0488 0.84177 18.0488 1.15835 17.8535 1.35361L12.7071 6.50006H16C16.2761 6.50006 16.5 6.72391 16.5 7.00006C16.5 7.2762 16.2761 7.50006 16 7.50006L11.5 7.50006C11.2238 7.50006 11 7.2762 11 7.00006V2.50006C11 2.22391 11.2238 2.00006 11.5 2.00006C11.7761 2.00006 12 2.22391 12 2.50006V5.79295L17.1464 0.646508C17.3417 0.451245 17.6582 0.451246 17.8535 0.646508ZM11 11.0001C11 10.7239 11.2238 10.5001 11.5 10.5001H16C16.2761 10.5001 16.5 10.7239 16.5 11.0001C16.5 11.2762 16.2761 11.5001 16 11.5001H12.7071L17.8535 16.6465C18.0488 16.8418 18.0488 17.1584 17.8535 17.3536C17.6582 17.5489 17.3417 17.5489 17.1464 17.3536L12 12.2072V15.5001C12 15.7762 11.7761 16.0001 11.5 16.0001C11.2238 16.0001 11 15.7762 11 15.5001V11.0001ZM7.49981 7.00011C7.49981 7.27625 7.27596 7.50011 6.99981 7.50011L2.49981 7.50011C2.22367 7.50011 1.99981 7.27625 1.99981 7.00011C1.99981 6.72396 2.22367 6.50011 2.49981 6.50011H5.79271L0.646269 1.35367C0.451007 1.15841 0.451007 0.841823 0.646269 0.646562C0.841531 0.4513 1.15811 0.451299 1.35338 0.646562L6.49981 5.793V2.50011C6.49981 2.22396 6.72367 2.00011 6.99981 2.00011C7.27596 2.00011 7.49981 2.22396 7.49981 2.50011L7.49981 7.00011ZM6.99981 10.5002C7.27595 10.5002 7.49981 10.724 7.49981 11.0002V15.5002C7.49981 15.7763 7.27595 16.0002 6.99981 16.0002C6.72366 16.0002 6.49981 15.7763 6.49981 15.5002L6.49981 12.2073L1.35337 17.3537C1.15811 17.549 0.841525 17.549 0.646263 17.3537C0.451001 17.1584 0.451001 16.8419 0.646263 16.6466L5.7927 11.5002L2.49981 11.5002C2.22366 11.5002 1.99981 11.2763 1.99981 11.0002C1.99981 10.724 2.22366 10.5002 2.49981 10.5002H6.99981Z"
-      fill="currentColor"
-    />
-  </svg>
diff --git a/src/assets/icons/eye.svg b/src/assets/icons/eye.svg
deleted file mode 100644
index 8e708cd..0000000
--- a/src/assets/icons/eye.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<svg
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    version="1.0"
-    width="24"
-    height="24"
-    viewBox="0 0 24 24"
-    xml:space="preserve"
-  >
-    <path
-      stroke="currentColor"
-      stroke-width="2"
-      fill="none"
-      d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"
-    />
-    <circle
-      fill="currentColor"
-      cx="12"
-      cy="12"
-      r="3"
-    />
-    <line
-      class="slash"
-      stroke-width="2px"
-      stroke="currentColor"
-      stroke-linecap="round"
-      x1="2"
-      y1="2"
-      x2="22"
-      y2="22"
-    />
-  </svg>
diff --git a/src/assets/icons/hibernate.svg b/src/assets/icons/hibernate.svg
deleted file mode 100644
index 76d1bbd..0000000
--- a/src/assets/icons/hibernate.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<svg
-    width="26"
-    height="26"
-    viewBox="0 0 26 26"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M25 13C25 19.6274 19.6274 25 13 25C6.37258 25 1 19.6274 1 13C1 6.37258 6.37258 1 13 1C19.6274 1 25 6.37258 25 13Z"
-      stroke="currentColor"
-      stroke-width="2"
-    />
-    <path
-      d="M13 7L13 19"
-      stroke="currentColor"
-      stroke-width="2"
-      stroke-linecap="round"
-    />
-  </svg>
diff --git a/src/assets/icons/loader.svg b/src/assets/icons/loader.svg
deleted file mode 100644
index dcee328..0000000
--- a/src/assets/icons/loader.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-  <circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-dasharray="31.4 31.4" transform-origin="center">
-    <animateTransform attributeName="transform" type="rotate" from="0" to="360" dur="0.8s" repeatCount="indefinite"/>
-  </circle>
-</svg>
diff --git a/src/assets/icons/restart.svg b/src/assets/icons/restart.svg
deleted file mode 100644
index f1e6f2c..0000000
--- a/src/assets/icons/restart.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    style="isolation:isolate"
-    viewBox="1137.995 728.973 31.153 35"
-    fill="currentColor"
-  >
-    <path
-      d=" M 1149.413 733.396 C 1146.299 734.257 1143.525 736.065 1141.473 738.582 C 1139.223 741.359 1137.995 744.819 1137.995 748.392 C 1137.995 749.474 1138.107 750.555 1138.332 751.619 C 1139.067 755.106 1140.988 758.246 1143.756 760.495 C 1146.525 762.745 1149.994 763.973 1153.558 763.973 C 1154.648 763.973 1155.73 763.861 1156.785 763.636 C 1160.28 762.901 1163.412 760.989 1165.661 758.212 C 1167.911 755.443 1169.148 751.983 1169.148 748.41 C 1169.148 747.328 1169.035 746.247 1168.81 745.183 C 1168.239 742.484 1166.959 739.975 1165.099 737.933 C 1164.796 737.596 1164.364 737.388 1163.905 737.371 C 1163.447 737.345 1162.997 737.509 1162.659 737.82 C 1162.322 738.123 1162.114 738.556 1162.097 739.014 C 1162.071 739.473 1162.236 739.923 1162.538 740.26 C 1163.983 741.852 1164.978 743.799 1165.419 745.901 C 1165.592 746.723 1165.687 747.562 1165.687 748.41 C 1165.687 751.187 1164.727 753.877 1162.98 756.031 C 1161.223 758.186 1158.792 759.682 1156.076 760.253 C 1155.245 760.426 1154.406 760.513 1153.558 760.513 C 1150.781 760.513 1148.091 759.552 1145.937 757.805 C 1143.782 756.057 1142.294 753.618 1141.723 750.901 C 1141.542 750.079 1141.455 749.232 1141.455 748.392 C 1141.455 745.615 1142.415 742.925 1144.163 740.762 C 1145.655 738.923 1147.652 737.569 1149.895 736.857 L 1150.26 739.479 C 1150.433 740.719 1151.382 741.11 1152.378 740.351 L 1156.037 737.561 L 1159.695 734.772 C 1160.691 734.013 1160.556 733.019 1159.392 732.554 L 1155.1 730.84 L 1150.809 729.126 C 1149.645 728.662 1148.841 729.292 1149.014 730.533 L 1149.413 733.396 Z "
-    />
-  </svg>
diff --git a/src/assets/icons/settings.svg b/src/assets/icons/settings.svg
deleted file mode 100644
index 5c85c29..0000000
--- a/src/assets/icons/settings.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    style="isolation:isolate"
-    viewBox="1303.7 727.244 33.56 33.464"
-    fill="currentColor"
-  >
-    <path
-      d="M 1320.75 751.23 C 1318.75 751.23 1316.83 750.43 1315.42 749.02 C 1314 747.6 1313.21 745.68 1313.21 743.68 C 1313.21 741.68 1314 739.76 1315.42 738.35 C 1316.83 736.93 1318.75 736.14 1320.75 736.14 C 1322.75 736.14 1324.68 736.93 1326.09 738.35 C 1327.5 739.76 1328.3 741.68 1328.3 743.68 C 1328.3 745.68 1327.5 747.6 1326.09 749.02 C 1324.68 750.43 1322.75 751.23 1320.75 751.23 L 1320.75 751.23 Z  M 1328.594 757.292 L 1327.093 756.466 C 1325.288 755.474 1323.006 756.128 1322.002 757.926 L 1321.166 759.422 C 1320.161 761.22 1318.74 761.121 1317.996 759.2 L 1317.376 757.603 C 1316.631 755.682 1314.463 754.717 1312.538 755.449 L 1310.936 756.057 C 1309.01 756.789 1307.986 755.8 1308.65 753.85 L 1309.202 752.228 C 1309.866 750.278 1308.826 748.145 1306.88 747.467 L 1305.262 746.904 C 1303.317 746.227 1303.168 744.81 1304.93 743.743 L 1306.396 742.856 C 1308.158 741.789 1308.732 739.486 1307.677 737.717 L 1306.8 736.245 C 1305.745 734.476 1306.541 733.295 1308.577 733.611 L 1310.27 733.873 C 1312.306 734.188 1314.226 732.793 1314.555 730.759 L 1314.829 729.068 C 1315.158 727.035 1316.527 726.642 1317.884 728.192 L 1319.012 729.481 C 1320.369 731.032 1322.736 731.197 1324.296 729.851 L 1325.593 728.731 C 1327.152 727.385 1328.453 727.964 1328.496 730.024 L 1328.531 731.737 C 1328.574 733.796 1330.282 735.445 1332.341 735.416 L 1334.055 735.392 C 1336.114 735.363 1336.739 736.643 1335.448 738.248 L 1334.374 739.584 C 1333.083 741.189 1333.331 743.549 1334.928 744.851 L 1336.255 745.934 C 1337.852 747.236 1337.507 748.617 1335.487 749.017 L 1333.806 749.35 C 1331.785 749.75 1330.458 751.718 1330.844 753.741 L 1331.165 755.424 C 1331.551 757.448 1330.399 758.285 1328.594 757.292 L 1328.594 757.292 Z "
-      fill-rule="evenodd"
-    />
-  </svg>
diff --git a/src/assets/icons/shutdown.svg b/src/assets/icons/shutdown.svg
deleted file mode 100644
index 8b204b4..0000000
--- a/src/assets/icons/shutdown.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    style="isolation:isolate"
-    viewBox="1032.87 723.63 35 37.465"
-    fill="currentColor"
-  >
-    <path
-      d="M 1054.626 730.926 L 1054.626 726.495 L 1056.575 727.236 C 1059.899 728.494 1062.756 730.735 1064.772 733.658 C 1066.787 736.582 1067.87 740.047 1067.87 743.604 C 1067.87 745.719 1067.479 747.827 1066.729 749.801 C 1065.463 753.124 1063.222 755.981 1060.299 757.997 C 1057.375 760.012 1053.91 761.095 1050.362 761.095 C 1048.238 761.095 1046.139 760.704 1044.156 759.954 C 1040.841 758.688 1037.976 756.447 1035.96 753.524 C 1033.945 750.6 1032.87 747.135 1032.87 743.587 C 1032.87 741.463 1033.253 739.364 1034.011 737.382 C 1035.66 733.05 1038.959 729.535 1043.19 727.636 L 1045.089 726.787 L 1045.089 730.926 C 1041.866 732.376 1039.159 735.557 1037.901 738.864 C 1037.326 740.372 1037.035 741.971 1037.035 743.587 C 1037.035 746.294 1037.851 748.934 1039.392 751.167 C 1040.933 753.391 1043.107 755.098 1045.639 756.056 C 1047.147 756.631 1048.746 756.931 1050.362 756.931 C 1053.069 756.931 1055.709 756.106 1057.941 754.573 C 1060.165 753.032 1061.873 750.85 1062.831 748.326 C 1063.405 746.819 1063.705 745.211 1063.705 743.604 C 1063.705 740.897 1062.881 738.248 1061.348 736.024 C 1059.807 733.8 1057.15 731.884 1054.626 730.926 Z  M 1052.26 726.15 L 1052.16 743.56 C 1052.15 744.22 1051.89 744.85 1051.41 745.32 C 1050.94 745.79 1050.31 746.05 1049.64 746.04 C 1048.98 746.04 1048.34 745.77 1047.88 745.3 C 1047.41 744.83 1047.15 744.19 1047.16 743.53 L 1047.26 726.12 C 1047.26 725.45 1047.53 724.82 1048 724.35 C 1048.47 723.89 1049.11 723.63 1049.77 723.63 C 1050.43 723.63 1051.07 723.9 1051.53 724.37 C 1052 724.84 1052.26 725.48 1052.26 726.15 Z"
-      fill-rule="evenodd"
-    />
-  </svg>
diff --git a/src/assets/icons/suspend.svg b/src/assets/icons/suspend.svg
deleted file mode 100644
index a888e3c..0000000
--- a/src/assets/icons/suspend.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<svg
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    style="isolation:isolate"
-    viewBox="1227.61 729.39 18.25 29.17"
-    fill="currentColor"
-  >
-    <path
-      d=" M 1227.61 731.89 C 1227.61 731.23 1227.87 730.59 1228.34 730.12 C 1228.81 729.66 1229.45 729.39 1230.11 729.39 C 1230.77 729.39 1231.41 729.66 1231.88 730.12 C 1232.35 730.59 1232.61 731.23 1232.61 731.89 L 1232.61 756.06 C 1232.61 756.72 1232.35 757.36 1231.88 757.83 C 1231.41 758.3 1230.77 758.56 1230.11 758.56 C 1229.45 758.56 1228.81 758.3 1228.34 757.83 C 1227.87 757.36 1227.61 756.72 1227.61 756.06 L 1227.61 731.89 Z  M 1240.86 731.89 C 1240.86 731.23 1241.12 730.59 1241.59 730.12 C 1242.06 729.66 1242.7 729.39 1243.36 729.39 C 1244.02 729.39 1244.66 729.66 1245.13 730.12 C 1245.6 730.59 1245.86 731.23 1245.86 731.89 L 1245.86 756.06 C 1245.86 756.72 1245.6 757.36 1245.13 757.83 C 1244.66 758.3 1244.02 758.56 1243.36 758.56 C 1242.7 758.56 1242.06 758.3 1241.59 757.83 C 1241.12 757.36 1240.86 756.72 1240.86 756.06 L 1240.86 731.89 Z "
-      fill-rule="evenodd"
-    />
-  </svg>
diff --git a/src/assets/icons/user.svg b/src/assets/icons/user.svg
deleted file mode 100644
index d7755a9..0000000
--- a/src/assets/icons/user.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<svg
-    width="92"
-    height="92"
-    viewBox="0 0 92 92"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M38.7935 55.2327V47.2344C33.0391 45.0181 29.0089 39.9177 29.0089 33.9848V14.4284C29.0089 6.46553 36.2714 0 45.2182 0H46.7818C55.7275 0 62.9899 6.46553 62.9899 14.4284V33.9848C62.9899 39.9177 58.9598 45.0181 53.2054 47.2344V55.2327H75.8905C84.7808 55.2327 92 61.6578 92 69.5713V77.6604C92 85.5749 84.7808 92 75.8905 92H16.1095C7.21812 92 0 85.5749 0 77.6604V69.5713C0 61.6578 7.21812 55.2327 16.1095 55.2327H38.7935Z"
-      fill="var(--color-active)"
-    />
-    <path
-      d="M38.7935 55.2327V47.2344C33.0391 45.0181 29.0089 39.9177 29.0089 33.9848V14.4284C29.0089 6.46553 36.2714 0 45.2182 0H46.7818C55.7275 0 62.9899 6.46553 62.9899 14.4284V33.9848C62.9899 39.9177 58.9598 45.0181 53.2054 47.2344V55.2327H75.8905C84.7808 55.2327 92 61.6578 92 69.5713V77.6604C92 85.5749 84.7808 92 75.8905 92H16.1095C7.21812 92 0 85.5749 0 77.6604V69.5713C0 61.6578 7.21812 55.2327 16.1095 55.2327H38.7935Z"
-      fill="url(#paint0_linear)"
-    />
-    <defs>
-      <linearGradient
-        id="paint0_linear"
-        x1="46"
-        y1="0"
-        x2="46"
-        y2="92"
-        gradientUnits="userSpaceOnUse"
-      >
-        <stop
-          offset="0.4"
-          stop-opacity="0"
-        />
-        <stop
-          offset="0.9"
-          stop-opacity="0.5"
-        />
-      </linearGradient>
-    </defs>
-  </svg>
diff --git a/src/components/app/AppBar.tsx b/src/components/app/AppBar.tsx
deleted file mode 100644
index cda4b24..0000000
--- a/src/components/app/AppBar.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { defineComponent } from 'vue'
-import { useAppStore } from '@/store/app'
-import timer from '@/utils/time'
-import BatteryIcon from '@/components/base/BatteryIcon'
-import BrightIcon from '@/components/base/BrightIcon'
-
-export default defineComponent({
-  name: 'AppBar',
-
-  setup() {
-    const appStore = useAppStore()
-
-    return () => (
-      <div class="app-bar active-interface">
-        <div class="app-bar__time">{timer.longTime}</div>
-        <div class="app-bar__info">
-          {appStore.battery && <BatteryIcon />}
-          {!!appStore.brightness && <BrightIcon />}
-        </div>
-      </div>
-    )
-  }
-})
diff --git a/src/components/app/AppButton.tsx b/src/components/app/AppButton.tsx
index a689090..38aeb38 100644
--- a/src/components/app/AppButton.tsx
+++ b/src/components/app/AppButton.tsx
@@ -1,5 +1,5 @@
 import { defineComponent, computed, h } from 'vue'
-import AppIcon from '@/components/app/AppIcon.vue'
+import { LoaderCircle } from '@lucide/vue'
 
 const prefix = 'app-button'
 
@@ -54,7 +54,7 @@ export default defineComponent({
       const content = <span class={`${prefix}__content`}>{slots.default?.()}</span>
       const loader = props.loading && (
         <span class={`${prefix}__loader`}>
-          {slots.loader?.() || <AppIcon name="loader" />}
+          {slots.loader?.() || <LoaderCircle class="spin" />}
         </span>
       )
 
diff --git a/src/components/app/AppCheckbox.tsx b/src/components/app/AppCheckbox.tsx
index a21ec56..3dc9473 100644
--- a/src/components/app/AppCheckbox.tsx
+++ b/src/components/app/AppCheckbox.tsx
@@ -1,4 +1,4 @@
-import AppIcon from '@/components/app/AppIcon.vue'
+import { Check } from '@lucide/vue'
 import { defineComponent, computed } from 'vue'
 
 export default defineComponent({
@@ -24,7 +24,7 @@ export default defineComponent({
       <label class={classes.value}>
         <div class="checkbox-control">
           <div class="checkbox-control-box">
-            <AppIcon name="checkbox" />
+            <Check />
           </div>
           <input
             type="checkbox"
diff --git a/src/components/app/AppSelector.tsx b/src/components/app/AppSelector.tsx
index 96cc9b9..71fb79b 100644
--- a/src/components/app/AppSelector.tsx
+++ b/src/components/app/AppSelector.tsx
@@ -1,4 +1,5 @@
 import AppIcon from '@/components/app/AppIcon.vue'
+import { ArrowBigUp } from '@lucide/vue'
 import { defineComponent, computed, ref, type PropType } from 'vue'
 import { usePageStore } from '@/store/page'
 import type { AppMenuItem } from '@/models/page'
@@ -75,7 +76,7 @@ export default defineComponent({
             {selectorIcon}
             <p class="selector-label-text">{currentValueLabel.value || props.label}</p>
           </h2>
-          <AppIcon name="arrow" class="icon selector-arrow" />
+          <ArrowBigUp class="icon selector-arrow" />
         </div>
       )
     }
diff --git a/src/components/base/SettingsComponent.tsx b/src/components/base/SettingsComponent.tsx
index ee95070..03bf65b 100644
--- a/src/components/base/SettingsComponent.tsx
+++ b/src/components/base/SettingsComponent.tsx
@@ -1,4 +1,4 @@
-import AppIcon from '@/components/app/AppIcon.vue'
+import { CircleX } from '@lucide/vue'
 import { defineComponent, computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useAppStore } from '@/store/app'
@@ -46,8 +46,7 @@ export default defineComponent({
     return () => (
       <div class="block-settings login-content-settings">
         <div class="login-view active-interface">
-          <AppIcon onClick={openLogin} name="collapse" class="system-icon" />
-          {!isViewThemeOnly.value && <UserAvatar />}
+          <CircleX onClick={openLogin} class="system-icon" />
           <div class="user-settings-tabs">{tabs.value.map(generateTab)}</div>
           <SettingsView />
         </div>
diff --git a/src/components/base/ShutdownButton.tsx b/src/components/base/ShutdownButton.tsx
index 55c6139..f5c90cb 100644
--- a/src/components/base/ShutdownButton.tsx
+++ b/src/components/base/ShutdownButton.tsx
@@ -1,4 +1,4 @@
-import AppIcon from '@/components/app/AppIcon.vue'
+import { Power } from '@lucide/vue'
 import { defineComponent } from 'vue'
 import { systemActionsObject } from '@/utils/helper'
 import ShutdownMenu from './ShutdownMenu'
@@ -10,7 +10,7 @@ export default defineComponent({
       <div class="shutdown-block active-block">
         <ShutdownMenu />
         <div class="shutdown-button active-interface" onClick={systemActionsObject.shutdown}>
-          <AppIcon name="shutdown" />
+          <Power />
         </div>
       </div>
     )
diff --git a/src/components/base/ShutdownMenu.tsx b/src/components/base/ShutdownMenu.tsx
index 1d664ad..a2273c3 100644
--- a/src/components/base/ShutdownMenu.tsx
+++ b/src/components/base/ShutdownMenu.tsx
@@ -1,8 +1,10 @@
-import AppIcon from '@/components/app/AppIcon.vue'
+import { RotateCw, Moon, Snowflake } from '@lucide/vue'
 import { defineComponent, computed } from 'vue'
 import { systemActionsObject } from '@/utils/helper'
 import { LightdmHandler } from '@/utils/lightdm'
 
+const icons = { restart: RotateCw, suspend: Moon, hibernate: Snowflake }
+
 export default defineComponent({
   name: 'ShutdownMenu',
   setup() {
@@ -16,11 +18,14 @@ export default defineComponent({
 
     return () => (
       <div class="shutdown-menu active-interface">
-        {actions.value.map((action) => (
-          <div class="shutdown-item" onClick={action.callback}>
-            <AppIcon name={action.icon} />
-          </div>
-        ))}
+        {actions.value.map((action) => {
+          const Icon = icons[action.icon as keyof typeof icons]
+          return (
+            <div class="shutdown-item" onClick={action.callback}>
+              <Icon />
+            </div>
+          )
+        })}
       </div>
     )
   }
diff --git a/src/components/base/UserAvatar.tsx b/src/components/base/UserAvatar.tsx
index c42e8a6..ad7f3d2 100644
--- a/src/components/base/UserAvatar.tsx
+++ b/src/components/base/UserAvatar.tsx
@@ -1,27 +1,20 @@
-import AppIcon from '@/components/app/AppIcon.vue'
-import { defineComponent, computed } from 'vue'
+import { User } from '@lucide/vue'
+import { defineComponent } from 'vue'
 import { useAppStore } from '@/store/app'
-import { usePageStore } from '@/store/page'
-import timer from '@/utils/time'
 import type { LightdmUsers } from '@/models/lightdm'
 
 export default defineComponent({
   name: 'UserAvatar',
   setup() {
     const appStore = useAppStore()
-    const pageStore = usePageStore()
-
-    const isOpenSettings = computed(() => pageStore.isOpenBlock('settings'))
-    const currentTime = computed(() => isOpenSettings.value ? timer.longTime : timer.shortTime)
 
     const buildUserAvatar = (image: string | undefined) =>
       image
         ? <img class="user-avatar" src={image} />
-        : <AppIcon name="user" />
+        : <User />
 
     const buildUser = (user: LightdmUsers) => (
       <div class="user-choice" key={user.username}>
-        <p class="time">{appStore.isSupportFullApi ? '' : currentTime.value}</p>
         {buildUserAvatar(user?.image)}
         <div class="user-name">{user?.display_name}</div>
       </div>
diff --git a/src/components/base/UserInput.tsx b/src/components/base/UserInput.tsx
index b0b2a10..a223bcd 100644
--- a/src/components/base/UserInput.tsx
+++ b/src/components/base/UserInput.tsx
@@ -1,4 +1,4 @@
-import AppIcon from '@/components/app/AppIcon.vue'
+import { Settings, Eye, EyeOff, ArrowRight } from '@lucide/vue'
 import { defineComponent } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useAppStore } from '@/store/app'
@@ -20,11 +20,10 @@ export default defineComponent({
     const handleKeyup = (event: KeyboardEvent) => {
       appStore.password = (event.target as HTMLInputElement)?.value || ''
     }
-    console.log({ appStore})
-
+ 
     return () => (
       <div class="user-input">
-        <AppIcon class="settings-button" name="settings" onClick={openSettings} />
+        <Settings class="settings-button" onClick={openSettings} />
 
         <input
           id="password"
@@ -38,14 +37,12 @@ export default defineComponent({
           value={appStore.password}
         />
 
-        <AppIcon
-          class={['icon icon-eye', { hide: !appStore.showPassword }]}
-          name="eye"
-          onClick={() => appStore.toggleShowPassword()}
-        />
+        {appStore.showPassword
+          ? <Eye class="icon icon-eye" onClick={() => appStore.toggleShowPassword()} />
+          : <EyeOff class="icon icon-eye" onClick={() => appStore.toggleShowPassword()} />}
 
         <button class="user-input-login" onClick={() => appStore.login()}>
-          <AppIcon name="arrow" />
+          <ArrowRight />
         </button>
       </div>
     )
diff --git a/src/components/base/settings/general/SettingsUsers.tsx b/src/components/base/settings/general/SettingsUsers.tsx
index a792c4d..1db24f2 100644
--- a/src/components/base/settings/general/SettingsUsers.tsx
+++ b/src/components/base/settings/general/SettingsUsers.tsx
@@ -1,4 +1,4 @@
-import AppIcon from '@/components/app/AppIcon.vue'
+import { User } from '@lucide/vue'
 import { defineComponent } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useAppStore } from '@/store/app'
@@ -16,7 +16,9 @@ export default defineComponent({
 
       return (
         <div onClick={activateUser} class={`settings-user-block ${isActive ? 'active' : ''}`}>
-          <AppIcon class="settings-user-image" name={user.image || 'user'} />
+          {user.image
+            ? <div class="settings-user-image" style={`background-image: url(${user.image})`} />
+            : <User class="settings-user-image" />}
           <p class="settings-user-name">{user.display_name}</p>
         </div>
       )
diff --git a/src/models/app.ts b/src/models/app.ts
index 9c9e582..88fc3a6 100644
--- a/src/models/app.ts
+++ b/src/models/app.ts
@@ -1,7 +1,6 @@
 export interface AppSettings {
   zoom: number;
   currentTheme: string;
-  currentOs: string;
   username: string;
   desktop: string;
   defaultColor: string;
diff --git a/src/store/app.ts b/src/store/app.ts
index ccdf37e..8545d85 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -57,7 +57,6 @@ export const useAppStore = defineStore('app', {
       desktop: state.desktop,
       username: state.username,
       bodyClass: state.bodyClass,
-      currentOs: state.currentOs,
       currentTheme: state.currentTheme,
       defaultColor: state.defaultColor,
       generateRandomThemes: state.generateRandomThemes
@@ -66,7 +65,6 @@ export const useAppStore = defineStore('app', {
     personalInfo: (state) => ({
       username: state.username,
       currentTheme: state.currentTheme,
-      currentOs: state.currentOs,
       desktop: state.desktop,
       version: state.version,
       defaultColor: state.defaultColor
diff --git a/src/style/components/button.styl b/src/style/components/button.styl
index 308b7a3..08e7aba 100644
--- a/src/style/components/button.styl
+++ b/src/style/components/button.styl
@@ -22,6 +22,15 @@
   flex: 1 0 auto;
   width: 100%;
 
+.app-button__loader
+  display flex
+  .spin
+    animation spin 0.8s linear infinite
+
+@keyframes spin
+  to
+    transform rotate(360deg)
+
 .app-button--fab
   padding 4px
   border-radius 12px
diff --git a/src/style/components/selector.styl b/src/style/components/selector.styl
index 6522a29..1719f1f 100644
--- a/src/style/components/selector.styl
+++ b/src/style/components/selector.styl
@@ -10,19 +10,14 @@
   cursor pointer
   &:hover
     border-color rgba(255, 255, 255, .8)
-    .selector-arrow
-      fill rgba(255, 255, 255, .8)
   &.active
     border-color white
     .selector-arrow
-      fill white
-    .selector-arrow
-      transform rotate(-90deg)
+      transform rotate(0deg)
 
 .selector-arrow
-  fill var(--color-unfocus)
-  transform rotate(90deg)
   transition .2s
+  transform rotate(180deg)
 
 .selector-icon
   float left
diff --git a/vite.config.ts b/vite.config.ts
index 1a86647..757964a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -13,7 +13,20 @@ export default defineConfig({
     vue(),
     vueJsx(),
     glsl(),
-    svgLoader()
+    svgLoader({
+      svgoConfig: {
+        plugins: [
+          {
+            name: 'preset-default',
+            params: {
+              overrides: {
+                removeViewBox: false
+              }
+            }
+          }
+        ]
+      }
+    })
   ],
   resolve: {
     alias: {