diff --git a/apps/calendar/apps/web/src/routes/+layout.svelte b/apps/calendar/apps/web/src/routes/+layout.svelte
index 6d8411e8f..6cbb7c5d9 100644
--- a/apps/calendar/apps/web/src/routes/+layout.svelte
+++ b/apps/calendar/apps/web/src/routes/+layout.svelte
@@ -32,52 +32,7 @@
 		</div>
 	</div>
 {:else}
-	<div class="layout-container">
-		<PillNavigation
-			items={navItems}
-			currentPath={$page.url.pathname}
-			appName="Kalender"
-			homeRoute="/"
-			onToggleTheme={handleToggleTheme}
-			{isDark}
-			{isSidebarMode}
-			onModeChange={handleModeChange}
-			{isCollapsed}
-			onCollapsedChange={handleCollapsedChange}
-			desktopPosition={userSettings.nav.desktopPosition}
-			showThemeToggle={true}
-			showThemeVariants={true}
-			{themeVariantItems}
-			{currentThemeVariantLabel}
-			themeMode={theme.mode}
-			onThemeModeChange={handleThemeModeChange}
-			showLanguageSwitcher={true}
-			{languageItems}
-			{currentLanguageLabel}
-			showLogout={authStore.isAuthenticated}
-			onLogout={handleLogout}
-			loginHref="/login"
-			primaryColor="#3b82f6"
-			showAppSwitcher={true}
-			{appItems}
-			{userEmail}
-			settingsHref="/settings"
-			manaHref="/mana"
-			profileHref="/profile"
-			allAppsHref="/apps"
-		/>
-
-		<main
-			class="main-content bg-background"
-			class:sidebar-mode={isSidebarMode && !isCollapsed}
-			class:floating-mode={!isSidebarMode && !isCollapsed}
-		>
-			<div
-				class="content-wrapper"
-				class:calendar-expanded={settingsStore.sidebarCollapsed && $page.url.pathname === '/'}
-			>
-				{@render children()}
-			</div>
-		</main>
+	<div class="min-h-screen bg-background text-foreground">
+		{@render children()}
 	</div>
 {/if}
diff --git a/apps/clock/apps/web/src/routes/(auth)/login/+page.svelte b/apps/clock/apps/web/src/routes/(auth)/login/+page.svelte
index 982d694bf..41dd500ee 100644
--- a/apps/clock/apps/web/src/routes/(auth)/login/+page.svelte
+++ b/apps/clock/apps/web/src/routes/(auth)/login/+page.svelte
@@ -1,34 +1,30 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
+	import { page } from '$app/stores';
 	import { LoginPage } from '@manacore/shared-auth-ui';
+	import { ClockLogo } from '@manacore/shared-branding';
 	import { authStore } from '$lib/stores/auth.svelte';
 	import '$lib/i18n';
 
-	let error = $state('');
-	let loading = $state(false);
+	// Get redirect URL from query params
+	const redirectTo = $derived($page.url.searchParams.get('redirectTo') || '/');
 
-	async function handleLogin(email: string, password: string) {
-		loading = true;
-		error = '';
-
-		const result = await authStore.signIn(email, password);
-
-		if (result.success) {
-			goto('/');
-		} else {
-			error = result.error || 'Login fehlgeschlagen';
-		}
-
-		loading = false;
+	async function handleSignIn(email: string, password: string) {
+		return authStore.signIn(email, password);
 	}
 </script>
 
 <LoginPage
 	appName="Clock"
-	appLogo=""
-	{loading}
-	{error}
-	onSubmit={handleLogin}
-	registerHref="/register"
-	forgotPasswordHref="/forgot-password"
+	logo={ClockLogo}
+	primaryColor="#f59e0b"
+	onSignIn={handleSignIn}
+	{goto}
+	enableGoogle={false}
+	enableApple={false}
+	successRedirect={redirectTo}
+	registerPath="/register"
+	forgotPasswordPath="/forgot-password"
+	lightBackground="#fef3c7"
+	darkBackground="#1c1917"
 />
diff --git a/apps/manacore/apps/web/src/routes/(app)/settings/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/settings/+page.svelte
index 56ff38f9a..fe223d193 100644
--- a/apps/manacore/apps/web/src/routes/(app)/settings/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/settings/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
 	import { Button, Input, Card, PageHeader } from '@manacore/shared-ui';
-	import { authStore } from '$lib/stores/authStore.svelte';
+	import { authStore } from '$lib/stores/auth.svelte';
 	import { creditsService } from '$lib/api/credits';
 	import type { CreditBalance } from '$lib/api/credits';
 	import { userSettings } from '$lib/stores/user-settings.svelte';
diff --git a/packages/shared-branding/src/index.ts b/packages/shared-branding/src/index.ts
index 9d4fd4b64..95f9340bd 100644
--- a/packages/shared-branding/src/index.ts
+++ b/packages/shared-branding/src/index.ts
@@ -31,6 +31,7 @@ export {
 	MailLogo,
 	MoodlitLogo,
 	InventoryLogo,
+	ClockLogo,
 } from './logos';
 
 // Configuration
diff --git a/packages/shared-branding/src/logos/ClockLogo.svelte b/packages/shared-branding/src/logos/ClockLogo.svelte
new file mode 100644
index 000000000..ff2c93eaf
--- /dev/null
+++ b/packages/shared-branding/src/logos/ClockLogo.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+	import AppLogo from '../AppLogo.svelte';
+
+	interface Props {
+		size?: number;
+		color?: string;
+		class?: string;
+	}
+
+	let { size = 55, color, class: className = '' }: Props = $props();
+</script>
+
+<AppLogo app="clock" {size} {color} class={className} />
diff --git a/packages/shared-branding/src/logos/index.ts b/packages/shared-branding/src/logos/index.ts
index 06ce0a38d..235e0e2c6 100644
--- a/packages/shared-branding/src/logos/index.ts
+++ b/packages/shared-branding/src/logos/index.ts
@@ -18,3 +18,4 @@ export { default as TodoLogo } from './TodoLogo.svelte';
 export { default as MailLogo } from './MailLogo.svelte';
 export { default as MoodlitLogo } from './MoodlitLogo.svelte';
 export { default as InventoryLogo } from './InventoryLogo.svelte';
+export { default as ClockLogo } from './ClockLogo.svelte';