diff --git a/web/src/App.svelte b/web/src/App.svelte
index 301a157..ad57ff1 100644
--- a/web/src/App.svelte
+++ b/web/src/App.svelte
@@ -587,21 +587,23 @@
 {:else}
   <div class="app-shell">
     <header class="topbar">
-      <div class="brand">task-master</div>
-      <nav class="nav">
-        <button class:active={topTab === 'dashboard'} onclick={openDashboard}>Dashboard</button>
-        <button class:active={topTab === 'projects'} onclick={openProjects}>Projekte</button>
-        {#if user.isAdmin}
-          <button class:active={topTab === 'users'} onclick={openAdmin}>User</button>
-        {/if}
-        <button class:active={topTab === 'settings'} onclick={openGlobalSettings}>Settings</button>
-      </nav>
-      <div class="row">
+      <div class="topbar-start">
+        <button type="button" class="brand" onclick={openDashboard}>task-master</button>
+        <nav class="nav">
+          <button type="button" class:active={topTab === 'dashboard'} onclick={openDashboard}>Dashboard</button>
+          <button type="button" class:active={topTab === 'projects'} onclick={openProjects}>Projekte</button>
+          {#if user.isAdmin}
+            <button type="button" class:active={topTab === 'users'} onclick={openAdmin}>User</button>
+          {/if}
+          <button type="button" class:active={topTab === 'settings'} onclick={openGlobalSettings}>Settings</button>
+        </nav>
+      </div>
+      <div class="topbar-meta row">
         {#if timer}
           <span class="muted">⏱ {timer.ticketId.slice(0, 8)}…</span>
         {/if}
         <span class="muted">{user.username}{user.isAdmin ? ' (admin)' : ''}</span>
-        <button onclick={doLogout}>Logout</button>
+        <button type="button" onclick={doLogout}>Logout</button>
       </div>
     </header>
 
diff --git a/web/src/app.css b/web/src/app.css
index b8ef2f7..10c1433 100644
--- a/web/src/app.css
+++ b/web/src/app.css
@@ -30,24 +30,66 @@ button, input, select, textarea {
 }
 button {
   cursor: pointer;
-  border: 1px solid var(--line);
-  background: var(--panel-2);
-  border-radius: 6px;
-  padding: 0.4rem 0.75rem;
-  color: var(--ink);
-}
-button:hover { border-color: #3d4a58; }
-button.primary {
-  background: var(--accent);
-  color: var(--accent-ink);
-  border-color: var(--accent);
+  border: none;
+  border-radius: 0;
+  background: transparent;
+  padding: 0.45rem 0.85rem;
+  color: var(--muted);
   font-weight: 600;
 }
-button.primary:hover { filter: brightness(1.08); }
+button:hover {
+  border: none;
+  color: var(--ink);
+  background: color-mix(in srgb, var(--panel-2) 70%, transparent);
+}
+button:disabled {
+  opacity: 0.45;
+  cursor: not-allowed;
+}
+button:disabled:hover {
+  color: var(--muted);
+  background: transparent;
+}
+button.primary {
+  border: none;
+  color: var(--ink);
+  font-weight: 600;
+  background: linear-gradient(
+    to right,
+    color-mix(in srgb, var(--accent) 65%, transparent) 0%,
+    color-mix(in srgb, var(--accent) 22%, transparent) 55%,
+    color-mix(in srgb, var(--accent) 8%, transparent) 100%
+  );
+}
+button.primary:hover {
+  border: none;
+  color: var(--ink);
+  background: linear-gradient(
+    to right,
+    color-mix(in srgb, var(--accent) 80%, transparent) 0%,
+    color-mix(in srgb, var(--accent) 32%, transparent) 55%,
+    color-mix(in srgb, var(--accent) 12%, transparent) 100%
+  );
+}
 button.danger {
+  border: none;
   color: var(--danger);
-  border-color: #5a3030;
-  background: #241818;
+  background: linear-gradient(
+    to right,
+    color-mix(in srgb, var(--danger) 35%, transparent) 0%,
+    color-mix(in srgb, var(--danger) 10%, transparent) 55%,
+    transparent 100%
+  );
+}
+button.danger:hover {
+  border: none;
+  color: #f0a0a0;
+  background: linear-gradient(
+    to right,
+    color-mix(in srgb, var(--danger) 50%, transparent) 0%,
+    color-mix(in srgb, var(--danger) 16%, transparent) 55%,
+    transparent 100%
+  );
 }
 input, select, textarea {
   width: 100%;
@@ -75,30 +117,86 @@ code {
   padding: 0;
 }
 .topbar {
+  --topbar-height: 3.25rem;
   position: sticky;
   top: 0;
   z-index: 100;
   display: flex;
-  gap: 1rem;
-  align-items: center;
+  align-items: stretch;
   justify-content: space-between;
   width: 100%;
+  height: var(--topbar-height);
   margin: 0 0 1.25rem;
-  padding: 0.85rem 1.25rem;
+  /* Same inset as .app-body — nav tabs start on the sidebar’s left edge. */
+  padding: 0 1.25rem;
   border-bottom: 1px solid var(--line);
   background: color-mix(in srgb, var(--bg) 92%, transparent);
   backdrop-filter: blur(8px);
 }
+.topbar-start {
+  display: flex;
+  align-items: stretch;
+  min-width: 0;
+}
 .brand {
+  display: inline-flex;
+  align-items: center;
+  flex: 0 0 auto;
+  height: 100%;
+  margin: 0;
+  padding: 0 1.1rem 0 0;
+  border: none;
+  border-radius: 0;
+  background: transparent;
   font-weight: 700;
   letter-spacing: 0.04em;
   color: #c9d6e0;
+  text-align: left;
+}
+.brand:hover {
+  border: none;
+  color: #f0f4f8;
+  background: transparent;
+}
+.nav {
+  display: flex;
+  align-items: stretch;
+  gap: 0;
+  height: 100%;
+  flex-wrap: nowrap;
+}
+.nav button {
+  height: 100%;
+  margin: 0;
+  padding: 0 1.15rem;
+  border: none;
+  border-radius: 0;
+  background: transparent;
+  color: var(--muted);
+  font-weight: 600;
+  letter-spacing: 0.02em;
+}
+.nav button:hover {
+  border: none;
+  color: var(--ink);
+  background: color-mix(in srgb, var(--panel-2) 70%, transparent);
 }
-.nav { display: flex; gap: 0.5rem; flex-wrap: wrap; }
 .nav button.active {
-  background: var(--accent);
-  color: var(--accent-ink);
-  border-color: var(--accent);
+  border: none;
+  color: var(--ink);
+  background: linear-gradient(
+    to top,
+    color-mix(in srgb, var(--accent) 65%, transparent) 0%,
+    color-mix(in srgb, var(--accent) 18%, transparent) 42%,
+    transparent 100%
+  );
+}
+.topbar-meta {
+  display: flex;
+  align-items: center;
+  align-self: center;
+  flex: 0 0 auto;
+  padding-left: 1rem;
 }
 .app-body {
   display: grid;
@@ -150,15 +248,16 @@ code {
   width: 100%;
   text-align: left;
   background: transparent;
-  border-color: transparent;
-  padding: 0.3rem 0.5rem;
+  border: none;
+  border-radius: 0;
+  padding: 0.45rem 0.65rem;
   color: var(--muted);
   font-weight: 600;
   font-size: 0.86rem;
 }
 .sidebar-group:hover {
-  background: var(--panel-2);
-  border-color: var(--line);
+  border: none;
+  background: color-mix(in srgb, var(--panel-2) 70%, transparent);
   color: var(--ink);
 }
 .sidebar-twist {
@@ -198,17 +297,27 @@ code {
   width: 100%;
   text-align: left;
   background: transparent;
-  border-color: transparent;
+  border: none;
+  border-radius: 0;
+  padding: 0.45rem 0.65rem;
+  color: var(--muted);
+  font-weight: 600;
 }
 .sidebar-item:hover {
-  background: var(--panel-2);
-  border-color: var(--line);
+  border: none;
+  color: var(--ink);
+  background: color-mix(in srgb, var(--panel-2) 70%, transparent);
 }
 .sidebar-item.active {
-  background: var(--accent);
-  color: var(--accent-ink);
-  border-color: var(--accent);
+  border: none;
+  color: var(--ink);
   font-weight: 600;
+  background: linear-gradient(
+    to right,
+    color-mix(in srgb, var(--accent) 65%, transparent) 0%,
+    color-mix(in srgb, var(--accent) 18%, transparent) 42%,
+    transparent 100%
+  );
 }
 .sidebar-create {
   flex: 0 0 auto;
@@ -242,17 +351,25 @@ code {
 .row { display: flex; gap: 0.5rem; align-items: center; flex-wrap: wrap; }
 .stack { display: grid; gap: 0.6rem; }
 .ticket {
-  border: 1px solid var(--line);
-  border-radius: 8px;
-  padding: 0.65rem 0.75rem;
-  background: var(--panel-2);
+  border: none;
+  border-radius: 0;
+  padding: 0.65rem 0.85rem;
+  background: color-mix(in srgb, var(--panel-2) 55%, transparent);
   cursor: pointer;
   text-align: left;
   width: 100%;
+  color: var(--ink);
+  font-weight: 500;
 }
 .ticket:hover {
-  border-color: var(--accent);
-  background: #222b34;
+  border: none;
+  color: var(--ink);
+  background: linear-gradient(
+    to right,
+    color-mix(in srgb, var(--accent) 35%, transparent) 0%,
+    color-mix(in srgb, var(--accent) 10%, transparent) 45%,
+    color-mix(in srgb, var(--panel-2) 70%, transparent) 100%
+  );
 }
 .badge {
   display: inline-block;