diff --git a/src/lib/components/copy-code-button.svelte b/src/lib/components/copy-code-button.svelte
index b62b7ad..c67405d 100644
--- a/src/lib/components/copy-code-button.svelte
+++ b/src/lib/components/copy-code-button.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-	import { Check, Copy } from 'lucide-svelte';
+	import Check from 'lucide-svelte/icons/check';
+	import Copy from 'lucide-svelte/icons/copy';
 
 	let element: HTMLButtonElement;
 	let copying = false;
diff --git a/src/lib/components/layout/mobile-nav/mobile-nav-link.svelte b/src/lib/components/layout/mobile-nav/mobile-nav-link.svelte
index ab95c86..33eba94 100644
--- a/src/lib/components/layout/mobile-nav/mobile-nav-link.svelte
+++ b/src/lib/components/layout/mobile-nav/mobile-nav-link.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { ArrowUpRight } from 'lucide-svelte';
+	import ArrowUpRight from 'lucide-svelte/icons/arrow-up-right';
 	import type { HTMLAnchorAttributes } from 'svelte/elements';
 	import { Drawer } from 'vaul-svelte';
 
diff --git a/src/lib/components/layout/mobile-nav/mobile-nav.svelte b/src/lib/components/layout/mobile-nav/mobile-nav.svelte
index f8e1ca2..9212cc8 100644
--- a/src/lib/components/layout/mobile-nav/mobile-nav.svelte
+++ b/src/lib/components/layout/mobile-nav/mobile-nav.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Menu } from 'lucide-svelte';
+	import Menu from 'lucide-svelte/icons/menu';
 
 	import { navigation } from '$lib/config';
 
@@ -11,9 +11,9 @@
 
 <Drawer.Root>
 	<Drawer.Trigger asChild let:builder aria-label="open mobile menu">
-		<Button class="sm:hidden" builders={[builder]} variant="outline" size="icon"
-			><Menu class="h-4 w-4" /></Button
-		>
+		<Button class="sm:hidden" builders={[builder]} variant="outline" size="icon">
+			<Menu class="h-4 w-4" />
+		</Button>
 	</Drawer.Trigger>
 	<Drawer.Content>
 		<div class="container mx-auto">
diff --git a/src/lib/components/layout/sidenav/sidenav-link.svelte b/src/lib/components/layout/sidenav/sidenav-link.svelte
index 25a8546..9933d7d 100644
--- a/src/lib/components/layout/sidenav/sidenav-link.svelte
+++ b/src/lib/components/layout/sidenav/sidenav-link.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { ArrowUpRight } from 'lucide-svelte';
+	import ArrowUpRight from 'lucide-svelte/icons/arrow-up-right';
 	import type { HTMLAnchorAttributes } from 'svelte/elements';
 
 	import { cn } from '$lib/utils';
diff --git a/src/routes/(app)/chapters/[chapterId]/groups/+page.svelte b/src/routes/(app)/chapters/[chapterId]/groups/+page.svelte
index 0277a9e..12725c9 100644
--- a/src/routes/(app)/chapters/[chapterId]/groups/+page.svelte
+++ b/src/routes/(app)/chapters/[chapterId]/groups/+page.svelte
@@ -8,10 +8,10 @@
 	import Minus from 'lucide-svelte/icons/minus';
 	import Plus from 'lucide-svelte/icons/plus';
 	import Users from 'lucide-svelte/icons/users';
+	import Loader from 'lucide-svelte/icons/loader-circle';
 
 	import Button from '$lib/components/ui/button/button.svelte';
 	import Input from '$lib/components/ui/input/input.svelte';
-	import { Loader2 } from 'lucide-svelte';
 	import { toast } from 'svelte-sonner';
 
 	export let data: PageData;
@@ -99,7 +99,7 @@
 									<input type="hidden" name="name" value={group.name} />
 									<Button disabled={submitting} variant="destructive" type="submit">
 										{#if submitting}
-											<Loader2 class="mr-2 h-4 w-4 animate-spin" />
+											<Loader class="mr-2 h-4 w-4 animate-spin" />
 										{:else}
 											<Minus class="mr-2 h-4 w-4" />
 										{/if}
@@ -128,7 +128,7 @@
 									<input type="hidden" name="name" value={group.name} />
 									<Button disabled={submitting} variant="outline" type="submit">
 										{#if submitting}
-											<Loader2 class="mr-2 h-4 w-4 animate-spin" />
+											<Loader class="mr-2 h-4 w-4 animate-spin" />
 										{:else}
 											<Plus class="mr-2 h-4 w-4" />
 										{/if}
diff --git a/src/routes/(app)/chapters/[chapterId]/puzzle/[puzzleId]/+page.svelte b/src/routes/(app)/chapters/[chapterId]/puzzle/[puzzleId]/+page.svelte
index 960e2c9..3f42c52 100644
--- a/src/routes/(app)/chapters/[chapterId]/puzzle/[puzzleId]/+page.svelte
+++ b/src/routes/(app)/chapters/[chapterId]/puzzle/[puzzleId]/+page.svelte
@@ -6,7 +6,7 @@
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
 
-	import { Loader2 } from 'lucide-svelte';
+	import Loader from 'lucide-svelte/icons/loader-circle';
 	import { toast } from 'svelte-sonner';
 
 	import CopyCodeInjector from '$lib/components/copy-code-injector.svelte';
@@ -110,7 +110,7 @@
 			</div>
 			<Button type="submit" class="w-full sm:w-44" disabled={submitting}>
 				{#if submitting}
-					<Loader2 class="mr-2 h-4 w-4 animate-spin" />
+					<Loader class="mr-2 h-4 w-4 animate-spin" />
 				{/if}
 				Valider
 			</Button>