diff --git a/apps/mana/apps/web/src/lib/components/settings/sections/GeneralSection.svelte b/apps/mana/apps/web/src/lib/components/settings/sections/GeneralSection.svelte
index 8e359fc26..d87f8e149 100644
--- a/apps/mana/apps/web/src/lib/components/settings/sections/GeneralSection.svelte
+++ b/apps/mana/apps/web/src/lib/components/settings/sections/GeneralSection.svelte
@@ -17,5 +17,5 @@
 		title="Allgemein"
 		description="Theme, Sprache & Benachrichtigungen"
 	/>
-	<GlobalSettingsSection {userSettings} appId="mana" title="" />
+	<GlobalSettingsSection {userSettings} appId="mana" showTheme={false} title="" />
 </SettingsPanel>
diff --git a/apps/mana/apps/web/src/lib/modules/settings/ListView.svelte b/apps/mana/apps/web/src/lib/modules/settings/ListView.svelte
index 9e28deb0e..a3fe57a01 100644
--- a/apps/mana/apps/web/src/lib/modules/settings/ListView.svelte
+++ b/apps/mana/apps/web/src/lib/modules/settings/ListView.svelte
@@ -3,25 +3,18 @@
   credits, data). Profile and Themes live in their own workbench apps.
 -->
 <script lang="ts">
-	import { onMount } from 'svelte';
 	import { tick } from 'svelte';
 	import { APP_VERSION } from '$lib/version';
-	import { GlobalSettingsSection } from '@mana/shared-ui';
-	import { userSettings } from '$lib/stores/user-settings.svelte';
 	import SettingsSidebar from '$lib/components/settings/SettingsSidebar.svelte';
 	import type { CategoryId, SearchEntry } from '$lib/components/settings/searchIndex';
+	import GeneralSection from '$lib/components/settings/sections/GeneralSection.svelte';
 	import AiSection from '$lib/components/settings/sections/AiSection.svelte';
 	import SecuritySection from '$lib/components/settings/sections/SecuritySection.svelte';
 	import CreditsSection from '$lib/components/settings/sections/CreditsSection.svelte';
 	import DataSection from '$lib/components/settings/sections/DataSection.svelte';
-	import SettingsPanel from '$lib/components/settings/SettingsPanel.svelte';
 
 	let activeCategory = $state<CategoryId>('general');
 
-	onMount(() => {
-		void userSettings.load();
-	});
-
 	function jumpTo(entry: SearchEntry) {
 		activeCategory = entry.category;
 		void tick().then(() => {
@@ -32,17 +25,11 @@
 </script>
 
 <div class="settings-page">
-	<SettingsSidebar
-		{activeCategory}
-		onSelect={(id) => (activeCategory = id)}
-		onJump={jumpTo}
-	/>
+	<SettingsSidebar {activeCategory} onSelect={(id) => (activeCategory = id)} onJump={jumpTo} />
 
 	<div class="settings-content">
 		{#if activeCategory === 'general'}
-			<SettingsPanel id="global" padded={false}>
-				<GlobalSettingsSection {userSettings} appId="mana" showTheme={false} />
-			</SettingsPanel>
+			<GeneralSection />
 		{:else if activeCategory === 'ai'}
 			<AiSection />
 		{:else if activeCategory === 'security'}