diff --git a/src/lib/components/channel.svelte b/src/lib/components/channel.svelte
index b88572f..fd3248f 100644
--- a/src/lib/components/channel.svelte
+++ b/src/lib/components/channel.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { page } from '$app/state';
-  import MessageSquare from 'lucide-svelte/icons/message-square';
+  import { MessageSquare } from 'lucide-svelte';
 
   interface Props {
     channelName: string;
diff --git a/src/lib/components/mainLayout.svelte b/src/lib/components/mainLayout.svelte
index 5003b06..be3901e 100644
--- a/src/lib/components/mainLayout.svelte
+++ b/src/lib/components/mainLayout.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import MessagesSquare from 'lucide-svelte/icons/messages-square';
+  import { MessageSquare } from 'lucide-svelte';
   import type { Snippet } from 'svelte';
   import type { PageData } from '../../routes/(main)/$types';
   import Channel from './channel.svelte';
@@ -23,7 +23,7 @@
       <div class="flex h-full max-h-screen flex-col gap-2">
         <div class="flex h-14 items-center border-b px-4 lg:h-[60px] lg:px-6">
           <a href="/" class="flex items-center gap-2 font-semibold">
-            <MessagesSquare class="h-6 w-6" />
+            <MessageSquare class="h-6 w-6" />
             <span class="">SVChat</span>
           </a>
           <ModeSwitcher />
diff --git a/src/lib/components/message.svelte b/src/lib/components/message.svelte
index 1ab6f29..77f9085 100644
--- a/src/lib/components/message.svelte
+++ b/src/lib/components/message.svelte
@@ -4,10 +4,7 @@
   import renderMarkdown from '$lib/functions/renderMarkdown';
   import { type TypeMessage } from '$lib/types';
 
-  import Clipboard from 'lucide-svelte/icons/clipboard';
-  import SquareUserRound from 'lucide-svelte/icons/square-user-round';
-  import IDCard from 'lucide-svelte/icons/id-card';
-  import CalendarClock from 'lucide-svelte/icons/calendar-clock';
+  import { Clipboard, SquareUserRound, IdCard, CalendarClock } from 'lucide-svelte';
 
   interface Props {
     open: boolean;
@@ -63,7 +60,7 @@
     >
     <!-- Copy User ID -->
     <ContextMenu.Item class="flex cursor-pointer items-center gap-1.5" onclick={() => copy('user ID', uid)}
-      ><IDCard size={16} />Copy User ID</ContextMenu.Item
+      ><IdCard size={16} />Copy User ID</ContextMenu.Item
     >
     <ContextMenu.Separator />
     <!-- Copy Text -->
diff --git a/src/lib/components/modeSwitcher.svelte b/src/lib/components/modeSwitcher.svelte
index 1f5a228..c480ee6 100644
--- a/src/lib/components/modeSwitcher.svelte
+++ b/src/lib/components/modeSwitcher.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
   import * as Tooltip from '$lib/components/ui/tooltip';
   import { buttonVariants } from '$lib/components/ui/button';
-  import Moon from 'lucide-svelte/icons/moon-star';
-  import Sun from 'lucide-svelte/icons/sun';
+  import { Moon, Sun } from 'lucide-svelte';
   import { toggleMode } from 'mode-watcher';
 </script>
 
diff --git a/src/lib/components/ui/context-menu/context-menu-checkbox-item.svelte b/src/lib/components/ui/context-menu/context-menu-checkbox-item.svelte
index 84e6718..07305cf 100644
--- a/src/lib/components/ui/context-menu/context-menu-checkbox-item.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-checkbox-item.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { ContextMenu as ContextMenuPrimitive, type WithoutChildrenOrChild } from 'bits-ui';
-  import Check from 'lucide-svelte/icons/check';
-  import Minus from 'lucide-svelte/icons/minus';
+  import { Check, Minus } from 'lucide-svelte';
   import type { Snippet } from 'svelte';
   import { cn } from '$lib/utils.js';
 
diff --git a/src/lib/components/ui/context-menu/context-menu-radio-item.svelte b/src/lib/components/ui/context-menu/context-menu-radio-item.svelte
index a368982..d1154d0 100644
--- a/src/lib/components/ui/context-menu/context-menu-radio-item.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-radio-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { ContextMenu as ContextMenuPrimitive, type WithoutChild } from 'bits-ui';
-  import Circle from 'lucide-svelte/icons/circle';
+  import { Circle } from 'lucide-svelte';
   import { cn } from '$lib/utils.js';
 
   let { ref = $bindable(null), class: className, children: childrenProp, ...restProps }: WithoutChild<ContextMenuPrimitive.RadioItemProps> = $props();
diff --git a/src/lib/components/ui/context-menu/context-menu-sub-trigger.svelte b/src/lib/components/ui/context-menu/context-menu-sub-trigger.svelte
index cc8fe7f..3259acd 100644
--- a/src/lib/components/ui/context-menu/context-menu-sub-trigger.svelte
+++ b/src/lib/components/ui/context-menu/context-menu-sub-trigger.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { ContextMenu as ContextMenuPrimitive, type WithoutChild } from 'bits-ui';
-  import ChevronRight from 'lucide-svelte/icons/chevron-right';
+  import { ChevronRight } from 'lucide-svelte';
   import { cn } from '$lib/utils.js';
 
   let {
diff --git a/src/lib/components/ui/dialog/dialog-content.svelte b/src/lib/components/ui/dialog/dialog-content.svelte
index bcba3da..ff3d4bc 100644
--- a/src/lib/components/ui/dialog/dialog-content.svelte
+++ b/src/lib/components/ui/dialog/dialog-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Dialog as DialogPrimitive, type WithoutChildrenOrChild } from 'bits-ui';
-  import X from 'lucide-svelte/icons/x';
+  import { X } from 'lucide-svelte';
   import type { Snippet } from 'svelte';
   import * as Dialog from './index.js';
   import { cn } from '$lib/utils.js';
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
index e8ddeda..9fc4a27 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { DropdownMenu as DropdownMenuPrimitive, type WithoutChildrenOrChild } from 'bits-ui';
-  import Check from 'lucide-svelte/icons/check';
-  import Minus from 'lucide-svelte/icons/minus';
+  import { Check, Minus } from 'lucide-svelte';
   import { cn } from '$lib/utils.js';
   import type { Snippet } from 'svelte';
 
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
index e7694a7..699f3b1 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { DropdownMenu as DropdownMenuPrimitive, type WithoutChild } from 'bits-ui';
-  import Circle from 'lucide-svelte/icons/circle';
+  import { Circle } from 'lucide-svelte';
   import { cn } from '$lib/utils.js';
 
   let {
diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
index f26e730..f8a5cc5 100644
--- a/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
+++ b/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { DropdownMenu as DropdownMenuPrimitive, type WithoutChild } from 'bits-ui';
-  import ChevronRight from 'lucide-svelte/icons/chevron-right';
+  import { ChevronRight } from 'lucide-svelte';
   import { cn } from '$lib/utils.js';
 
   let {
diff --git a/src/lib/components/ui/select/select-item.svelte b/src/lib/components/ui/select/select-item.svelte
index aad5286..f395e78 100644
--- a/src/lib/components/ui/select/select-item.svelte
+++ b/src/lib/components/ui/select/select-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Select as SelectPrimitive, type WithoutChild } from 'bits-ui';
-  import Check from 'lucide-svelte/icons/check';
+  import { Check } from 'lucide-svelte';
   import { cn } from '$lib/utils.js';
 
   let {
diff --git a/src/lib/components/ui/select/select-scroll-down-button.svelte b/src/lib/components/ui/select/select-scroll-down-button.svelte
index 866364b..2dbb5a3 100644
--- a/src/lib/components/ui/select/select-scroll-down-button.svelte
+++ b/src/lib/components/ui/select/select-scroll-down-button.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import ChevronDown from 'lucide-svelte/icons/chevron-down';
+  import { ChevronDown } from 'lucide-svelte';
   import { Select as SelectPrimitive, type WithoutChildrenOrChild } from 'bits-ui';
   import { cn } from '$lib/utils.js';
 
diff --git a/src/lib/components/ui/select/select-scroll-up-button.svelte b/src/lib/components/ui/select/select-scroll-up-button.svelte
index 171228c..d5c8b90 100644
--- a/src/lib/components/ui/select/select-scroll-up-button.svelte
+++ b/src/lib/components/ui/select/select-scroll-up-button.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import ChevronUp from 'lucide-svelte/icons/chevron-up';
+  import { ChevronUp } from 'lucide-svelte';
   import { Select as SelectPrimitive, type WithoutChildrenOrChild } from 'bits-ui';
   import { cn } from '$lib/utils.js';
 
diff --git a/src/lib/components/ui/select/select-trigger.svelte b/src/lib/components/ui/select/select-trigger.svelte
index ba3a768..d0e662d 100644
--- a/src/lib/components/ui/select/select-trigger.svelte
+++ b/src/lib/components/ui/select/select-trigger.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { Select as SelectPrimitive, type WithoutChild } from 'bits-ui';
-  import ChevronDown from 'lucide-svelte/icons/chevron-down';
+  import { ChevronDown } from 'lucide-svelte';
   import { cn } from '$lib/utils.js';
 
   let { ref = $bindable(null), class: className, children, ...restProps }: WithoutChild<SelectPrimitive.TriggerProps> = $props();
diff --git a/src/lib/components/ui/sheet/sheet-content.svelte b/src/lib/components/ui/sheet/sheet-content.svelte
index cffc4d5..3d6ef8c 100644
--- a/src/lib/components/ui/sheet/sheet-content.svelte
+++ b/src/lib/components/ui/sheet/sheet-content.svelte
@@ -21,7 +21,7 @@
 
 <script lang="ts">
   import { Dialog as SheetPrimitive, type WithoutChildrenOrChild } from 'bits-ui';
-  import X from 'lucide-svelte/icons/x';
+  import { X } from 'lucide-svelte';
   import type { Snippet } from 'svelte';
   import SheetOverlay from './sheet-overlay.svelte';
   import { cn } from '$lib/utils.js';
diff --git a/src/lib/components/user.svelte b/src/lib/components/user.svelte
index 0a883b6..1ef65c9 100644
--- a/src/lib/components/user.svelte
+++ b/src/lib/components/user.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { Button } from '$lib/components/ui/button/index';
   import * as Tooltip from '$lib/components/ui/tooltip';
-  import Cog from 'lucide-svelte/icons/cog';
+  import { Cog } from 'lucide-svelte';
   import type { PageData } from '../../routes/(main)/$types';
   const { data }: { data: PageData } = $props();
 
diff --git a/src/routes/(main)/+error.svelte b/src/routes/(main)/+error.svelte
index d2a2951..6d3508d 100644
--- a/src/routes/(main)/+error.svelte
+++ b/src/routes/(main)/+error.svelte
@@ -2,7 +2,7 @@
   import { page } from '$app/state';
   import { Button } from '$lib/components/ui/button';
   import * as Card from '$lib/components/ui/card';
-  import BrokenHeart from 'lucide-svelte/icons/heart-crack';
+  import { BrokenHeart } from 'lucide-svelte';
 </script>
 
 <main class="relative size-full">
diff --git a/src/routes/(main)/channel/[channel]/+page.svelte b/src/routes/(main)/channel/[channel]/+page.svelte
index db81cc6..b9459db 100644
--- a/src/routes/(main)/channel/[channel]/+page.svelte
+++ b/src/routes/(main)/channel/[channel]/+page.svelte
@@ -6,7 +6,7 @@
   import { buttonVariants } from '$lib/components/ui/button';
   import { autoResize } from '$lib/functions/autoresize.svelte';
   import Websocket from '$lib/functions/clientWebsocket.svelte';
-  import Send from 'lucide-svelte/icons/send';
+  import { Send } from 'lucide-svelte';
   import { io } from 'socket.io-client';
   import { onMount } from 'svelte';
   import type { PageData } from './$types';