diff --git a/apps/chat/apps/web/src/routes/(protected)/settings/+page.svelte b/apps/chat/apps/web/src/routes/(protected)/settings/+page.svelte
index 6dc744707..b1323bce2 100644
--- a/apps/chat/apps/web/src/routes/(protected)/settings/+page.svelte
+++ b/apps/chat/apps/web/src/routes/(protected)/settings/+page.svelte
@@ -1,9 +1,6 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import { theme } from '$lib/stores/theme';
 	import { userSettings } from '$lib/stores/user-settings.svelte';
-	import { THEME_DEFINITIONS } from '@manacore/shared-theme';
-	import type { ThemeVariant } from '@manacore/shared-theme';
 	import {
 		SettingsPage,
 		SettingsSection,
@@ -15,17 +12,6 @@
 		GlobalSettingsSection,
 	} from '@manacore/shared-ui';
 
-	// Available theme variants
-	const themeVariants = theme.variants;
-
-	function setThemeVariant(variant: ThemeVariant) {
-		theme.setVariant(variant);
-	}
-
-	function toggleDarkMode(value: boolean) {
-		theme.toggleMode();
-	}
-
 	function handleDeleteChatHistory() {
 		// TODO: Implement chat history deletion
 		alert('Diese Funktion wird bald verfügbar sein.');
@@ -41,67 +27,8 @@
 </svelte:head>
 
 <SettingsPage title="Einstellungen" subtitle="Passe die App an deine Vorlieben an.">
-	<!-- Appearance Section -->
-	<SettingsSection title="Erscheinungsbild">
-		{#snippet icon()}
-			<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
-				<path
-					stroke-linecap="round"
-					stroke-linejoin="round"
-					stroke-width="2"
-					d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828l-8.486 8.485M7 17h.01"
-				/>
-			</svg>
-		{/snippet}
-
-		<SettingsCard>
-			<SettingsToggle
-				label="Dunkler Modus"
-				description="Aktiviere den dunklen Modus für die App"
-				isOn={theme.mode === 'dark'}
-				onToggle={toggleDarkMode}
-			>
-				{#snippet icon()}
-					<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
-						<path
-							stroke-linecap="round"
-							stroke-linejoin="round"
-							stroke-width="2"
-							d="M20.354 15.354A9 9 0 018.646 3.646 9.003 9.003 0 0012 21a9.003 9.003 0 008.354-5.646z"
-						/>
-					</svg>
-				{/snippet}
-			</SettingsToggle>
-
-			<div class="px-5 py-4">
-				<p class="font-medium text-[hsl(var(--foreground))] mb-2">Farbschema</p>
-				<p class="text-sm text-[hsl(var(--muted-foreground))] mb-4">
-					Wähle ein Farbschema für die App
-				</p>
-				<div class="grid grid-cols-2 sm:grid-cols-3 gap-3">
-					{#each themeVariants as variant}
-						{@const def = THEME_DEFINITIONS[variant]}
-						<button
-							onclick={() => setThemeVariant(variant)}
-							class="flex items-center gap-3 p-3 rounded-lg border-2 transition-all
-								{theme.variant === variant
-								? 'border-[hsl(var(--primary))] bg-[hsl(var(--primary)/0.05)]'
-								: 'border-[hsl(var(--border))] hover:border-[hsl(var(--primary)/0.5)]'}"
-						>
-							<span class="text-xl">{def.icon}</span>
-							<span
-								class="text-sm font-medium {theme.variant === variant
-									? 'text-[hsl(var(--primary))]'
-									: 'text-[hsl(var(--foreground))]'}"
-							>
-								{def.label}
-							</span>
-						</button>
-					{/each}
-				</div>
-			</div>
-		</SettingsCard>
-	</SettingsSection>
+	<!-- Global Settings Section (synced across all apps) -->
+	<GlobalSettingsSection {userSettings} appId="chat" />
 
 	<!-- Notifications Section -->
 	<SettingsSection title="Benachrichtigungen">
@@ -216,9 +143,6 @@
 		</SettingsDangerZone>
 	</SettingsSection>
 
-	<!-- Global Settings Section -->
-	<GlobalSettingsSection {userSettings} />
-
 	<!-- About Section -->
 	<SettingsSection title="Über die App">
 		{#snippet icon()}
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 fe223d193..9f58fa940 100644
--- a/apps/manacore/apps/web/src/routes/(app)/settings/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/settings/+page.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import { Button, Input, Card, PageHeader } from '@manacore/shared-ui';
+	import { Button, Input, Card, PageHeader, GlobalSettingsSection } from '@manacore/shared-ui';
 	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';
-	import type { NavPosition, ThemeMode } from '@manacore/shared-theme';
 
 	let loading = $state(true);
 	let savingProfile = $state(false);
@@ -32,37 +31,6 @@
 		loading = false;
 	});
 
-	// Navigation position handler
-	async function handleNavPositionChange(position: NavPosition) {
-		await userSettings.updateGlobal({
-			nav: { ...userSettings.globalSettings.nav, desktopPosition: position },
-		});
-	}
-
-	// Sidebar collapsed handler
-	async function handleSidebarChange(collapsed: boolean) {
-		await userSettings.updateGlobal({
-			nav: { ...userSettings.globalSettings.nav, sidebarCollapsed: collapsed },
-		});
-	}
-
-	// Theme mode handler
-	async function handleThemeModeChange(mode: ThemeMode) {
-		await userSettings.updateGlobal({ theme: { ...userSettings.globalSettings.theme, mode } });
-	}
-
-	// Color scheme handler
-	async function handleColorSchemeChange(colorScheme: string) {
-		await userSettings.updateGlobal({
-			theme: { ...userSettings.globalSettings.theme, colorScheme },
-		});
-	}
-
-	// Locale handler
-	async function handleLocaleChange(locale: string) {
-		await userSettings.updateGlobal({ locale });
-	}
-
 	function formatCredits(amount: number): string {
 		return amount.toLocaleString('de-DE');
 	}
@@ -169,195 +137,8 @@
 				</div>
 			</Card>
 
-			<!-- Default App Settings Section -->
-			<Card>
-				<div class="p-6">
-					<div class="flex items-center gap-3 mb-6">
-						<div
-							class="flex h-10 w-10 items-center justify-center rounded-full bg-purple-100 dark:bg-purple-900/20 text-purple-600 dark:text-purple-400"
-						>
-							<svg class="h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-								<path
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									stroke-width="2"
-									d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"
-								/>
-								<path
-									stroke-linecap="round"
-									stroke-linejoin="round"
-									stroke-width="2"
-									d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"
-								/>
-							</svg>
-						</div>
-						<div>
-							<h2 class="text-lg font-semibold">Standard App-Einstellungen</h2>
-							<p class="text-sm text-muted-foreground">
-								Diese Einstellungen gelten für alle Mana Apps
-							</p>
-						</div>
-					</div>
-
-					<div class="space-y-6">
-						<!-- Navigation Settings -->
-						<div class="space-y-4">
-							<h3 class="text-sm font-medium text-muted-foreground uppercase tracking-wide">
-								Navigation
-							</h3>
-
-							<div class="flex items-center justify-between py-3 border-b border-border">
-								<div>
-									<p class="font-medium">Position (Desktop)</p>
-									<p class="text-sm text-muted-foreground">
-										Position der Navigation auf großen Bildschirmen
-									</p>
-								</div>
-								<div class="flex gap-2">
-									<button
-										class="px-4 py-2 text-sm font-medium rounded-lg transition-colors {userSettings
-											.globalSettings.nav.desktopPosition === 'top'
-											? 'bg-primary text-primary-foreground'
-											: 'bg-surface-hover hover:bg-surface-hover/80'}"
-										onclick={() => handleNavPositionChange('top')}
-									>
-										Oben
-									</button>
-									<button
-										class="px-4 py-2 text-sm font-medium rounded-lg transition-colors {userSettings
-											.globalSettings.nav.desktopPosition === 'bottom'
-											? 'bg-primary text-primary-foreground'
-											: 'bg-surface-hover hover:bg-surface-hover/80'}"
-										onclick={() => handleNavPositionChange('bottom')}
-									>
-										Unten
-									</button>
-								</div>
-							</div>
-
-							<div class="flex items-center justify-between py-3">
-								<div>
-									<p class="font-medium">Sidebar eingeklappt</p>
-									<p class="text-sm text-muted-foreground">Standard-Zustand der Sidebar</p>
-								</div>
-								<button
-									class="relative inline-flex h-6 w-11 items-center rounded-full transition-colors {userSettings
-										.globalSettings.nav.sidebarCollapsed
-										? 'bg-primary'
-										: 'bg-gray-200 dark:bg-gray-700'}"
-									onclick={() =>
-										handleSidebarChange(!userSettings.globalSettings.nav.sidebarCollapsed)}
-								>
-									<span
-										class="inline-block h-4 w-4 transform rounded-full bg-white transition-transform {userSettings
-											.globalSettings.nav.sidebarCollapsed
-											? 'translate-x-6'
-											: 'translate-x-1'}"
-									></span>
-								</button>
-							</div>
-						</div>
-
-						<!-- Theme Settings -->
-						<div class="space-y-4">
-							<h3 class="text-sm font-medium text-muted-foreground uppercase tracking-wide">
-								Erscheinungsbild
-							</h3>
-
-							<div class="flex items-center justify-between py-3 border-b border-border">
-								<div>
-									<p class="font-medium">Farbmodus</p>
-									<p class="text-sm text-muted-foreground">Hell, Dunkel oder automatisch</p>
-								</div>
-								<div class="flex gap-2">
-									<button
-										class="px-3 py-2 text-sm font-medium rounded-lg transition-colors {userSettings
-											.globalSettings.theme.mode === 'light'
-											? 'bg-primary text-primary-foreground'
-											: 'bg-surface-hover hover:bg-surface-hover/80'}"
-										onclick={() => handleThemeModeChange('light')}
-									>
-										Hell
-									</button>
-									<button
-										class="px-3 py-2 text-sm font-medium rounded-lg transition-colors {userSettings
-											.globalSettings.theme.mode === 'dark'
-											? 'bg-primary text-primary-foreground'
-											: 'bg-surface-hover hover:bg-surface-hover/80'}"
-										onclick={() => handleThemeModeChange('dark')}
-									>
-										Dunkel
-									</button>
-									<button
-										class="px-3 py-2 text-sm font-medium rounded-lg transition-colors {userSettings
-											.globalSettings.theme.mode === 'system'
-											? 'bg-primary text-primary-foreground'
-											: 'bg-surface-hover hover:bg-surface-hover/80'}"
-										onclick={() => handleThemeModeChange('system')}
-									>
-										System
-									</button>
-								</div>
-							</div>
-
-							<div class="flex items-center justify-between py-3">
-								<div>
-									<p class="font-medium">Farbschema</p>
-									<p class="text-sm text-muted-foreground">Akzentfarbe der Benutzeroberfläche</p>
-								</div>
-								<div class="flex gap-2">
-									{#each [{ id: 'ocean', label: 'Ozean', color: 'bg-blue-500' }, { id: 'forest', label: 'Wald', color: 'bg-green-500' }, { id: 'sunset', label: 'Sonnenuntergang', color: 'bg-orange-500' }, { id: 'lavender', label: 'Lavendel', color: 'bg-purple-500' }] as scheme}
-										<button
-											class="w-8 h-8 rounded-full transition-all {scheme.color} {userSettings
-												.globalSettings.theme.colorScheme === scheme.id
-												? 'ring-2 ring-offset-2 ring-primary'
-												: 'hover:scale-110'}"
-											onclick={() => handleColorSchemeChange(scheme.id)}
-											title={scheme.label}
-										></button>
-									{/each}
-								</div>
-							</div>
-						</div>
-
-						<!-- Language Settings -->
-						<div class="space-y-4">
-							<h3 class="text-sm font-medium text-muted-foreground uppercase tracking-wide">
-								Sprache
-							</h3>
-
-							<div class="flex items-center justify-between py-3">
-								<div>
-									<p class="font-medium">Anzeigesprache</p>
-									<p class="text-sm text-muted-foreground">Sprache der Benutzeroberfläche</p>
-								</div>
-								<div class="flex gap-2">
-									{#each [{ id: 'de', label: 'DE' }, { id: 'en', label: 'EN' }, { id: 'fr', label: 'FR' }, { id: 'es', label: 'ES' }, { id: 'it', label: 'IT' }] as lang}
-										<button
-											class="px-3 py-2 text-sm font-medium rounded-lg transition-colors {userSettings
-												.globalSettings.locale === lang.id
-												? 'bg-primary text-primary-foreground'
-												: 'bg-surface-hover hover:bg-surface-hover/80'}"
-											onclick={() => handleLocaleChange(lang.id)}
-										>
-											{lang.label}
-										</button>
-									{/each}
-								</div>
-							</div>
-						</div>
-					</div>
-
-					{#if userSettings.syncing}
-						<div class="mt-4 flex items-center gap-2 text-sm text-muted-foreground">
-							<div
-								class="h-4 w-4 animate-spin rounded-full border-2 border-primary border-t-transparent"
-							></div>
-							<span>Einstellungen werden synchronisiert...</span>
-						</div>
-					{/if}
-				</div>
-			</Card>
+			<!-- Global Settings Section (synced across all apps) -->
+			<GlobalSettingsSection {userSettings} appId="manacore" />
 
 			<!-- Credits Section -->
 			<Card>
diff --git a/apps/picture/apps/web/src/routes/app/settings/+page.svelte b/apps/picture/apps/web/src/routes/app/settings/+page.svelte
index b2d7ce835..a66e96bf6 100644
--- a/apps/picture/apps/web/src/routes/app/settings/+page.svelte
+++ b/apps/picture/apps/web/src/routes/app/settings/+page.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import { theme } from '$lib/stores/theme';
 	import { userSettings } from '$lib/stores/user-settings.svelte';
-	import { THEME_DEFINITIONS } from '@manacore/shared-theme';
 	import {
 		SettingsPage,
 		SettingsSection,
@@ -21,61 +19,8 @@
 </svelte:head>
 
 <SettingsPage title="Einstellungen" subtitle="Passe die App an deine Vorlieben an.">
-	<!-- Appearance Section -->
-	<SettingsSection title="Darstellung">
-		{#snippet icon()}
-			<svg fill="none" stroke="currentColor" viewBox="0 0 24 24">
-				<path
-					stroke-linecap="round"
-					stroke-linejoin="round"
-					stroke-width="2"
-					d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828l-8.486 8.485M7 17h.01"
-				/>
-			</svg>
-		{/snippet}
-
-		<SettingsCard>
-			<div class="px-5 py-4">
-				<p class="font-medium text-[hsl(var(--foreground))] mb-2">Farbmodus</p>
-				<p class="text-sm text-[hsl(var(--muted-foreground))] mb-4">
-					Wähle zwischen Hell, Dunkel oder System
-				</p>
-				<div class="flex gap-2">
-					{#each ['light', 'dark', 'system'] as mode}
-						<button
-							class="px-4 py-2 text-sm font-medium rounded-lg transition-colors {theme.mode === mode
-								? 'bg-[hsl(var(--primary))] text-[hsl(var(--primary-foreground))]'
-								: 'bg-[hsl(var(--muted))] hover:bg-[hsl(var(--muted))]/80 text-[hsl(var(--foreground))]'}"
-							onclick={() => theme.setMode(mode as 'light' | 'dark' | 'system')}
-						>
-							{mode === 'light' ? 'Hell' : mode === 'dark' ? 'Dunkel' : 'System'}
-						</button>
-					{/each}
-				</div>
-			</div>
-
-			<div class="px-5 py-4 border-t border-[hsl(var(--border))]">
-				<p class="font-medium text-[hsl(var(--foreground))] mb-2">Theme</p>
-				<p class="text-sm text-[hsl(var(--muted-foreground))] mb-4">Wähle eine Farbpalette</p>
-				<div class="flex gap-2 flex-wrap">
-					{#each theme.variants as variant}
-						<button
-							class="px-4 py-2 text-sm font-medium rounded-lg transition-colors {theme.variant ===
-							variant
-								? 'bg-[hsl(var(--primary))] text-[hsl(var(--primary-foreground))]'
-								: 'bg-[hsl(var(--muted))] hover:bg-[hsl(var(--muted))]/80 text-[hsl(var(--foreground))]'}"
-							onclick={() => theme.setVariant(variant)}
-						>
-							{THEME_DEFINITIONS[variant].label}
-						</button>
-					{/each}
-				</div>
-			</div>
-		</SettingsCard>
-	</SettingsSection>
-
-	<!-- Global Settings Section -->
-	<GlobalSettingsSection {userSettings} />
+	<!-- Global Settings Section (synced across all apps) -->
+	<GlobalSettingsSection {userSettings} appId="picture" />
 
 	<!-- About Section -->
 	<SettingsSection title="Über">