diff --git a/src/components/Header.svelte b/src/components/Header.svelte
index 60a40a211..279e4fdcd 100644
--- a/src/components/Header.svelte
+++ b/src/components/Header.svelte
@@ -1,25 +1,21 @@
 <script lang="ts">
-  import type { Config } from "@bindings/config/Config";
   import type { Snippet } from "svelte";
 
   import * as router from "@app/lib/router";
-  import { authorForNodeId } from "@app/lib/utils";
   import { nodeRunning } from "@app/lib/events";
 
-  import Border from "./Border.svelte";
+  import Avatar from "./Avatar.svelte";
   import Icon from "./Icon.svelte";
   import NakedButton from "./NakedButton.svelte";
-  import NodeId from "./NodeId.svelte";
-  import Popover from "./Popover.svelte";
 
   const activeRouteStore = router.activeRouteStore;
 
   interface Props {
-    config: Config;
+    publicKey: string;
     center?: Snippet;
   }
 
-  const { center, config }: Props = $props();
+  const { center, publicKey }: Props = $props();
 </script>
 
 <style>
@@ -63,7 +59,7 @@
             void router.push({ resource: "home" });
           }}
           stylePadding="0 4px">
-          <Icon name="home" />
+          <Avatar {publicKey} />
         </NakedButton>
         <NakedButton
           variant="ghost"
@@ -86,48 +82,17 @@
       {@render center?.()}
 
       <div class="global-flex">
-        <Popover
-          popoverPadding="0"
-          popoverPositionTop="2.5rem"
-          popoverPositionRight="0">
-          {#snippet toggle(onclick)}
-            <NakedButton variant="ghost" {onclick}>
-              {#if $nodeRunning}
-                <Icon name="online" />
-                Online
-              {:else}
-                <Icon name="offline" />
-                Offline
-              {/if}
-            </NakedButton>
-          {/snippet}
-          {#snippet popover()}
-            <Border
-              variant="ghost"
-              stylePadding="1rem"
-              styleMinWidth="20rem"
-              styleAlignItems="flex-start"
-              styleFlexDirection="column">
-              <div class="txt-small global-flex">
-                Authenticated as:
-                <NodeId
-                  {...authorForNodeId({
-                    did: config.publicKey,
-                    alias: config.alias,
-                  })} />
-              </div>
-              <div class="txt-small txt-missing">
-                {#if $nodeRunning}
-                  Your node is up and running, your changes will be synced
-                  automatically.
-                {:else}
-                  Your node is stopped, to sync changes with the network start
-                  your node.
-                {/if}
-              </div>
-            </Border>
-          {/snippet}
-        </Popover>
+        <div
+          class="global-flex txt-semibold txt-small"
+          style:margin-right="0.25rem">
+          {#if $nodeRunning}
+            <Icon name="online" />
+            Online
+          {:else}
+            <Icon name="offline" />
+            Offline
+          {/if}
+        </div>
         <NakedButton
           variant="ghost"
           stylePadding="0 4px"
diff --git a/src/views/home/Inbox.svelte b/src/views/home/Inbox.svelte
index af4a98780..e848e4721 100644
--- a/src/views/home/Inbox.svelte
+++ b/src/views/home/Inbox.svelte
@@ -172,7 +172,7 @@
   }}
   hideSidebar
   styleSecondColumnOverflow="visible"
-  {config}>
+  publicKey={config.publicKey}>
   {#snippet headerCenter()}
     <CopyableId id={config.publicKey} />
   {/snippet}
diff --git a/src/views/home/Repos.svelte b/src/views/home/Repos.svelte
index a01bc8e0f..06e3667d5 100644
--- a/src/views/home/Repos.svelte
+++ b/src/views/home/Repos.svelte
@@ -106,7 +106,10 @@
   }
 </style>
 
-<Layout hideSidebar styleSecondColumnOverflow="visible" {config}>
+<Layout
+  hideSidebar
+  styleSecondColumnOverflow="visible"
+  publicKey={config.publicKey}>
   {#snippet headerCenter()}
     <CopyableId id={config.publicKey} />
   {/snippet}
diff --git a/src/views/repo/CreateIssue.svelte b/src/views/repo/CreateIssue.svelte
index 6a5e29d11..fc2ea23e7 100644
--- a/src/views/repo/CreateIssue.svelte
+++ b/src/views/repo/CreateIssue.svelte
@@ -115,7 +115,7 @@
   }
 </style>
 
-<Layout {config}>
+<Layout publicKey={config.publicKey}>
   {#snippet sidebar()}
     <Sidebar activeTab="issues" rid={repo.rid} />
   {/snippet}
diff --git a/src/views/repo/Issue.svelte b/src/views/repo/Issue.svelte
index fcef44e08..bf92db67d 100644
--- a/src/views/repo/Issue.svelte
+++ b/src/views/repo/Issue.svelte
@@ -314,7 +314,7 @@
   }
 </style>
 
-<Layout {config}>
+<Layout publicKey={config.publicKey}>
   {#snippet headerCenter()}
     <CopyableId id={issue.id} />
   {/snippet}
diff --git a/src/views/repo/Issues.svelte b/src/views/repo/Issues.svelte
index b44bcb8a0..8d5d7df46 100644
--- a/src/views/repo/Issues.svelte
+++ b/src/views/repo/Issues.svelte
@@ -84,7 +84,10 @@
   }
 </style>
 
-<Layout hideSidebar styleSecondColumnOverflow="visible" {config}>
+<Layout
+  hideSidebar
+  styleSecondColumnOverflow="visible"
+  publicKey={config.publicKey}>
   {#snippet headerCenter()}
     <CopyableId id={repo.rid} />
   {/snippet}
diff --git a/src/views/repo/Layout.svelte b/src/views/repo/Layout.svelte
index 1aec0c13d..f3a942c8f 100644
--- a/src/views/repo/Layout.svelte
+++ b/src/views/repo/Layout.svelte
@@ -24,7 +24,6 @@
 </script>
 
 <script lang="ts">
-  import type { Config } from "@bindings/config/Config";
   import type { Snippet } from "svelte";
 
   import { onMount } from "svelte";
@@ -33,7 +32,7 @@
 
   interface Props {
     children: Snippet;
-    config: Config;
+    publicKey: string;
     headerCenter?: Snippet;
     secondColumn: Snippet;
     sidebar?: Snippet;
@@ -45,7 +44,7 @@
 
   const {
     children,
-    config,
+    publicKey,
     headerCenter = undefined,
     secondColumn,
     sidebar = undefined,
@@ -133,7 +132,7 @@
 
 <div class="layout">
   <div class="header">
-    <Header {config} center={headerCenter}></Header>
+    <Header {publicKey} center={headerCenter}></Header>
   </div>
 
   {#if sidebar}
diff --git a/src/views/repo/Patch.svelte b/src/views/repo/Patch.svelte
index 826125d5f..319b81b78 100644
--- a/src/views/repo/Patch.svelte
+++ b/src/views/repo/Patch.svelte
@@ -356,7 +356,7 @@
   </div>
 {/snippet}
 
-<Layout loadMoreSecondColumn={loadMoreTeasers} {config}>
+<Layout loadMoreSecondColumn={loadMoreTeasers} publicKey={config.publicKey}>
   {#snippet headerCenter()}
     <CopyableId id={patch.id} />
   {/snippet}
diff --git a/src/views/repo/Patches.svelte b/src/views/repo/Patches.svelte
index 957e7504f..cb549b9c6 100644
--- a/src/views/repo/Patches.svelte
+++ b/src/views/repo/Patches.svelte
@@ -120,7 +120,7 @@
   {loadMoreContent}
   hideSidebar
   styleSecondColumnOverflow="visible"
-  {config}>
+  publicKey={config.publicKey}>
   {#snippet headerCenter()}
     <CopyableId id={repo.rid} />
   {/snippet}