diff --git a/apps/todo/apps/web/src/routes/(app)/+layout.svelte b/apps/todo/apps/web/src/routes/(app)/+layout.svelte
index 92a8f8c65..271a37c98 100644
--- a/apps/todo/apps/web/src/routes/(app)/+layout.svelte
+++ b/apps/todo/apps/web/src/routes/(app)/+layout.svelte
@@ -179,7 +179,6 @@
 		},
 		{ href: '/spiral', label: 'Spiral', icon: 'sparkles' },
 		{ href: '/tags', label: 'Tags', icon: 'tag' },
-		{ href: '/settings', label: 'Einstellungen', icon: 'settings' },
 	]);
 
 	// Navigation items filtered by visibility settings (with fallback for guest mode)
@@ -492,7 +491,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		z-index: 50;
+		z-index: 1002;
 		transition: all 0.2s ease;
 	}
 
diff --git a/packages/shared-ui/src/navigation/PillNavigation.svelte b/packages/shared-ui/src/navigation/PillNavigation.svelte
index 36044e42c..835ee68b2 100644
--- a/packages/shared-ui/src/navigation/PillNavigation.svelte
+++ b/packages/shared-ui/src/navigation/PillNavigation.svelte
@@ -757,23 +757,6 @@
 				</PillDropdown>
 			{/if}
 
-			<!-- Mana Button -->
-			{#if manaHref}
-				<a
-					href={manaHref}
-					class="pill glass-pill"
-					class:active={currentPath === manaHref}
-					title="Mana"
-				>
-					<svg class="pill-icon" viewBox="0 0 24 24" fill="currentColor">
-						<path
-							d="M12.3047 1C12.3392 1.04573 19.608 10.6706 19.6084 14.6953C19.6084 18.7293 16.3386 21.9998 12.3047 22C8.27061 22 5 18.7294 5 14.6953C5.00041 10.661 12.3047 1 12.3047 1ZM12.3047 7.3916C12.2811 7.42276 8.65234 12.2288 8.65234 14.2393C8.65241 16.2562 10.2877 17.8916 12.3047 17.8916C14.3217 17.8916 15.957 16.2562 15.957 14.2393C15.957 12.2301 12.3331 7.42917 12.3047 7.3916Z"
-						/>
-					</svg>
-					<span class="pill-label">Mana</span>
-				</a>
-			{/if}
-
 			<!-- Theme Toggle (only show when not using theme variants dropdown) -->
 			{#if showThemeToggle && onToggleTheme && !showThemeVariants}
 				<button
@@ -830,6 +813,19 @@
 							},
 							active: currentPath === settingsHref,
 						},
+						...(manaHref
+							? [
+									{
+										id: 'mana',
+										label: 'Mana',
+										icon: 'sparkle',
+										onClick: () => {
+											window.location.href = manaHref;
+										},
+										active: currentPath === manaHref,
+									},
+								]
+							: []),
 						...(feedbackHref
 							? [
 									{