diff --git a/src/lib/components/ProfilePicture.svelte b/src/lib/components/ProfilePicture.svelte
index 3c8b3c5..6a32420 100644
--- a/src/lib/components/ProfilePicture.svelte
+++ b/src/lib/components/ProfilePicture.svelte
@@ -3,7 +3,7 @@
 	import { AvatarBeam } from 'svelte-boring-avatars';
 
 	interface Props {
-		identity: BlahIdentityDescription | undefined;
+		identity: BlahIdentityDescription | null;
 		size?: number;
 	}
 
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 4f2a158..4faa061 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -22,9 +22,9 @@
 	});
 
 	let isSettings = $derived($page.route.id?.startsWith('/(app)/settings') ?? true);
-	let mainVisible =
-		$derived(!!$page.params.chatId ||
-		(isSettings && !$page.route.id?.startsWith('/(app)/settings/_mobile_empty')));
+	let mainVisible = $derived(
+		!!$page.params.chatId || (isSettings && $page.route.id !== '/(app)/settings')
+	);
 </script>
 
 <div
@@ -32,7 +32,7 @@
 	data-weblah-main-visible={mainVisible ? 'true' : undefined}
 >
 	<aside
-		class="relative h-[100dvh] min-h-0 overflow-hidden border-ss-primary bg-sb-primary shadow-lg [view-transition-name:chat-list] after:pointer-events-none after:absolute after:inset-0 after:size-full after:bg-transparent group-data-weblah-main-visible:after:bg-black/30 sm:w-1/3 sm:border-e sm:after:hidden lg:w-1/4"
+		class="border-ss-primary bg-sb-primary relative h-[100dvh] min-h-0 overflow-hidden shadow-lg [view-transition-name:chat-list] after:pointer-events-none after:absolute after:inset-0 after:size-full after:bg-transparent group-data-weblah-main-visible:after:bg-black/30 sm:w-1/3 sm:border-e sm:after:hidden lg:w-1/4"
 	>
 		<ChatList />
 		{#if isSettings}
@@ -41,7 +41,7 @@
 	</aside>
 	{#if mainVisible}
 		<main
-			class="absolute inset-0 w-full bg-sb-secondary shadow-lg [view-transition-name:main] sm:relative sm:flex-1 sm:shadow-none"
+			class="bg-sb-secondary absolute inset-0 w-full shadow-lg [view-transition-name:main] sm:relative sm:flex-1 sm:shadow-none"
 		>
 			{@render children?.()}
 		</main>
diff --git a/src/routes/(app)/ChatListHeader.svelte b/src/routes/(app)/ChatListHeader.svelte
index 1c13edd..01b70c5 100644
--- a/src/routes/(app)/ChatListHeader.svelte
+++ b/src/routes/(app)/ChatListHeader.svelte
@@ -3,7 +3,7 @@
 	import InputFrame from '$lib/components/InputFrame.svelte';
 	import { Icon, MagnifyingGlass, PencilSquare, XCircle } from 'svelte-hero-icons';
 	import { tw } from '$lib/tw';
-	import CurrentAccountPicture from './CurrentAccountPicture.svelte';
+	import CurrentAccountIndicator from './CurrentAccountIndicator.svelte';
 
 	interface Props {
 		searchQuery?: string;
@@ -20,15 +20,12 @@
 </script>
 
 <header class="border-ss-secondary flex items-center justify-stretch gap-2 border-b p-2 shadow-xs">
-	<a
+	<CurrentAccountIndicator
 		class={tw(
 			'transition-[opacity,transform] duration-200',
 			isSearchFocused && '-translate-x-full opacity-0'
 		)}
-		href="/settings"
-	>
-		<CurrentAccountPicture />
-	</a>
+	/>
 	<InputFrame
 		class={tw('z-10 h-8 flex-1 transition-all duration-200', isSearchFocused && '-mx-10')}
 	>
diff --git a/src/routes/(app)/CurrentAccountIndicator.svelte b/src/routes/(app)/CurrentAccountIndicator.svelte
new file mode 100644
index 0000000..7bdda39
--- /dev/null
+++ b/src/routes/(app)/CurrentAccountIndicator.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+	import manager from '$lib/accounts/manager.svelte';
+	import ProfilePicture from '$lib/components/ProfilePicture.svelte';
+	import { tw } from '$lib/tw';
+	import type { HTMLAttributes } from 'svelte/elements';
+
+	interface Props extends HTMLAttributes<HTMLAnchorElement> {
+		class?: string;
+	}
+
+	const { class: classNames, ...rest }: Props = $props();
+
+	const currentAccount = $derived(manager.currentAccount);
+	const href = $derived(currentAccount ? '/settings/account/profile' : '/settings/account/add');
+</script>
+
+<a {href} class={tw('cursor-default', classNames)} {...rest}>
+	<ProfilePicture identity={currentAccount} size={32} />
+</a>
diff --git a/src/routes/(app)/CurrentAccountPicture.svelte b/src/routes/(app)/CurrentAccountPicture.svelte
deleted file mode 100644
index ec544d5..0000000
--- a/src/routes/(app)/CurrentAccountPicture.svelte
+++ /dev/null
@@ -1,30 +0,0 @@
-<script lang="ts">
-	import {
-		currentAccountStore,
-		openAccountStore,
-		type AccountStore
-	} from '$lib/accounts/accountStore';
-	import ProfilePicture from '$lib/components/ProfilePicture.svelte';
-	import { onMount } from 'svelte';
-
-	interface Props {
-		size?: number;
-	}
-
-	let { size = 32 }: Props = $props();
-
-	let accountStore: AccountStore | undefined = $state();
-
-	onMount(() => {
-		openAccountStore().then((store) => {
-			accountStore = store;
-		});
-	});
-</script>
-
-{#if accountStore && $accountStore}
-	{@const currentAccount = $accountStore.find((account) => account.id_key === $currentAccountStore)}
-	<ProfilePicture identity={currentAccount} {size} />
-{:else}
-	<ProfilePicture identity={undefined} {size} />
-{/if}
diff --git a/src/routes/(app)/settings/SettingsList.svelte b/src/routes/(app)/settings/SettingsList.svelte
index 2414b70..85f9da9 100644
--- a/src/routes/(app)/settings/SettingsList.svelte
+++ b/src/routes/(app)/settings/SettingsList.svelte
@@ -35,7 +35,7 @@
 		<SettingsAccountSections />
 
 		<GroupedListSection>
-			<SettingsListItem icon={User} route="">My Profile</SettingsListItem>
+			<SettingsListItem icon={User} route="/account/profile">My Profile</SettingsListItem>
 			<GroupedListItem icon={DevicePhoneMobile}>Devices</GroupedListItem>
 		</GroupedListSection>
 
diff --git a/src/routes/(app)/settings/SettingsListItem.svelte b/src/routes/(app)/settings/SettingsListItem.svelte
index fb308cb..4c5405a 100644
--- a/src/routes/(app)/settings/SettingsListItem.svelte
+++ b/src/routes/(app)/settings/SettingsListItem.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { page } from '$app/stores';
+	import { page } from '$app/state';
 	import { GroupedListItem } from '$lib/components/GroupedList';
 	import { type IconSource } from 'svelte-hero-icons';
 
@@ -11,9 +11,11 @@
 
 	let { icon = undefined, route = undefined, children }: Props = $props();
 
-	let selected = $derived(route
-		? $page.route.id?.startsWith(`/(app)/settings${route}`)
-		: $page.route.id === '/(app)/settings');
+	let selected = $derived(
+		route
+			? page.route.id?.startsWith(`/(app)/settings${route}`)
+			: page.route.id === '/(app)/settings'
+	);
 	let href = $derived(`/settings${route}`);
 </script>
 
diff --git a/src/routes/(app)/settings/account/new/+page.svelte b/src/routes/(app)/settings/account/new/+page.svelte
index 924e160..812d3e9 100644
--- a/src/routes/(app)/settings/account/new/+page.svelte
+++ b/src/routes/(app)/settings/account/new/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { page } from '$app/state';
 	import { goto } from '$app/navigation';
-	import accountsManager from '$lib/accounts/manager.svelte';
+	import manager from '$lib/accounts/manager.svelte';
 	import Button from '$lib/components/Button.svelte';
 	import {
 		GroupedListContainer,
@@ -47,8 +47,8 @@
 		isBusy = true;
 
 		try {
-			const idKeyId = await accountsManager.createAccount(profile, password);
-			accountsManager.currentAccountId = idKeyId;
+			const idKeyId = await manager.createAccount(profile, password);
+			manager.currentAccountId = idKeyId;
 			goto('/settings');
 		} catch (error) {
 			console.error(error);
@@ -69,7 +69,7 @@
 <GroupedListContainer>
 	<GroupedListSection>
 		<GroupedListContent class="flex items-center">
-			<ProfilePicture size={64} identity={undefined} />
+			<ProfilePicture size={64} identity={null} />
 			<input
 				type="text"
 				bind:value={name}
diff --git a/src/routes/(app)/settings/+page.svelte b/src/routes/(app)/settings/account/profile/+page.svelte
similarity index 100%
rename from src/routes/(app)/settings/+page.svelte
rename to src/routes/(app)/settings/account/profile/+page.svelte