diff --git a/src/components/image/BackgroundPreview.svelte b/src/components/image/BackgroundPreview.svelte
index 268f937..c480707 100644
--- a/src/components/image/BackgroundPreview.svelte
+++ b/src/components/image/BackgroundPreview.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Button } from "$lib/components/ui";
+  import Button from "../ui/Button.svelte";
 
   interface Props {
     backgroundImage?: string | undefined;
diff --git a/src/components/image/ImageCropper.svelte b/src/components/image/ImageCropper.svelte
index c4b1de7..1f2288e 100644
--- a/src/components/image/ImageCropper.svelte
+++ b/src/components/image/ImageCropper.svelte
@@ -4,7 +4,7 @@
   import type { ImageCropResult } from "$lib/types/panel";
   import { ImageService } from "$lib/services/imageService";
   import { uiStore, setLoading } from "../../stores/uiStore";
-  import { Button } from "$lib/components/ui";
+  import Button from "../ui/Button.svelte";
 
   interface Props {
     imageSrc: string;
diff --git a/src/components/image/ImageUpload.svelte b/src/components/image/ImageUpload.svelte
index 70b8e0f..69d3d1c 100644
--- a/src/components/image/ImageUpload.svelte
+++ b/src/components/image/ImageUpload.svelte
@@ -5,7 +5,7 @@
   import { ImageService } from "$lib/services/imageService";
   import { handleError } from "$lib/utils/errorHandler";
   import type { ImageUploadResult } from "$lib/types/panel";
-  import { Button } from "$lib/components/ui";
+  import Button from "../ui/Button.svelte";
 
   let imageService = new ImageService();
 
diff --git a/src/components/layout/AppHeader.svelte b/src/components/layout/AppHeader.svelte
index c2cf071..47d7370 100644
--- a/src/components/layout/AppHeader.svelte
+++ b/src/components/layout/AppHeader.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Button } from "$lib/components/ui";
+  import Button from "../ui/Button.svelte";
 
   interface Props {
     onUploadNewImage?: () => void;
diff --git a/src/components/panel/PanelList.svelte b/src/components/panel/PanelList.svelte
index e6456ae..946ea82 100644
--- a/src/components/panel/PanelList.svelte
+++ b/src/components/panel/PanelList.svelte
@@ -3,7 +3,7 @@
   import { panelStore } from "../../stores/panelStore";
   import { panelStorage } from "$lib/utils/panelStorage";
   import type { Panel } from "$lib/types/panel";
-  import { IconButton } from "$lib/components/ui";
+  import IconButton from "../ui/IconButton.svelte";
 
   interface Props {
     onPanelSelect: (panel: Panel) => void;
diff --git a/src/components/panel/PanelPreview.svelte b/src/components/panel/PanelPreview.svelte
index 11d4ea9..6722365 100644
--- a/src/components/panel/PanelPreview.svelte
+++ b/src/components/panel/PanelPreview.svelte
@@ -4,7 +4,7 @@
 
   type TextItem = Panel["texts"][0];
   import { Stage, Layer, Image, Text } from "svelte-konva";
-  import { Button } from "$lib/components/ui";
+  import Button from "../ui/Button.svelte";
 
   interface Props {
     panel: Panel;
diff --git a/src/components/panel/PanelsList.svelte b/src/components/panel/PanelsList.svelte
index a2f9793..fb47dba 100644
--- a/src/components/panel/PanelsList.svelte
+++ b/src/components/panel/PanelsList.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { Panel } from "$lib/types/panel";
   import PanelPreview from "./PanelPreview.svelte";
-  import { Button } from "$lib/components/ui";
+  import Button from "../ui/Button.svelte";
 
   interface Props {
     panels: Panel[];
diff --git a/src/components/text/TextManager.svelte b/src/components/text/TextManager.svelte
index cf181f1..f4ead6a 100644
--- a/src/components/text/TextManager.svelte
+++ b/src/components/text/TextManager.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Button } from "$lib/components/ui";
+  import Button from "../ui/Button.svelte";
 
   interface Props {
     onTextAdd: (text: string) => void;
diff --git a/src/lib/components/ui/Button.svelte b/src/components/ui/Button.svelte
similarity index 100%
rename from src/lib/components/ui/Button.svelte
rename to src/components/ui/Button.svelte
diff --git a/src/lib/components/ui/IconButton.svelte b/src/components/ui/IconButton.svelte
similarity index 100%
rename from src/lib/components/ui/IconButton.svelte
rename to src/components/ui/IconButton.svelte
diff --git a/src/lib/components/ui/index.ts b/src/lib/components/ui/index.ts
deleted file mode 100644
index f45aa98..0000000
--- a/src/lib/components/ui/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as Button } from "./Button.svelte";
-export { default as IconButton } from "./IconButton.svelte";