diff --git a/apps/mana/apps/web/src/lib/components/EncryptionIntroBanner.svelte b/apps/mana/apps/web/src/lib/components/EncryptionIntroBanner.svelte
index fe6b4e014..c60786353 100644
--- a/apps/mana/apps/web/src/lib/components/EncryptionIntroBanner.svelte
+++ b/apps/mana/apps/web/src/lib/components/EncryptionIntroBanner.svelte
@@ -111,7 +111,7 @@
 				Notizen, Chats, Tagebuch und Kontaktdetails liegen nur als verschlüsselter Blob auf diesem
 				Gerät. Ohne deinen Schlüssel kann sie niemand lesen — nicht mal Mana.
 			</p>
-			<a href="/settings/security" class="learn-more">Mehr erfahren →</a>
+			<a href="/?app=settings#vault" class="learn-more">Mehr erfahren →</a>
 		</div>
 		<button type="button" class="dismiss" onclick={dismiss} aria-label="Hinweis ausblenden">
 			<X size={18} />
diff --git a/apps/mana/apps/web/src/lib/components/layout/use-sync-status-items.svelte.ts b/apps/mana/apps/web/src/lib/components/layout/use-sync-status-items.svelte.ts
index 9726b4281..ebaaace2d 100644
--- a/apps/mana/apps/web/src/lib/components/layout/use-sync-status-items.svelte.ts
+++ b/apps/mana/apps/web/src/lib/components/layout/use-sync-status-items.svelte.ts
@@ -46,7 +46,7 @@ export function useSyncStatusItems() {
 				id: 'sync-inactive',
 				label: 'Sync aktivieren',
 				icon: 'cloud',
-				onClick: () => goto('/settings/sync'),
+				onClick: () => goto('/?app=settings#cloud-sync'),
 			});
 			result.push({
 				id: 'sync-info',
@@ -61,7 +61,7 @@ export function useSyncStatusItems() {
 			id: 'sync-settings',
 			label: 'Sync-Einstellungen',
 			icon: 'settings',
-			onClick: () => goto('/settings/sync'),
+			onClick: () => goto('/?app=settings#cloud-sync'),
 		});
 
 		return result;
diff --git a/apps/mana/apps/web/src/lib/components/settings/searchIndex.ts b/apps/mana/apps/web/src/lib/components/settings/searchIndex.ts
index 5abaa7e57..bca629046 100644
--- a/apps/mana/apps/web/src/lib/components/settings/searchIndex.ts
+++ b/apps/mana/apps/web/src/lib/components/settings/searchIndex.ts
@@ -35,9 +35,9 @@ export const categories: Category[] = [
 	{
 		id: 'security',
 		label: 'Sicherheit',
-		description: 'Passkeys, 2FA & Sitzungen',
+		description: 'Passkeys, 2FA, Verschlüsselung & Sitzungen',
 		icon: ShieldCheck,
-		anchors: ['passkeys', 'sessions', 'two-factor', 'security-log'],
+		anchors: ['passkeys', 'sessions', 'two-factor', 'vault', 'security-log'],
 	},
 	{
 		id: 'credits',
@@ -130,6 +130,12 @@ export const searchIndex: SearchEntry[] = [
 		category: 'security',
 		anchor: 'two-factor',
 	},
+	{
+		label: 'Verschlüsselung',
+		keywords: ['vault', 'encryption', 'aes', 'schlüssel', 'zero-knowledge'],
+		category: 'security',
+		anchor: 'vault',
+	},
 	{
 		label: 'Sicherheits-Log',
 		keywords: ['audit', 'history', 'verlauf'],
diff --git a/apps/mana/apps/web/src/lib/components/settings/sections/DataSection.svelte b/apps/mana/apps/web/src/lib/components/settings/sections/DataSection.svelte
index e659f4a4f..7991a397a 100644
--- a/apps/mana/apps/web/src/lib/components/settings/sections/DataSection.svelte
+++ b/apps/mana/apps/web/src/lib/components/settings/sections/DataSection.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
-	import { Cloud, FileText, CaretRight } from '@mana/shared-icons';
+	import { Cloud, FileText } from '@mana/shared-icons';
 	import SettingsPanel from '../SettingsPanel.svelte';
 	import SettingsSectionHeader from '../SettingsSectionHeader.svelte';
+	import SyncSection from './SyncSection.svelte';
+	import MyDataSection from './MyDataSection.svelte';
 </script>
 
 <SettingsPanel id="cloud-sync">
@@ -10,11 +12,8 @@
 		title="Cloud Sync"
 		description="Synchronisiere deine Daten über alle Geräte"
 		tone="blue"
-	>
-		{#snippet action()}
-			<a href="/settings/sync" class="text-sm text-primary hover:underline">Einstellungen</a>
-		{/snippet}
-	</SettingsSectionHeader>
+	/>
+	<SyncSection />
 </SettingsPanel>
 
 <SettingsPanel id="my-data">
@@ -24,41 +23,5 @@
 		description="Datenschutz und Datenexport"
 		tone="purple"
 	/>
-
-	<div class="space-y-4">
-		<div class="flex items-center justify-between border-b border-border py-3">
-			<div>
-				<p class="font-medium">Daten ansehen & exportieren</p>
-				<p class="text-sm text-muted-foreground">
-					Sieh alle deine gespeicherten Daten ein und exportiere sie als JSON
-				</p>
-			</div>
-			<a
-				href="/settings/my-data"
-				class="inline-flex items-center gap-2 rounded-lg bg-primary px-4 py-2 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90"
-			>
-				Meine Daten
-				<CaretRight size={16} />
-			</a>
-		</div>
-
-		<div
-			class="rounded-lg border border-red-200 bg-red-50 p-4 dark:border-red-800 dark:bg-red-900/10"
-		>
-			<div class="flex items-center justify-between">
-				<div>
-					<p class="font-medium text-red-600 dark:text-red-400">Konto löschen</p>
-					<p class="text-sm text-muted-foreground">
-						Das Löschen deines Kontos kann nicht rückgängig gemacht werden.
-					</p>
-				</div>
-				<a
-					href="/settings/my-data"
-					class="inline-flex items-center gap-2 rounded-lg bg-red-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-red-700"
-				>
-					Verwalten
-				</a>
-			</div>
-		</div>
-	</div>
+	<MyDataSection />
 </SettingsPanel>
diff --git a/apps/mana/apps/web/src/routes/(app)/settings/my-data/+page.svelte b/apps/mana/apps/web/src/lib/components/settings/sections/MyDataSection.svelte
similarity index 97%
rename from apps/mana/apps/web/src/routes/(app)/settings/my-data/+page.svelte
rename to apps/mana/apps/web/src/lib/components/settings/sections/MyDataSection.svelte
index 7ef3ecf4e..2b8a906dd 100644
--- a/apps/mana/apps/web/src/routes/(app)/settings/my-data/+page.svelte
+++ b/apps/mana/apps/web/src/lib/components/settings/sections/MyDataSection.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
 	import { goto } from '$app/navigation';
-	import { Card, PageHeader } from '@mana/shared-ui';
+	import { Card } from '@mana/shared-ui';
 	import {
 		QrCode,
 		DownloadSimple,
@@ -13,7 +13,6 @@
 		CheckCircle,
 		WarningCircle,
 	} from '@mana/shared-icons';
-	import Breadcrumbs from '$lib/components/Breadcrumbs.svelte';
 	import StatCard from '$lib/components/admin/StatCard.svelte';
 	import ProjectDataCard from '$lib/components/admin/ProjectDataCard.svelte';
 	import DeleteConfirmationModal from '$lib/components/my-data/DeleteConfirmationModal.svelte';
@@ -177,20 +176,13 @@
 	});
 </script>
 
-<svelte:head>
-	<title>Meine Daten - Einstellungen</title>
-</svelte:head>
-
 <div class="space-y-6">
 	<!-- Header -->
 	<div class="flex items-center justify-between gap-4">
 		<div>
-			<Breadcrumbs
-				items={[{ label: 'Einstellungen', href: '/?app=settings' }, { label: 'Meine Daten' }]}
-			/>
-			<h1 class="text-2xl font-bold">Meine Daten</h1>
-			<p class="text-muted-foreground">
-				Ubersicht uber alle deine gespeicherten Daten (GDPR/DSGVO)
+			<h2 class="text-lg font-bold">Meine Daten</h2>
+			<p class="text-sm text-muted-foreground">
+				Übersicht über alle deine gespeicherten Daten (GDPR/DSGVO)
 			</p>
 		</div>
 		{#if userData}
diff --git a/apps/mana/apps/web/src/lib/components/settings/sections/SecuritySection.svelte b/apps/mana/apps/web/src/lib/components/settings/sections/SecuritySection.svelte
index 4b1019efa..7fb8c6d60 100644
--- a/apps/mana/apps/web/src/lib/components/settings/sections/SecuritySection.svelte
+++ b/apps/mana/apps/web/src/lib/components/settings/sections/SecuritySection.svelte
@@ -5,6 +5,7 @@
 	import { authStore } from '$lib/stores/auth.svelte';
 	import SettingsPanel from '../SettingsPanel.svelte';
 	import SettingsSectionHeader from '../SettingsSectionHeader.svelte';
+	import VaultSection from './VaultSection.svelte';
 
 	let passkeys = $state<any[]>([]);
 	let sessions = $state<any[]>([]);
@@ -34,7 +35,7 @@
 	<SettingsSectionHeader
 		icon={ShieldCheck}
 		title="Sicherheit"
-		description="Passkeys, 2FA & Sitzungen"
+		description="Passkeys, 2FA, Verschlüsselung & Sitzungen"
 		tone="blue"
 	/>
 </SettingsPanel>
@@ -77,6 +78,10 @@
 	/>
 </SettingsPanel>
 
+<SettingsPanel id="vault">
+	<VaultSection />
+</SettingsPanel>
+
 <SettingsPanel id="security-log">
 	<AuditLog
 		events={securityEvents}
diff --git a/apps/mana/apps/web/src/routes/(app)/settings/sync/+page.svelte b/apps/mana/apps/web/src/lib/components/settings/sections/SyncSection.svelte
similarity index 96%
rename from apps/mana/apps/web/src/routes/(app)/settings/sync/+page.svelte
rename to apps/mana/apps/web/src/lib/components/settings/sections/SyncSection.svelte
index f2f5f4d46..b78f725ae 100644
--- a/apps/mana/apps/web/src/routes/(app)/settings/sync/+page.svelte
+++ b/apps/mana/apps/web/src/lib/components/settings/sections/SyncSection.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Card, PageHeader } from '@mana/shared-ui';
+	import { Card } from '@mana/shared-ui';
 	import { syncBilling } from '$lib/stores/sync-billing.svelte';
 	import { creditsService, type CreditBalance } from '$lib/api/credits';
 	import type { BillingInterval } from '$lib/api/sync';
@@ -106,8 +106,6 @@
 </script>
 
 <div>
-	<PageHeader title="Cloud Sync" backHref="/?app=settings" sticky size="lg" />
-
 	{#if syncBilling.loading}
 		<div class="flex items-center justify-center py-12">
 			<div
@@ -267,11 +265,6 @@
 				</div>
 			</Card>
 		</div>
-
-		<!-- Back link -->
-		<div class="mt-6">
-			<a href="/?app=settings" class="text-sm text-primary hover:underline"> ← Zurück </a>
-		</div>
 	{/if}
 </div>
 
diff --git a/apps/mana/apps/web/src/routes/(app)/settings/security/+page.svelte b/apps/mana/apps/web/src/lib/components/settings/sections/VaultSection.svelte
similarity index 99%
rename from apps/mana/apps/web/src/routes/(app)/settings/security/+page.svelte
rename to apps/mana/apps/web/src/lib/components/settings/sections/VaultSection.svelte
index ccc3e6f30..683793623 100644
--- a/apps/mana/apps/web/src/routes/(app)/settings/security/+page.svelte
+++ b/apps/mana/apps/web/src/lib/components/settings/sections/VaultSection.svelte
@@ -291,13 +291,9 @@
 	const badge = $derived(statusBadge(vaultState));
 </script>
 
-<svelte:head>
-	<title>Sicherheit · Einstellungen · Mana</title>
-</svelte:head>
-
 <div class="security-page">
 	<header>
-		<h1>Sicherheit</h1>
+		<h2>Verschlüsselung</h2>
 		<p class="subtitle">
 			Verschlüsselung deiner Inhalte auf diesem Gerät. Sensitive Felder werden mit AES-GCM-256
 			verschlüsselt, bevor sie in die lokale Datenbank geschrieben werden.
diff --git a/apps/mana/apps/web/src/routes/(app)/+layout.svelte b/apps/mana/apps/web/src/routes/(app)/+layout.svelte
index af3942ebf..7aa625230 100644
--- a/apps/mana/apps/web/src/routes/(app)/+layout.svelte
+++ b/apps/mana/apps/web/src/routes/(app)/+layout.svelte
@@ -821,7 +821,10 @@
 								>
 									Credits aufladen
 								</a>
-								<a href="/settings/sync" class="font-medium underline hover:no-underline">
+								<a
+									href="/?app=settings#cloud-sync"
+									class="font-medium underline hover:no-underline"
+								>
 									Sync-Einstellungen
 								</a>
 							</div>