diff --git a/static/addressbook.html b/static/addressbook.html
index 72e5a1e..cbe47e9 100644
--- a/static/addressbook.html
+++ b/static/addressbook.html
@@ -13,7 +13,7 @@
         nav a:hover { text-decoration: underline; }
         nav .active { color: var(--primary); font-weight: bold; }
         #user-menu-wrapper { position: relative; float: right; }
-        #user-menu-btn { cursor: pointer; font-size: 0.95em; color: var(--text-muted); }
+        #user-menu-btn { cursor: pointer; font-size: 1.3em; color: var(--text-muted); }
         #user-menu-btn:hover { color: var(--text); }
         #user-menu { display:none; position:absolute; right:0; top:1.8em; background:var(--surface); border:1px solid var(--border); border-radius:6px; min-width:220px; z-index:50; padding:0.4em 0; }
         .um-section-label { padding:0.4em 0.9em; font-size:0.8em; color:var(--text-dim); text-transform:uppercase; letter-spacing:0.05em; }
@@ -305,8 +305,7 @@
         <a href="/docs.html">Docs</a>
         <a href="/tokens.html" id="tokens-link" style="display:none">Tokens</a>
         <a href="/admin.html" id="admin-link" style="display:none">Admin</a>
-        <a href="#" id="logout-item" style="color:var(--text-muted)">Logout</a>
-        <span id="user-menu-wrapper"><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div><div class="um-divider"></div><div class="um-item" id="my-creds-item">&#128273; My Credentials</div><div class="um-item" id="show-tour-item">&#9432; Welcome Tour</div></div></span>
+        <span id="user-menu-wrapper"><a href="#" id="logout-item" style="color:var(--text-muted);text-decoration:none;margin-right:1em">Logout</a><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div><div class="um-divider"></div><div class="um-item" id="my-creds-item">&#128273; My Credentials</div><div class="um-item" id="show-tour-item">&#9432; Welcome Tour</div></div></span>
     </nav>
 
     <div id="global-error"></div>
diff --git a/static/admin.html b/static/admin.html
index f0ccc23..9240576 100644
--- a/static/admin.html
+++ b/static/admin.html
@@ -100,8 +100,7 @@
         <a href="/docs.html">Docs</a>
         <a href="/tokens.html">Tokens</a>
         <a href="/admin.html" class="active">Admin</a>
-        <a href="#" id="logout-item" style="color:var(--text-muted)">Logout</a>
-        <span id="user-menu-wrapper"><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
+        <span id="user-menu-wrapper"><a href="#" id="logout-item" style="color:var(--text-muted);text-decoration:none;margin-right:1em">Logout</a><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
     </nav>
 
     <h2>System Status</h2>
diff --git a/static/docs.html b/static/docs.html
index af80207..9baddf2 100644
--- a/static/docs.html
+++ b/static/docs.html
@@ -121,8 +121,7 @@
             <a href="/docs.html" class="active">Docs</a>
             <a href="/tokens.html" id="tokens-link" style="display:none">Tokens</a>
             <a href="/admin.html" id="admin-link" style="display:none">Admin</a>
-            <a href="#" id="logout-item" style="color:var(--text-muted)">Logout</a>
-            <span id="user-menu-wrapper"><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
+            <span id="user-menu-wrapper"><a href="#" id="logout-item" style="color:var(--text-muted);text-decoration:none;margin-right:1em">Logout</a><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
         </nav>
 
     <div class="docs-layout">
diff --git a/static/recordings.html b/static/recordings.html
index eab24b6..445777d 100644
--- a/static/recordings.html
+++ b/static/recordings.html
@@ -168,8 +168,7 @@
         <a href="/docs.html">Docs</a>
         <a href="/tokens.html" id="tokens-link" style="display:none">Tokens</a>
         <a href="/admin.html" id="admin-link" style="display:none">Admin</a>
-        <a href="#" id="logout-item" style="color:var(--text-muted)">Logout</a>
-        <span id="user-menu-wrapper"><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
+        <span id="user-menu-wrapper"><a href="#" id="logout-item" style="color:var(--text-muted);text-decoration:none;margin-right:1em">Logout</a><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
     </nav>
 
     <strong>Recordings</strong>
diff --git a/static/reports.html b/static/reports.html
index 1212833..eff4b21 100644
--- a/static/reports.html
+++ b/static/reports.html
@@ -176,8 +176,7 @@
         <a href="/docs.html">Docs</a>
         <a href="/tokens.html" id="tokens-link" style="display:none">Tokens</a>
         <a href="/admin.html" id="admin-link" style="display:none">Admin</a>
-        <a href="#" id="logout-item" style="color:var(--text-muted)">Logout</a>
-        <span id="user-menu-wrapper"><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
+        <span id="user-menu-wrapper"><a href="#" id="logout-item" style="color:var(--text-muted);text-decoration:none;margin-right:1em">Logout</a><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
     </nav>
 
     <strong>Reports</strong>
diff --git a/static/sessions.html b/static/sessions.html
index 50697d2..fcbc62c 100644
--- a/static/sessions.html
+++ b/static/sessions.html
@@ -205,8 +205,7 @@
         <a href="/docs.html">Docs</a>
         <a href="/tokens.html" id="tokens-link" style="display:none">Tokens</a>
         <a href="/admin.html" id="admin-link" style="display:none">Admin</a>
-        <a href="#" id="logout-item" style="color:var(--text-muted)">Logout</a>
-        <span id="user-menu-wrapper"><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
+        <span id="user-menu-wrapper"><a href="#" id="logout-item" style="color:var(--text-muted);text-decoration:none;margin-right:1em">Logout</a><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
     </nav>
 
     <div id="adhoc-notice" style="display:none;background:var(--surface);padding:1em 1.5em;border-radius:6px;max-width:400px;margin:1.5em 0;color:var(--text-muted);">
diff --git a/static/tokens.html b/static/tokens.html
index 80ebfa2..e1b6d48 100644
--- a/static/tokens.html
+++ b/static/tokens.html
@@ -90,8 +90,7 @@
         <a href="/docs.html">Docs</a>
         <a href="/tokens.html" class="active">Tokens</a>
         <a href="/admin.html" id="admin-link" style="display:none">Admin</a>
-        <a href="#" id="logout-item" style="color:var(--text-muted)">Logout</a>
-        <span id="user-menu-wrapper"><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
+        <span id="user-menu-wrapper"><a href="#" id="logout-item" style="color:var(--text-muted);text-decoration:none;margin-right:1em">Logout</a><span id="user-menu-btn" title="Preferences">&#9881; Settings</span><div id="user-menu"><div class="um-section-label">Theme</div><div id="um-theme-list"></div></div></span>
     </nav>
 
     <div id="loading">Loading...</div>