diff --git a/dev-dist/sw.js b/dev-dist/sw.js
index 16cfcc7..12cd06c 100644
--- a/dev-dist/sw.js
+++ b/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-99d8380f'], (function (workbox) { 'use strict';
    */
   workbox.precacheAndRoute([{
     "url": "index.html",
-    "revision": "0.2ul174kd9vo"
+    "revision": "0.53ce5k8teqg"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/package.json b/package.json
index a309633..b2f70b9 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@heroicons/vue": "^2.2.0",
     "axios": "^1.7.9",
+    "lucide-vue-next": "^0.503.0",
     "pinia": "^2.3.1",
     "vue": "^3.5.13",
     "vue-i18n": "10"
diff --git a/src/components/App/Navbar.vue b/src/components/App/Navbar.vue
index 275e37e..35a0394 100644
--- a/src/components/App/Navbar.vue
+++ b/src/components/App/Navbar.vue
@@ -9,7 +9,7 @@
 
     <div>
       <button class="bg-slate-600 p-1 px-2 rounded-md hover:bg-slate-500 flex items-center" @click="changeLang()">
-        <LanguageIcon class="size-5 inline-block align-middle mr-2" /> {{ i18n.locale.value == 'pl' ? 'POL' : 'ENG' }}
+        <GlobeIcon :size="18" class="mr-2" /> {{ i18n.locale.value == 'pl' ? 'POL' : 'ENG' }}
       </button>
     </div>
     <!-- <div v-if="apiMode == 'mocking'"><ExclamationTriangleIcon class="size-6 inline mr-1 text-yellow-400" /> API mocking</div> -->
@@ -17,7 +17,7 @@
 </template>
 
 <script setup lang="ts">
-import { LanguageIcon } from '@heroicons/vue/16/solid';
+import { GlobeIcon } from 'lucide-vue-next';
 import { version } from '../../../package.json';
 import { useI18n } from 'vue-i18n';
 
diff --git a/src/components/Timetable/TimetableWarnings.vue b/src/components/Timetable/TimetableWarnings.vue
index b8243db..2ab8227 100644
--- a/src/components/Timetable/TimetableWarnings.vue
+++ b/src/components/Timetable/TimetableWarnings.vue
@@ -4,7 +4,7 @@
     <div class="flex gap-2">
       <div class="flex items-center gap-2 bg-zinc-900 p-1 w-full">
         <div>
-          <InformationCircleIcon class="size-5" />
+          <InfoIcon :size="20" />
         </div>
         <i18n-t keypath="storage-preview-info" tag="span">
           <template v-slot:id>
@@ -28,14 +28,14 @@
         class="font-bold bg-zinc-900 p-1 hover:bg-zinc-800"
         @click="removeTimetable(globalStore.currentTimetableData.timetableId)"
       >
-        <TrashIcon class="text-white size-6" />
+        <Trash2Icon />
       </button>
 
       <button
         class="font-bold bg-zinc-900 p-1 hover:bg-zinc-800"
         @click="globalStore.selectedStorageTimetable = null"
       >
-        <ArrowUturnLeftIcon class="text-white size-6" />
+        <Undo2Icon />
       </button>
     </div>
   </div>
@@ -45,7 +45,7 @@
     <div class="flex gap-2">
       <div class="flex items-center gap-2 bg-zinc-900 p-1 w-full">
         <div>
-          <InformationCircleIcon class="size-5" />
+          <InfoIcon :size="20" />
         </div>
 
         <i18n-t keypath="journal-preview-info" tag="span">
@@ -67,17 +67,17 @@
         class="font-bold bg-zinc-900 p-1 hover:bg-zinc-800"
         @click="globalStore.selectedJournalTimetable = null"
       >
-        <ArrowUturnLeftIcon class="text-white size-6" />
+        <Undo2Icon />
       </button>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ArrowUturnLeftIcon, InformationCircleIcon, TrashIcon } from '@heroicons/vue/16/solid';
 import { useGlobalStore } from '../../stores/global.store';
 import { useI18n } from 'vue-i18n';
 import type { TimetableData } from '../../types/common.types';
+import { InfoIcon, Trash2Icon, Undo2Icon } from 'lucide-vue-next';
 
 const globalStore = useGlobalStore();
 const i18n = useI18n();
diff --git a/src/components/TimetableSearch/JournalSearchInput.vue b/src/components/TimetableSearch/JournalSearchInput.vue
index 444b4d8..8455430 100644
--- a/src/components/TimetableSearch/JournalSearchInput.vue
+++ b/src/components/TimetableSearch/JournalSearchInput.vue
@@ -46,7 +46,7 @@
       v-if="globalStore.viewMode == 'journal'"
       @click="clearSearch"
     >
-      <TrashIcon class="size-6" />
+      <Trash2Icon />
     </button>
 
     <button
@@ -54,16 +54,16 @@
       v-if="globalStore.viewMode == 'journal'"
       @click="fetchJournalTimetables"
     >
-      <ArrowRightCircleIcon class="size-6" />
+      <SearchIcon />
     </button>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ArrowRightCircleIcon, TrashIcon } from '@heroicons/vue/16/solid';
 import { useApiStore } from '../../stores/api.store';
 import { useGlobalStore } from '../../stores/global.store';
 import { DataStatus, type JournalTimetablesShortResponse } from '../../types/api.types';
+import { SearchIcon, Trash2Icon } from 'lucide-vue-next';
 
 const globalStore = useGlobalStore();
 const apiStore = useApiStore();
diff --git a/src/components/TimetableSearch/LocalSearchInput.vue b/src/components/TimetableSearch/LocalSearchInput.vue
index 83311e0..c1fe550 100644
--- a/src/components/TimetableSearch/LocalSearchInput.vue
+++ b/src/components/TimetableSearch/LocalSearchInput.vue
@@ -15,14 +15,14 @@
         v-if="globalStore.viewMode == 'storage'"
         @click="clearSearch"
       >
-        <TrashIcon class="size-6" />
+        <Trash2Icon />
       </button>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { TrashIcon } from '@heroicons/vue/16/solid';
+import { Trash2Icon } from 'lucide-vue-next';
 import { useGlobalStore } from '../../stores/global.store';
 
 const globalStore = useGlobalStore();
diff --git a/src/components/TimetableSearch/SearchModeActions.vue b/src/components/TimetableSearch/SearchModeActions.vue
index c707826..581f606 100644
--- a/src/components/TimetableSearch/SearchModeActions.vue
+++ b/src/components/TimetableSearch/SearchModeActions.vue
@@ -9,7 +9,7 @@
         }`"
         @click="toggleViewMode('active')"
       >
-        <WifiIcon class="size-6" />
+        <WifiIcon />
       </button>
 
       <button
@@ -20,7 +20,7 @@
         }`"
         @click="toggleViewMode('storage')"
       >
-        <ArchiveBoxArrowDownIcon class="size-6" />
+        <ArchiveIcon />
       </button>
 
       <button
@@ -31,14 +31,14 @@
         }`"
         @click="toggleViewMode('journal')"
       >
-        <CloudIcon class="size-6" />
+        <NotebookPenIcon />
       </button>
     </div>
 
     <div class="flex gap-2">
       <button class="bg-zinc-800 p-1 rounded-md hover:bg-zinc-700 self-end" @click="toggleDarkMode">
-        <MoonIcon v-if="globalStore.darkMode" class="text-white size-6" />
-        <SunIcon v-else class="text-white size-6" />
+        <MoonIcon v-if="globalStore.darkMode" />
+        <SunIcon v-else />
       </button>
 
       <button
@@ -46,7 +46,7 @@
         :disabled="globalStore.currentTimetableData == null"
         @click="openPrintingWindow"
       >
-        <PrinterIcon class="text-white size-6" />
+        <PrinterIcon />
       </button>
 
       <button
@@ -58,25 +58,25 @@
         }"
         @click="saveToStorage"
       >
-        <ArrowDownTrayIcon class="text-white size-6" />
+        <FolderDownIcon />
       </button>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import {
-  PrinterIcon,
-  MoonIcon,
-  SunIcon,
-  ArchiveBoxArrowDownIcon,
-  ArrowDownTrayIcon,
-  CloudIcon,
-  WifiIcon
-} from '@heroicons/vue/16/solid';
 import { computed, watch } from 'vue';
 import { useGlobalStore } from '../../stores/global.store';
 import type { ViewMode, TimetableData } from '../../types/common.types';
+import {
+  ArchiveIcon,
+  FolderDownIcon,
+  MoonIcon,
+  NotebookPenIcon,
+  PrinterIcon,
+  SunIcon,
+  WifiIcon
+} from 'lucide-vue-next';
 
 const globalStore = useGlobalStore();
 
diff --git a/src/components/TimetableViews/LocalStorageView.vue b/src/components/TimetableViews/LocalStorageView.vue
index d6fd0fd..d3d0aa4 100644
--- a/src/components/TimetableViews/LocalStorageView.vue
+++ b/src/components/TimetableViews/LocalStorageView.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="text-white">
     <div class="font-bold p-2 bg-zinc-700 mb-3">
-      <div class="text-2xl">{{ $t('storage-preview-title') }}</div>
+      <div class="text-2xl flex items-center gap-2 justify-center flex-wrap">
+        <ArchiveIcon :size="25" />
+        <span>{{ $t('storage-preview-title') }}</span>
+      </div>
     </div>
 
     <div
@@ -36,7 +39,7 @@
           class="bg-zinc-900 p-2 hover:bg-zinc-800"
           @click="removeTimetable(timetable.timetableId)"
         >
-          <TrashIcon class="size-6 text-white" />
+          <Trash2Icon />
         </button>
       </li>
     </ul>
@@ -48,7 +51,7 @@ import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useGlobalStore } from '../../stores/global.store';
 import type { TimetableData } from '../../types/common.types';
-import { TrashIcon } from '@heroicons/vue/16/solid';
+import { ArchiveIcon, Trash2Icon } from 'lucide-vue-next';
 
 const globalStore = useGlobalStore();
 const i18n = useI18n();
diff --git a/tsconfig.app.tsbuildinfo b/tsconfig.app.tsbuildinfo
index 1d9fdd5..5f0c54d 100644
--- a/tsconfig.app.tsbuildinfo
+++ b/tsconfig.app.tsbuildinfo
@@ -1 +1 @@
-{"root":["./src/i18n.ts","./src/main.ts","./src/vite-env.d.ts","./src/stores/api.store.ts","./src/stores/global.store.ts","./src/types/api.types.ts","./src/types/common.types.ts","./src/utils/trainUtils.ts","./src/App.vue","./src/components/App/MainBottom.vue","./src/components/App/MainContainer.vue","./src/components/App/Navbar.vue","./src/components/App/SettingsCard.vue","./src/components/App/UpdatePrompt.vue","./src/components/Timetable/TimetableBody.vue","./src/components/Timetable/TimetableHeader.vue","./src/components/Timetable/TimetableSelect.vue","./src/components/Timetable/TimetableWarnings.vue","./src/components/Timetable/TrainTimetable.vue","./src/components/TimetableViews/JournalStorageView.vue","./src/components/TimetableViews/LocalStorageView.vue"],"version":"5.6.3"}
\ No newline at end of file
+{"root":["./src/i18n.ts","./src/main.ts","./src/vite-env.d.ts","./src/stores/api.store.ts","./src/stores/global.store.ts","./src/types/api.types.ts","./src/types/common.types.ts","./src/utils/trainUtils.ts","./src/App.vue","./src/components/App/MainBottom.vue","./src/components/App/MainContainer.vue","./src/components/App/Navbar.vue","./src/components/App/SettingsCard.vue","./src/components/App/UpdatePrompt.vue","./src/components/Timetable/TimetableBody.vue","./src/components/Timetable/TimetableHeader.vue","./src/components/Timetable/TimetableWarnings.vue","./src/components/Timetable/TrainTimetable.vue","./src/components/TimetableSearch/ActiveSearchInput.vue","./src/components/TimetableSearch/JournalSearchInput.vue","./src/components/TimetableSearch/LocalSearchInput.vue","./src/components/TimetableSearch/SearchContainer.vue","./src/components/TimetableSearch/SearchModeActions.vue","./src/components/TimetableViews/JournalStorageView.vue","./src/components/TimetableViews/LocalStorageView.vue"],"version":"5.6.3"}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index a6ef49b..cc5ed8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -937,11 +937,6 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz#34aa0b52d0fbb1a654b596acfa595f0c7b77a77b"
   integrity sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==
 
-"@heroicons/vue@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@heroicons/vue/-/vue-2.2.0.tgz#d81f14eed448eec9859849ed63facd3f29bca2b3"
-  integrity sha512-G3dbSxoeEKqbi/DFalhRxJU4mTXJn7GwZ7ae8NuEQzd1bqdd0jAbdaBZlHPcvPD2xI1iGzNVB4k20Un2AguYPw==
-
 "@intlify/core-base@10.0.5":
   version "10.0.5"
   resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-10.0.5.tgz#c4d992381f8c3a50c79faf67be3404b399c3be28"
@@ -2595,6 +2590,11 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lucide-vue-next@^0.503.0:
+  version "0.503.0"
+  resolved "https://registry.yarnpkg.com/lucide-vue-next/-/lucide-vue-next-0.503.0.tgz#a66bd31fdf84d4ddc590d8a5cb518b5a7da849ec"
+  integrity sha512-3MrtHIBdh4dPCUZDLxQnvmQ17UzUnBYgezUSIo87Laais8hOz6qIPllp0iG/uS/UIzk7bJxyZRzoZTW/gLSr4A==
+
 magic-string@^0.25.0, magic-string@^0.25.7:
   version "0.25.9"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"