diff --git a/media_server/static/css/styles.css b/media_server/static/css/styles.css
index a66e73a..ed46777 100644
--- a/media_server/static/css/styles.css
+++ b/media_server/static/css/styles.css
@@ -182,51 +182,105 @@ h1 {
     background: var(--accent);
 }
 
-.theme-toggle {
-    background: transparent;
-    border: none;
-    padding: 0.3rem;
-    cursor: pointer;
+.header-toolbar {
     display: flex;
     align-items: center;
-    justify-content: center;
-    transition: opacity 0.3s;
-    width: 32px;
-    height: 32px;
-    opacity: 0.7;
+    gap: 2px;
+    background: var(--bg-secondary);
+    border: 1px solid var(--border);
+    border-radius: 8px;
+    padding: 3px 4px;
 }
 
-.theme-toggle:hover {
-    opacity: 1;
+.header-toolbar-sep {
+    width: 1px;
+    height: 18px;
+    background: var(--border);
+    margin: 0 3px;
+    flex-shrink: 0;
 }
 
-.theme-toggle svg {
+.header-btn {
+    background: transparent;
+    border: none;
+    padding: 4px 6px;
+    border-radius: 5px;
+    cursor: pointer;
+    color: var(--text-secondary);
+    transition: color 0.2s, background 0.2s;
+    display: inline-flex;
+    align-items: center;
+    line-height: 1;
+}
+
+.header-btn:hover {
+    color: var(--text-primary);
+    background: var(--bg-tertiary);
+}
+
+.header-btn svg {
     width: 16px;
     height: 16px;
     fill: currentColor;
 }
 
+.header-btn-logout:hover {
+    color: var(--error);
+}
+
+.header-locale {
+    background: transparent;
+    border: none;
+    color: var(--text-secondary);
+    font-size: 0.75rem;
+    font-weight: 600;
+    padding: 4px 4px 4px 8px;
+    border-radius: 5px;
+    cursor: pointer;
+    transition: color 0.2s, background 0.2s;
+}
+
+.header-locale:hover {
+    color: var(--text-primary);
+    background: var(--bg-tertiary);
+}
+
+.header-locale:focus {
+    outline: none;
+}
+
+.header-locale option {
+    background: var(--bg-secondary);
+    color: var(--text-primary);
+}
+
 /* Header Quick Links */
 .header-links {
     display: flex;
     align-items: center;
-    gap: 0.125rem;
+    gap: 2px;
+}
+
+.header-links:not(:empty) {
+    padding-right: 3px;
+    margin-right: 3px;
+    border-right: 1px solid var(--border);
 }
 
 .header-link {
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 32px;
-    height: 32px;
-    color: var(--text-primary);
-    opacity: 0.7;
-    transition: opacity 0.2s;
+    padding: 4px 6px;
+    border-radius: 5px;
+    color: var(--text-secondary);
+    transition: color 0.2s, background 0.2s;
     text-decoration: none;
 }
 
 .header-link:hover {
-    opacity: 1;
+    color: var(--text-primary);
+    background: var(--bg-tertiary);
 }
 
 .header-link svg {
@@ -271,25 +325,9 @@ h1 {
     position: relative;
 }
 
-.accent-picker-btn {
-    background: transparent;
-    border: none;
-    cursor: pointer;
-    padding: 4px;
-    display: flex;
-    align-items: center;
-    opacity: 0.8;
-    transition: opacity 0.2s;
-}
-
-.accent-picker-btn:hover {
-    opacity: 1;
-    transform: none;
-}
-
 .accent-dot {
-    width: 16px;
-    height: 16px;
+    width: 14px;
+    height: 14px;
     border-radius: 50%;
     background: var(--accent);
     border: 2px solid var(--border);
@@ -376,31 +414,6 @@ h1 {
     pointer-events: none;
 }
 
-#locale-select {
-    background: var(--bg-tertiary);
-    border: 1px solid var(--border);
-    color: var(--text-primary);
-    border-radius: 6px;
-    padding: 4px 8px;
-    cursor: pointer;
-    font-size: 12px;
-    font-weight: 500;
-    transition: all 0.3s ease;
-}
-
-#locale-select:hover {
-    border-color: var(--accent);
-}
-
-#locale-select:focus {
-    outline: none;
-    border-color: var(--accent);
-}
-
-#locale-select option {
-    background: var(--bg-secondary);
-    color: var(--text-primary);
-}
 
 /* Tab Bar */
 .tab-bar {
@@ -1922,26 +1935,6 @@ dialog::backdrop {
     display: block;
 }
 
-.clear-token-btn {
-    width: auto;
-    height: auto;
-    padding: 4px 10px;
-    border-radius: 6px;
-    font-size: 12px;
-    font-weight: 500;
-    background: var(--bg-tertiary);
-    color: var(--text-secondary);
-    border: 1px solid var(--border);
-    cursor: pointer;
-    opacity: 0.7;
-}
-
-.clear-token-btn:hover {
-    opacity: 1;
-    background: var(--error);
-    color: var(--text-primary);
-    border-color: var(--error);
-}
 
 /* Mini Player (Sticky) */
 .mini-player {
diff --git a/media_server/static/index.html b/media_server/static/index.html
index d89f53a..580ecf6 100644
--- a/media_server/static/index.html
+++ b/media_server/static/index.html
@@ -71,15 +71,15 @@
                 <span class="status-dot" id="status-dot" aria-live="polite"></span>
                 <span class="version-label" id="version-label"></span>
             </div>
-            <div style="display: flex; align-items: center; gap: 0.5rem;">
+            <div class="header-toolbar">
                 <div id="headerLinks" class="header-links"></div>
                 <div class="accent-picker">
-                    <button class="accent-picker-btn" onclick="toggleAccentPicker()" title="Accent color">
+                    <button class="header-btn" onclick="toggleAccentPicker()" title="Accent color">
                         <span class="accent-dot" id="accentDot"></span>
                     </button>
                     <div class="accent-picker-dropdown" id="accentDropdown"></div>
                 </div>
-                <button class="theme-toggle" onclick="toggleTheme()" data-i18n-title="player.theme" title="Toggle theme" id="theme-toggle">
+                <button class="header-btn" onclick="toggleTheme()" data-i18n-title="player.theme" title="Toggle theme" id="theme-toggle">
                     <svg id="theme-icon-sun" viewBox="0 0 24 24" style="display: none;">
                         <path d="M12 7c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5-2.24-5-5-5zM2 13h2c.55 0 1-.45 1-1s-.45-1-1-1H2c-.55 0-1 .45-1 1s.45 1 1 1zm18 0h2c.55 0 1-.45 1-1s-.45-1-1-1h-2c-.55 0-1 .45-1 1s.45 1 1 1zM11 2v2c0 .55.45 1 1 1s1-.45 1-1V2c0-.55-.45-1-1-1s-1 .45-1 1zm0 18v2c0 .55.45 1 1 1s1-.45 1-1v-2c0-.55-.45-1-1-1s-1 .45-1 1zM5.99 4.58c-.39-.39-1.03-.39-1.41 0-.39.39-.39 1.03 0 1.41l1.06 1.06c.39.39 1.03.39 1.41 0s.39-1.03 0-1.41L5.99 4.58zm12.37 12.37c-.39-.39-1.03-.39-1.41 0-.39.39-.39 1.03 0 1.41l1.06 1.06c.39.39 1.03.39 1.41 0 .39-.39.39-1.03 0-1.41l-1.06-1.06zm1.06-10.96c.39-.39.39-1.03 0-1.41-.39-.39-1.03-.39-1.41 0l-1.06 1.06c-.39.39-.39 1.03 0 1.41s1.03.39 1.41 0l1.06-1.06zM7.05 18.36c.39-.39.39-1.03 0-1.41-.39-.39-1.03-.39-1.41 0l-1.06 1.06c-.39.39-.39 1.03 0 1.41s1.03.39 1.41 0l1.06-1.06z"/>
                     </svg>
@@ -87,11 +87,14 @@
                         <path d="M9 2c-1.05 0-2.05.16-3 .46 4.06 1.27 7 5.06 7 9.54 0 4.48-2.94 8.27-7 9.54.95.3 1.95.46 3 .46 5.52 0 10-4.48 10-10S14.52 2 9 2z"/>
                     </svg>
                 </button>
-                <select id="locale-select" onchange="changeLocale()" title="Change language">
-                    <option value="en">English</option>
-                    <option value="ru">Русский</option>
+                <select id="locale-select" class="header-locale" onchange="changeLocale()" title="Change language">
+                    <option value="en">EN</option>
+                    <option value="ru">RU</option>
                 </select>
-                <button class="clear-token-btn" onclick="clearToken()" data-i18n-title="auth.logout.title" data-i18n="auth.logout" title="Clear saved token">Logout</button>
+                <span class="header-toolbar-sep"></span>
+                <button class="header-btn header-btn-logout" onclick="clearToken()" data-i18n-title="auth.logout.title" title="Clear saved token">
+                    <svg viewBox="0 0 24 24"><path d="M17 7l-1.41 1.41L18.17 11H8v2h10.17l-2.58 2.58L17 17l5-5zM4 5h8V3H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h8v-2H4V5z"/></svg>
+                </button>
             </div>
         </header>