diff --git a/src/app/[channel]/(main)/login/page.tsx b/src/app/[channel]/(main)/login/page.tsx
index 10d4ed83f..f7bddd8f4 100644
--- a/src/app/[channel]/(main)/login/page.tsx
+++ b/src/app/[channel]/(main)/login/page.tsx
@@ -1,6 +1,6 @@
 import { Suspense } from "react";
-import { Loader } from "@/ui/atoms/Loader";
-import { LoginForm } from "@/ui/components/LoginForm/LoginForm";
+import { LoginForm } from "@ui/components/LoginForm";
+import { Loader } from "@ui/atoms/Loader";
 
 export default function LoginPage() {
 	return (
diff --git a/src/app/[channel]/(main)/orders/page.tsx b/src/app/[channel]/(main)/orders/page.tsx
index 8d73acdaf..09e21b47a 100644
--- a/src/app/[channel]/(main)/orders/page.tsx
+++ b/src/app/[channel]/(main)/orders/page.tsx
@@ -1,6 +1,6 @@
+import { LoginForm } from "@ui/components/LoginForm";
 import { CurrentUserOrderListDocument } from "@/gql/graphql";
 import { executeGraphQL } from "@/lib/graphql";
-import { LoginForm } from "@/ui/components/LoginForm/LoginForm";
 import { OrderListItem } from "@/ui/components/OrderListItem";
 
 export default async function OrderPage() {
diff --git a/src/ui/components/LoginForm/components/LoginButton.tsx b/src/ui/atoms/LoginButton.tsx
similarity index 67%
rename from src/ui/components/LoginForm/components/LoginButton.tsx
rename to src/ui/atoms/LoginButton.tsx
index 4538e3ad1..2bffb37e5 100644
--- a/src/ui/components/LoginForm/components/LoginButton.tsx
+++ b/src/ui/atoms/LoginButton.tsx
@@ -6,7 +6,7 @@ export const LoginButton = () => {
 	const { pending } = useFormStatus();
 	return (
 		<button
-			className="mt-2 self-start rounded bg-neutral-800 px-4 py-2 text-neutral-200 hover:bg-neutral-700 aria-disabled:opacity-80"
+			className="mt-2 rounded bg-neutral-800 px-4 py-2 text-neutral-200 hover:bg-neutral-700 aria-disabled:opacity-80"
 			type="submit"
 			aria-disabled={pending}
 		>
diff --git a/src/ui/components/LoginForm/LoginForm.tsx b/src/ui/components/LoginForm.tsx
similarity index 95%
rename from src/ui/components/LoginForm/LoginForm.tsx
rename to src/ui/components/LoginForm.tsx
index f9a2dccfe..b90c894ff 100644
--- a/src/ui/components/LoginForm/LoginForm.tsx
+++ b/src/ui/components/LoginForm.tsx
@@ -1,4 +1,4 @@
-import { LoginButton } from "./components/LoginButton";
+import { LoginButton } from "@ui/atoms/LoginButton";
 import { saleorAuthClient } from "@/app/config";
 
 export async function LoginForm() {
diff --git a/tsconfig.json b/tsconfig.json
index f03819840..7cf575d98 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,7 +26,7 @@
 		],
 		"paths": {
 			"@/*": ["./src/*"],
-			"@ui/*": ["./src/components/*"]
+			"@ui/*": ["./src/ui/*"]
 		},
 		"types": ["react-dom/canary"]
 	},