diff --git a/public/css/aurora.css b/public/css/aurora.css
index b291c081..647b86ee 100644
--- a/public/css/aurora.css
+++ b/public/css/aurora.css
@@ -215,7 +215,7 @@ a{color:inherit}
 
 /* sidebar (production: .sidebar, .nav-item, .nav-section-label, .nav-badge) */
 .sidebar{grid-area:side; border-right:1px solid var(--line); padding:16px 12px 24px; overflow-y:auto;
-  display:flex; flex-direction:column; gap:3px; background:linear-gradient(180deg,var(--surface),transparent 40%)}
+  display:flex; flex-direction:column; gap:3px; background:linear-gradient(180deg,var(--surface),transparent 40%); position:static}
 .nav-section-label{font-size:10.5px; text-transform:uppercase; letter-spacing:.1em; color:var(--faint); font-weight:700; padding:14px 12px 6px}
 .nav-section-label:first-child{padding-top:2px}
 .nav-item{display:flex; align-items:center; gap:11px; padding:9px 12px; border-radius:10px; cursor:pointer;
@@ -444,6 +444,11 @@ input[type=date]:focus, select:focus {
 .pi-stats .s .n{font-family:var(--font-mono); font-weight:700; font-size:19px}
 .pi-stats .s .n.blk{color:var(--coral)} .pi-stats .s .t{color:var(--muted); font-size:13px}
 
+/* resource donut gauges — NEW (aurora): CPU + RAM radial donuts on dashboard */
+.res-gauge-wrap{display:flex; gap:18px; align-items:center; margin-top:8px; flex-wrap:wrap}
+.res-gauge-info{display:flex; flex-direction:column; justify-content:center; flex:1; min-width:0}
+.res-gauge-info .ri{font-family:var(--font-mono); font-size:11px; color:var(--muted); word-break:break-word}
+
 .toplist{margin-top:16px; border-top:1px solid var(--line); padding-top:13px}
 .toplist .h{font-size:11px; color:var(--faint); text-transform:uppercase; letter-spacing:.08em; margin-bottom:9px}
 .toplist ul{list-style:none; margin:0; padding:0; display:flex; flex-direction:column; gap:8px}
@@ -574,6 +579,13 @@ input[type=date]:focus, select:focus {
 .gw-relnotes{font-size:12px;color:var(--muted);text-decoration:underline;text-underline-offset:2px;opacity:.8}
 .gw-relnotes:hover{opacity:1;color:var(--text)}
 
+/* Issue 11: Gateway detail — 3-column (1/3 each) sub-card grid */
+.gw-detail-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(280px,1fr));gap:14px}
+.gw-detail-grid .gw.full{grid-column:1/-1}
+/* Fix 3: "Discovered devices" + "Scan targets" at 1/2 width each in their own row */
+.gw-half-row{display:grid;grid-template-columns:1fr 1fr;gap:14px;grid-column:1/-1}
+@media(max-width:640px){.gw-half-row{grid-template-columns:1fr}}
+
 /* ----------------------------------------------------------------------------
    C · PEERS page — Aurora mockup fidelity (Task P2-3)
    --------------------------------------------------------------------------- */
@@ -581,8 +593,10 @@ input[type=date]:focus, select:focus {
 /* Empty-state for the gateway unit-grid */
 .aurora-gw-empty{padding:24px;text-align:center;color:var(--muted);font-size:13px}
 
-/* tag-dot helper used in Aurora status tags on gateway/peer rows */
-.tag.tag-dot::before{content:'';display:inline-block;width:6px;height:6px;border-radius:50%;background:currentColor;margin-right:5px;vertical-align:middle}
+/* tag-dot helper used in Aurora status tags on gateway/peer rows.
+   Issue 9: text LEFT of dot — suppress ::before, put dot via ::after */
+.tag.tag-dot::before{content:none}
+.tag.tag-dot::after{content:'';display:inline-block;width:6px;height:6px;border-radius:50%;background:currentColor;margin-left:5px}
 
 /* ----------------------------------------------------------------------------
    D · ROUTES page — Wizard modal shells + step progress (Task P2-4b)
@@ -719,6 +733,8 @@ input[type=date]:focus, select:focus {
 .modal-foot.wiz-foot{padding:16px 24px; border-top:1px solid var(--line); display:flex; align-items:center; justify-content:space-between; gap:8px; position:sticky; bottom:0; background:var(--surface)}
 
 /* Aurora RDP card grid (built by auroraRenderGrid()) */
+/* Issue 12: auto-fill minmax grid — matches .unit-grid sizing on gateways/peers pages */
+.rdp-card-grid{display:grid; grid-template-columns:repeat(auto-fill,minmax(280px,1fr)); gap:14px}
 .rdp-aurora-card-actions{display:flex; gap:6px; align-items:center; flex-wrap:wrap; margin-top:12px}
 
 /* ── Settings page — Aurora mockup fidelity (Task P2-11) ─────────────────────── */
@@ -739,6 +755,8 @@ input[type=date]:focus, select:focus {
 
 /* Panel (moved from settings.njk <style nonce> block) */
 .settings-panel{display:flex; flex-direction:column; gap:14px}
+/* Cards size to own content within settings grids — prevents app-info from stretching to match tall neighbours */
+.settings-panel .grid{align-items:start}
 
 /* Mobile hamburger (moved from settings.njk <style nonce> block) */
 .settings-tab-toggle{
diff --git a/public/js/dashboard.js b/public/js/dashboard.js
index 7b8c4831..51a87569 100644
--- a/public/js/dashboard.js
+++ b/public/js/dashboard.js
@@ -108,6 +108,7 @@
 
   // ─── System Resources ───────────────────────────────────────────────────────
   async function refreshResources() {
+    if (isAurora()) return auroraRefreshResources();
     try {
       const data = await api.get('/api/system/resources');
 
@@ -394,12 +395,13 @@
   // The original refreshStats/refreshActivity/renderChart else-paths remain byte-identical.
 
   async function auroraRefreshStats() {
+    var peerOnlineCount = 0; // Bug 2: captured here, applied after gateways fetch
+
     try {
       const data = await api.get('/api/dashboard/stats');
 
-      // Peers connected
-      var peersEl = document.getElementById('stat-peers');
-      if (peersEl) peersEl.textContent = data.peers.online;
+      // Bug 2: save count; will be adjusted after gateway subtraction below
+      peerOnlineCount = (data.peers && typeof data.peers.online === 'number') ? data.peers.online : 0;
 
       // Active routes
       var routesEl = document.getElementById('stat-routes');
@@ -458,18 +460,23 @@
       console.error('Aurora: Failed to refresh stats:', err);
     }
 
-    // Separate fetch for gateways KPI (not in /api/dashboard/stats)
+    // Separate fetch for gateways KPI (Bug 1: API returns { gateways:[…] }, not a bare array)
+    var onlineGateways = 0;
     try {
       var gwData = await api.get('/api/v1/gateways');
       var gwEl = document.getElementById('stat-gateways');
-      if (gwEl && gwData && Array.isArray(gwData)) {
-        var online = gwData.filter(function(g) { return g.status === 'online'; }).length;
-        gwEl.textContent = online + '/' + gwData.length;
+      if (gwData && Array.isArray(gwData.gateways)) {
+        onlineGateways = gwData.gateways.filter(function(g) { return g.status === 'online'; }).length;
+        if (gwEl) gwEl.textContent = onlineGateways + '/' + gwData.gateways.length;
       }
     } catch (err) {
       // non-fatal — gateways KPI stays at '—'
     }
 
+    // Peers KPI: subtract online gateways so only real (non-gateway) peers are shown (Bug 2)
+    var peersEl = document.getElementById('stat-peers');
+    if (peersEl) peersEl.textContent = Math.max(0, peerOnlineCount - onlineGateways);
+
     // Pi-hole donut (3-state: no card if gated off; donut on ok; empty-state on error)
     var donutCard = document.getElementById('pihole-donut-card');
     if (donutCard) {
@@ -485,8 +492,9 @@
     if (!donut) return;
 
     try {
-      var ph = await api.get('/api/pihole/stats');
-      var pct = (ph && ph.summary && ph.summary.queries && ph.summary.queries.percent) || 0;
+      // Bug 3: correct URL (/api/v1/pihole/summary) and response keys (ph.data.*)
+      var ph = await api.get('/api/v1/pihole/summary');
+      var pct = (ph && ph.data && ph.data.queries && ph.data.queries.percent) || 0;
       var pctRounded = Math.round(pct * 10) / 10;
 
       // Animate the donut arc
@@ -500,9 +508,9 @@
 
       // Pi-hole stats body
       if (statsBody) {
-        var blocked = (ph.summary && ph.summary.queries && ph.summary.queries.blocked) || 0;
-        var totalQ = (ph.summary && ph.summary.queries && ph.summary.queries.total) || 0;
-        var gravity = (ph.summary && ph.summary.gravity) || 0;
+        var blocked = (ph.data && ph.data.queries && ph.data.queries.blocked) || 0;
+        var totalQ = (ph.data && ph.data.queries && ph.data.queries.total) || 0;
+        var gravity = (ph.data && ph.data.gravity) || 0;
         statsBody.innerHTML =
           '<div class="s"><span class="n blk">' + blocked.toLocaleString() + '</span><span class="t">' + T('dashboard.pihole_blocked', 'Blocked') + '</span></div>' +
           '<div class="s"><span class="n">' + totalQ.toLocaleString() + '</span><span class="t">' + T('dashboard.pihole_total_queries', 'Total queries') + '</span></div>' +
@@ -522,6 +530,69 @@
     }
   }
 
+  // Enhancement 4: Aurora resource donut gauge update
+  async function auroraRefreshResources() {
+    try {
+      var data = await api.get('/api/system/resources');
+      var cpuPct = data.cpu.percent;
+      var ramPct = data.memory.percent;
+
+      // Write shared IDs (shared refreshResources() bypassed for aurora; we write here)
+      var cpuPctEl = document.getElementById('cpu-pct');
+      if (cpuPctEl) cpuPctEl.textContent = cpuPct + ' %';
+
+      var cpuBar = document.getElementById('cpu-bar');
+      if (cpuBar) {
+        cpuBar.style.width = cpuPct + '%';
+        cpuBar.style.background = cpuPct > 80 ? 'var(--red)' :
+          cpuPct > 50 ? 'var(--amber)' : 'var(--green)';
+      }
+
+      var cpuInfo = document.getElementById('cpu-info');
+      if (cpuInfo) cpuInfo.textContent = data.cpu.cores + ' Cores · ' + data.cpu.model.split(' ').slice(0, 3).join(' ');
+
+      var ramPctEl = document.getElementById('ram-pct');
+      if (ramPctEl) ramPctEl.textContent = ramPct + ' %';
+
+      var ramBar = document.getElementById('ram-bar');
+      if (ramBar) {
+        ramBar.style.width = ramPct + '%';
+        ramBar.style.background = ramPct > 90 ? 'var(--red)' :
+          ramPct > 70 ? 'var(--amber)' : 'var(--blue)';
+      }
+
+      var ramInfo = document.getElementById('ram-info');
+      if (ramInfo) ramInfo.textContent = formatBytes(data.memory.used) + ' / ' + formatBytes(data.memory.total);
+
+      var uptimeValue = document.getElementById('uptime-value');
+      if (uptimeValue) uptimeValue.textContent = data.uptime.formatted;
+
+      var uptimeBoot = document.getElementById('uptime-boot');
+      if (uptimeBoot && data.uptime && data.uptime.bootTime) {
+        var label = (GC.t && GC.t['dashboard.booted_on']) || 'Seit {date}';
+        uptimeBoot.textContent = label.replace('{date}', data.uptime.bootTime);
+      }
+
+      // Update radial donut gauge arcs
+      auroraSetResourceDonut('cpu-donut', cpuPct);
+      auroraSetResourceDonut('ram-donut', ramPct);
+
+    } catch (err) {
+      console.error('Aurora: Failed to refresh resources:', err);
+    }
+  }
+
+  // Set stroke-dasharray + color on a resource donut arc by load percentage
+  function auroraSetResourceDonut(donutId, pct) {
+    var donut = document.getElementById(donutId);
+    if (!donut) return;
+    var arc = donut.querySelector('.val');
+    if (!arc) return;
+    var p = Math.min(100, Math.max(0, Number(pct) || 0));
+    arc.setAttribute('stroke-dasharray', p + ' ' + (100 - p));
+    arc.style.stroke = p > 90 ? 'var(--red)' : p > 70 ? 'var(--amber)' : 'var(--teal)';
+  }
+
   async function auroraRefreshActivity() {
     try {
       var data = await api.get('/api/logs/recent?limit=8');
diff --git a/public/js/gateways.js b/public/js/gateways.js
index 23525425..6a6018a2 100644
--- a/public/js/gateways.js
+++ b/public/js/gateways.js
@@ -77,8 +77,11 @@
     nameWrap.appendChild(el('div', 'ud', (t.gateway_version || '—') + (g.hostname ? ' · ' + g.hostname : '')));
     uh.appendChild(nameWrap);
     var tagCls = 'tag ' + (st === 'online' ? 'tag-green' : st === 'degraded' ? 'tag-amber' : 'tag-grey') + ' tag-dot';
-    var stTag = el('span', tagCls, T('gateways.' + st, st)); stTag.style.marginLeft = 'auto';
-    uh.appendChild(stTag);
+    var stTag = el('span', tagCls, T('gateways.' + st, st));
+    // Issue 8: badge INSIDE card header — wrap in right container pushed to far-right
+    var right = el('span'); right.style.cssText = 'margin-left:auto;display:inline-flex;align-items:center;gap:6px;flex-shrink:0';
+    right.appendChild(stTag);
+    uh.appendChild(right);
     wrap.appendChild(uh);
     // Body: resource bars (online/degraded) or empty-state (offline)
     if (st === 'offline') {
@@ -97,18 +100,52 @@
     wrap.appendChild(btn);
     return wrap;
   }
+  // Issue 10: Aurora-specific versions card — vertical kv list to prevent overflow
+  function auroraVersionsCard(g) {
+    var t = (g.health && g.health.telemetry) || {}, h = g.health || {};
+    var c = el('div', 'gw');
+    var top = el('div', 'top'); top.appendChild(el('h3', null, T('gateways.sec_versions', 'Versionen & System'))); c.appendChild(top);
+    var body = el('div', 'body');
+    function addKv(k, v, vcls) { body.appendChild(kvRow(k, v, vcls)); }
+    var gwVal = el('span'); gwVal.appendChild(document.createTextNode((t.gateway_version || '—') + ' '));
+    if (g.update_available && latest) gwVal.appendChild(el('span', 'badge drift', '↑ ' + latest));
+    addKv(T('gateways.lbl_gateway', 'Gateway'), gwVal);
+    addKv(T('gateways.lbl_node', 'Node'), t.node_version || '—');
+    addKv(T('gateways.lbl_wgtools', 'wg-tools'), t.wg_tools_version || '—');
+    addKv(T('gateways.lbl_os', 'OS'), (t.os_platform || '—') + (t.os_release ? ' ' + t.os_release : ''));
+    addKv(T('gateways.lbl_arch', 'Arch'), t.arch || '—');
+    addKv(T('gateways.lbl_cores', 'Cores'), t.cpu_cores != null ? String(t.cpu_cores) : '—');
+    addKv(T('gateways.lbl_default_gw', 'Default gateway (LAN)'), t.default_gateway_ip || '—');
+    addKv(T('gateways.lbl_dns_resolvers', 'DNS resolvers'), (t.dns_resolvers && t.dns_resolvers.length) ? t.dns_resolvers.join(', ') : '—');
+    var cfgVal;
+    if (h.config_hash) {
+      cfgVal = el('span'); cfgVal.appendChild(document.createTextNode('✓ ' + T('gateways.config_synced', 'synchron') + ' · '));
+      cfgVal.appendChild(el('code', null, String(h.config_hash).slice(0, 8)));
+    } else { cfgVal = T('gateways.config_unknown', 'unbekannt'); }
+    addKv(T('gateways.lbl_config_hash', 'Config hash'), cfgVal);
+    var shortDigest = '—';
+    if (t.image_digest) { var di = String(t.image_digest); var at = di.lastIndexOf('@sha256:'); if (at !== -1) di = di.slice(at + 8); shortDigest = di.slice(-12); }
+    addKv(T('gateways.lbl_image_digest', 'Image'), shortDigest);
+    addKv(T('gateways.lbl_last_pull', 'Last pull'), t.last_pull_at ? ago(t.last_pull_at) : T('gateways.last_pull_never', 'never'));
+    c.appendChild(body);
+    return c;
+  }
   function auroraRenderDetail(g) {
     var root = el('div', 'gw-detail');
     var back = el('button', 'gw-back', '← ' + T('gateways.back_to_fleet', 'Back to fleet')); back.dataset.act = 'back';
     root.appendChild(back);
     root.appendChild(detailHead(g));
-    var grid2 = el('div', 'unit-grid');
-    grid2.appendChild(versionsCard(g));
+    // Issue 11: 3-column detail grid (1/3 width per card); auroraVersionsCard for Issue 10
+    var grid2 = el('div', 'gw-detail-grid');
+    grid2.appendChild(auroraVersionsCard(g));
     grid2.appendChild(resourcesCard(g));
     grid2.appendChild(routesCard(g));
-    grid2.appendChild(discoveredDevicesCard(g));
+    // Bottom two cards ("Discovered devices" + "Scan targets") at 1/2 width each
     var telE = (g.health && g.health.telemetry) || {};
-    if (telE.scan_egress === true) grid2.appendChild(egressCard(g));
+    var halfRow = el('div', 'gw-half-row');
+    halfRow.appendChild(discoveredDevicesCard(g));
+    if (telE.scan_egress === true) halfRow.appendChild(egressCard(g));
+    grid2.appendChild(halfRow);
     root.appendChild(grid2);
     detailView.replaceChildren(root);
   }
diff --git a/public/js/peers.js b/public/js/peers.js
index e4e22fc6..06908d9f 100644
--- a/public/js/peers.js
+++ b/public/js/peers.js
@@ -2264,37 +2264,112 @@
   }
 
   function auroraRenderGatewayCard(gw) {
+    // ── Issue 5: badge INSIDE the card header ──────────────────────────────
+    // ── Issue 6: gear button opens edit modal (not card click) ─────────────
+    // ── Issue 7: card click → /gateways#gw/<id> detail page ───────────────
     var h = gw.health || {};
     var isOnline = gw.status === 'online';
-    var statusTag = isOnline
-      ? '<span class="tag tag-green tag-dot">' + escapeHtml(gwT('peers.gateway.status_online', 'Online')) + '</span>'
-      : '<span class="tag tag-grey tag-dot">' + escapeHtml(gwT('peers.gateway.status_offline', 'Offline')) + '</span>';
+    var statusClass = isOnline ? 'tag tag-green tag-dot' : 'tag tag-grey tag-dot';
+    var statusLabel = isOnline
+      ? gwT('peers.gateway.status_online', 'Online')
+      : gwT('peers.gateway.status_offline', 'Offline');
     // Use h.wg_handshake_age_s directly since formatRelTime expects a past timestamp
     var handshakeText = (typeof h.wg_handshake_age_s === 'number')
       ? (h.wg_handshake_age_s < 60 ? h.wg_handshake_age_s + 's' : Math.floor(h.wg_handshake_age_s / 60) + 'm') + ' ago'
       : '—';
     var t = h.telemetry || {};
-    var rx = formatBytes((t.wg_rx_bytes || 0));
-    var tx = formatBytes((t.wg_tx_bytes || 0));
+    var rx = formatBytes(t.wg_rx_bytes || 0);
+    var tx = formatBytes(t.wg_tx_bytes || 0);
     var trafficText = '↓' + rx + ' ↑' + tx;
 
     var unit = document.createElement('div');
     unit.className = 'unit';
     unit.style.cursor = 'pointer';
-    unit.innerHTML =
-      '<div class="uh">' +
-        '<span class="uav" style="background:linear-gradient(145deg,var(--teal),var(--teal-dim,#28b3a2))">' +
-          '<svg viewBox="0 0 24 24" fill="none"><rect x="3" y="4" width="18" height="6" rx="2" stroke="currentColor" stroke-width="2"/><rect x="3" y="14" width="18" height="6" rx="2" stroke="currentColor" stroke-width="2"/></svg>' +
-        '</span>' +
-        '<div><div class="un">' + escapeHtml(gw.name) + '</div><div class="ud">' + escapeHtml(gw.ip || '') + '</div></div>' +
-        '<span style="margin-left:auto">' + statusTag + '</span>' +
-      '</div>' +
-      '<div class="urow"><span>' + escapeHtml(gwT('peers.gateway.wg_handshake', 'WG-Handshake')) + '</span><b>' + escapeHtml(handshakeText) + '</b></div>' +
-      '<div class="urow"><span>' + escapeHtml(gwT('peers.traffic', 'Traffic')) + '</span><b>' + escapeHtml(trafficText) + '</b></div>';
+    // data-gw-detail carries the target URL for the card-click nav (Issue 7)
+    unit.dataset.gwDetail = '/gateways#gw/' + gw.peer_id;
 
+    // ── Card header row (.uh) ──────────────────────────────────────────────
+    var uh = document.createElement('div');
+    uh.className = 'uh';
+
+    // Avatar icon
+    var uav = document.createElement('span');
+    uav.className = 'uav';
+    uav.style.background = 'linear-gradient(145deg,var(--teal),var(--teal-dim,#28b3a2))';
+    uav.innerHTML = '<svg viewBox="0 0 24 24" fill="none"><rect x="3" y="4" width="18" height="6" rx="2" stroke="currentColor" stroke-width="2"/><rect x="3" y="14" width="18" height="6" rx="2" stroke="currentColor" stroke-width="2"/></svg>';
+    uh.appendChild(uav);
+
+    // Name + IP — flex:1+min-width:0 lets identity shrink so badge+gear always visible
+    var identity = document.createElement('div');
+    identity.style.cssText = 'flex:1;min-width:0;overflow:hidden';
+    var un = document.createElement('div');
+    un.className = 'un';
+    un.style.cssText = 'white-space:nowrap;overflow:hidden;text-overflow:ellipsis';
+    un.textContent = gw.name;
+    var ud = document.createElement('div');
+    ud.className = 'ud';
+    ud.textContent = gw.ip || '';
+    identity.appendChild(un);
+    identity.appendChild(ud);
+    uh.appendChild(identity);
+
+    // Right side: status badge + gear button — gap:8px keeps them clearly separated
+    var right = document.createElement('span');
+    right.style.cssText = 'margin-left:auto;display:flex;align-items:center;gap:8px;flex-shrink:0';
+
+    // Issue 5 — badge INSIDE the card, anchored top-right within header row
+    var badge = document.createElement('span');
+    badge.className = statusClass;
+    badge.textContent = statusLabel;
+    right.appendChild(badge);
+
+    // Issue 6 — gear button triggers edit modal; stops propagation so card-click
+    //           doesn't also fire (Issue 7 nav).
+    var gearBtn = document.createElement('button');
+    gearBtn.type = 'button';
+    gearBtn.className = 'icon-action';
+    gearBtn.setAttribute('data-action', 'edit');
+    gearBtn.setAttribute('data-id', String(gw.peer_id));
+    var gearLabel = gwT('peers.gateway.action_edit_gear', 'Edit gateway');
+    gearBtn.setAttribute('aria-label', gearLabel);
+    gearBtn.title = gearLabel;
+    // Gear / cog icon (Lucide settings)
+    gearBtn.innerHTML = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" width="14" height="14"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-4 0v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06A1.65 1.65 0 0 0 4.68 15a1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1 0-4h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06A1.65 1.65 0 0 0 9 4.68a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06A1.65 1.65 0 0 0 19.4 9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z"/></svg>';
+    gearBtn.addEventListener('click', function(e) {
+      e.stopPropagation();
+      showEditModal(gw.peer_id);
+    });
+    right.appendChild(gearBtn);
+
+    uh.appendChild(right);
+    unit.appendChild(uh);
+
+    // Metric rows
+    var row1 = document.createElement('div');
+    row1.className = 'urow';
+    var r1k = document.createElement('span');
+    r1k.textContent = gwT('peers.gateway.wg_handshake', 'WG-Handshake');
+    var r1v = document.createElement('b');
+    r1v.textContent = handshakeText;
+    row1.appendChild(r1k);
+    row1.appendChild(r1v);
+    unit.appendChild(row1);
+
+    var row2 = document.createElement('div');
+    row2.className = 'urow';
+    var r2k = document.createElement('span');
+    r2k.textContent = gwT('peers.traffic', 'Traffic');
+    var r2v = document.createElement('b');
+    r2v.textContent = trafficText;
+    row2.appendChild(r2k);
+    row2.appendChild(r2v);
+    unit.appendChild(row2);
+
+    // Issue 7 — card click navigates to the gateway detail page.
+    //           Gear button and badge stop propagation so they don't also navigate.
     unit.addEventListener('click', function(e) {
       if (e.target.closest('button, a')) return;
-      showEditModal(gw.peer_id);
+      window.location.href = '/gateways#gw/' + gw.peer_id;
     });
     return unit;
   }
diff --git a/public/js/rdp.js b/public/js/rdp.js
index 214bac12..87ccd88f 100644
--- a/public/js/rdp.js
+++ b/public/js/rdp.js
@@ -558,8 +558,17 @@
     if (checkBtn) {
       try {
         var result = await api.get('/api/v1/rdp/' + checkBtn.dataset.check + '/status');
-        checkBtn.textContent = result.online ? 'Online' : 'Offline';
-        checkBtn.style.color = result.online ? 'var(--success)' : 'var(--danger)';
+        if (isAurora()) {
+          // Issue 16: Aurora — color + distinct icon, no big text in button
+          checkBtn.style.color = result.online ? 'var(--green)' : 'var(--red)';
+          checkBtn.title = result.online ? (GC.t['rdp.online'] || 'Online') : (GC.t['rdp.offline'] || 'Offline');
+          checkBtn.innerHTML = result.online
+            ? '<svg viewBox="0 0 24 24" fill="currentColor" width="15" height="15"><circle cx="12" cy="12" r="10"/><path d="M9 12l2 2 4-4" fill="none" stroke="#fff" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/></svg>'
+            : '<svg viewBox="0 0 24 24" fill="currentColor" width="15" height="15"><circle cx="12" cy="12" r="10"/><path d="M9 9l6 6M15 9l-6 6" fill="none" stroke="#fff" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/></svg>';
+        } else {
+          checkBtn.textContent = result.online ? 'Online' : 'Offline';
+          checkBtn.style.color = result.online ? 'var(--success)' : 'var(--danger)';
+        }
       } catch {}
       return;
     }
@@ -1737,8 +1746,10 @@
       return;
     }
     grid.style.cssText = '';
+    // Issue 12: use unit-grid-style auto-fill grid so cards are consistently sized
+    // (not stretched span6 in 12-col grid like other Aurora pages)
     var container = document.createElement('div');
-    container.className = 'grid';
+    container.className = 'rdp-card-grid';
 
     // Monitor SVG (matches mockup card-title icon)
     var MONITOR_SVG = '<svg viewBox="0 0 24 24" fill="none" width="15" height="15"><rect x="2" y="4" width="20" height="13" rx="2" stroke="currentColor" stroke-width="2"/><path d="M8 21h8" stroke="currentColor" stroke-width="2" stroke-linecap="round"/></svg>';
@@ -1747,28 +1758,48 @@
       var isOnline = r.status && r.status.online;
       var isMaintenance = r.maintenance_enabled;
 
+      // Issue 12: plain .card (no span6), sized by the .rdp-card-grid container
       var card = document.createElement('div');
-      card.className = 'card span6';
+      card.className = 'card';
 
-      // Card title: monitor icon + name
+      // Card title: monitor icon + [name+proto group] + status badge (Issue 13: badge inside header)
       var cardTitle = document.createElement('div');
       cardTitle.className = 'card-title';
       var ic = document.createElement('span');
       ic.className = 'ic';
       ic.innerHTML = MONITOR_SVG;
       cardTitle.appendChild(ic);
+      // nameGroup wraps name + proto so they shrink together, leaving room for statusTag
+      var nameGroup = document.createElement('span');
+      nameGroup.style.cssText = 'flex:1;min-width:0;display:inline-flex;align-items:center;gap:6px;overflow:hidden';
       var nameSpan = document.createElement('span');
+      nameSpan.style.cssText = 'flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap';
       nameSpan.textContent = r.name;
-      cardTitle.appendChild(nameSpan);
-      // Proto badge alongside name
+      nameGroup.appendChild(nameSpan);
+      // Proto badge alongside name (flex-shrink:0 keeps it fully visible)
       var protoBadgeWrap = document.createElement('span');
-      protoBadgeWrap.className = 'card-sub';
-      protoBadgeWrap.style.cssText = 'margin-left:6px;display:inline-flex;align-items:center;gap:4px';
+      protoBadgeWrap.style.cssText = 'display:inline-flex;align-items:center;gap:4px;font-size:12px;font-weight:500;font-family:var(--font-body);color:var(--faint);flex-shrink:0';
       protoBadgeWrap.appendChild(buildProtoBadge(r));
-      cardTitle.appendChild(protoBadgeWrap);
+      nameGroup.appendChild(protoBadgeWrap);
+      cardTitle.appendChild(nameGroup);
+      // Issue 13: status badge inside card header, text LEFT of dot (uses .tag.tag-dot::after)
+      // margin-left:auto pushes badge to the right within the card title flex row
+      var statusTag = document.createElement('span');
+      if (isOnline) {
+        statusTag.className = 'tag tag-green tag-dot';
+        statusTag.textContent = GC.t['rdp.health_reachable'] || 'Reachable';
+      } else if (isMaintenance) {
+        statusTag.className = 'tag tag-amber tag-dot';
+        statusTag.textContent = GC.t['rdp.health_checking'] || 'Checking…';
+      } else {
+        statusTag.className = 'tag tag-red tag-dot';
+        statusTag.textContent = GC.t['rdp.offline'] || 'Offline';
+      }
+      statusTag.style.marginLeft = 'auto';
+      cardTitle.appendChild(statusTag);
       card.appendChild(cardTitle);
 
-      // KV rows: Mode / Target / Health
+      // KV rows: Mode / Target (Health removed from kv — now in header as Issue 13)
       var kv = document.createElement('div');
       kv.className = 'kv';
 
@@ -1799,30 +1830,6 @@
       targetRow.appendChild(targetV);
       kv.appendChild(targetRow);
 
-      // Health row (tag with .tag-dot per mockup)
-      var healthRow = document.createElement('div');
-      healthRow.className = 'row';
-      var healthK = document.createElement('span');
-      healthK.className = 'k';
-      healthK.textContent = GC.t['rdp.kv.health'] || 'Health';
-      var healthV = document.createElement('span');
-      healthV.className = 'v';
-      var healthTag = document.createElement('span');
-      if (isOnline) {
-        healthTag.className = 'tag tag-green tag-dot';
-        healthTag.textContent = GC.t['rdp.health_reachable'] || 'Reachable';
-      } else if (isMaintenance) {
-        healthTag.className = 'tag tag-amber tag-dot';
-        healthTag.textContent = GC.t['rdp.health_checking'] || 'Checking…';
-      } else {
-        healthTag.className = 'tag tag-red tag-dot';
-        healthTag.textContent = GC.t['rdp.offline'] || 'Offline';
-      }
-      healthV.appendChild(healthTag);
-      healthRow.appendChild(healthK);
-      healthRow.appendChild(healthV);
-      kv.appendChild(healthRow);
-
       card.appendChild(kv);
 
       // Action buttons — ALL actions from default card preserved, as .icon-action set
@@ -1850,6 +1857,21 @@
         rowActions.appendChild(disconnBtn);
       }
 
+      // Issue 14: browser session button — only when browser access is enabled and licensed.
+      // Real mechanism: GET /rdp/:id/session (confirmed in src/routes/index.js line 254).
+      if (r.browser_enabled && GC.features && GC.features.browser_sessions) {
+        var browserBtn = document.createElement('button');
+        browserBtn.className = 'icon-action';
+        browserBtn.title = GC.t['rdp.browser.open'] || 'Im Browser öffnen';
+        (function (id) {
+          browserBtn.addEventListener('click', function () {
+            window.open('/rdp/' + id + '/session', '_blank', 'noopener');
+          });
+        }(r.id));
+        browserBtn.innerHTML = '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" width="15" height="15" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M2 9h20M9 21h6"/></svg>';
+        rowActions.appendChild(browserBtn);
+      }
+
       // Edit (always)
       var editBtn = document.createElement('button');
       editBtn.className = 'icon-action';
diff --git a/src/i18n/de.json b/src/i18n/de.json
index 65ac33f0..7d9aabfc 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -166,6 +166,7 @@
   "peers.gateway.none": "Kein Gateway konfiguriert. Neuen Gateway-Peer über „Hinzufügen\" anlegen.",
   "peers.gateway.version_chip": "Gateway-Container-Version",
   "peers.gateway.action_edit": "Bearbeiten",
+  "peers.gateway.action_edit_gear": "Gateway bearbeiten",
   "peers.gateway.action_env": "Pairing-Tokens anzeigen",
   "peers.gateway.action_delete": "Gateway löschen",
   "peers.tags": "Tags",
@@ -1375,6 +1376,7 @@
   "rdp.browser.not_found": "Verbindung nicht gefunden.",
   "rdp.browser.not_authorized": "Sie sind nicht berechtigt, auf diese Verbindung zuzugreifen.",
   "rdp.browser.maintenance_active": "Diese Verbindung befindet sich derzeit in einem Wartungsfenster.",
+  "rdp.browser.section": "Browser-Zugriff",
   "rdp.browser.enable": "Browser-Zugriff aktivieren",
   "rdp.browser.enable_hint": "Erlaubt Sessions direkt im Browser (Terminal/Canvas via guacd). Lizenz: browser_sessions.",
   "rdp.browser.clipboard": "Zwischenablage erlauben",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b2520f91..f6ad025a 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -166,6 +166,7 @@
   "peers.gateway.none": "No gateway configured. Add one via the Add button.",
   "peers.gateway.version_chip": "Gateway container version",
   "peers.gateway.action_edit": "Edit",
+  "peers.gateway.action_edit_gear": "Edit gateway",
   "peers.gateway.action_env": "Pairing tokens",
   "peers.gateway.action_delete": "Delete gateway",
   "peers.tags": "Tags",
@@ -1375,6 +1376,7 @@
   "rdp.browser.not_found": "Connection not found.",
   "rdp.browser.not_authorized": "You are not authorized to access this connection.",
   "rdp.browser.maintenance_active": "This connection is currently in a maintenance window.",
+  "rdp.browser.section": "Browser access",
   "rdp.browser.enable": "Enable browser access",
   "rdp.browser.enable_hint": "Allow sessions directly in the browser (terminal/canvas via guacd). License: browser_sessions.",
   "rdp.browser.clipboard": "Allow clipboard",
diff --git a/templates/aurora/pages/dashboard.njk b/templates/aurora/pages/dashboard.njk
index 2d5ec12a..af9a7f32 100644
--- a/templates/aurora/pages/dashboard.njk
+++ b/templates/aurora/pages/dashboard.njk
@@ -230,27 +230,51 @@
 <!-- ── Row 4: System Resources ────────────────────────────────────────────── -->
 <div class="grid" style="margin-bottom:18px">
 
-  <!-- CPU -->
+  <!-- CPU — radial donut gauge (Aurora) -->
   <div class="card span4">
-    <div class="card-title">
-      {{ t('dashboard.cpu_usage') }}
-      <span class="card-sub" id="cpu-pct">—</span>
-    </div>
+    <div class="card-title">{{ t('dashboard.cpu_usage') }}</div>
     <div class="card-body">
-      <div style="font-family:var(--font-mono);font-size:11px;color:var(--muted);margin-bottom:6px" id="cpu-info">—</div>
-      <div class="meter-bar"><div class="meter-fill" style="width:0%;background:var(--green)" id="cpu-bar"></div></div>
+      <div class="res-gauge-wrap">
+        <div class="donut-host">
+          <svg class="donut" id="cpu-donut" viewBox="0 0 36 36">
+            <circle class="track" cx="18" cy="18" r="15.9155" fill="none" stroke-width="3"/>
+            <circle class="val" cx="18" cy="18" r="15.9155" fill="none" stroke-width="3"
+              stroke-dasharray="0 100" stroke-dashoffset="25" stroke-linecap="round"/>
+          </svg>
+          <div class="donut-center">
+            <div class="big" id="cpu-pct">—</div>
+          </div>
+        </div>
+        <div class="res-gauge-info">
+          <div class="ri" id="cpu-info">—</div>
+        </div>
+      </div>
+      <!-- #cpu-bar kept hidden for shared-function ID contract -->
+      <div style="display:none"><div id="cpu-bar"></div></div>
     </div>
   </div>
 
-  <!-- RAM -->
+  <!-- RAM — radial donut gauge (Aurora) -->
   <div class="card span4">
-    <div class="card-title">
-      {{ t('dashboard.ram_usage') }}
-      <span class="card-sub" id="ram-pct">—</span>
-    </div>
+    <div class="card-title">{{ t('dashboard.ram_usage') }}</div>
     <div class="card-body">
-      <div style="font-family:var(--font-mono);font-size:11px;color:var(--muted);margin-bottom:6px" id="ram-info">—</div>
-      <div class="meter-bar"><div class="meter-fill" style="width:0%;background:var(--blue)" id="ram-bar"></div></div>
+      <div class="res-gauge-wrap">
+        <div class="donut-host">
+          <svg class="donut" id="ram-donut" viewBox="0 0 36 36">
+            <circle class="track" cx="18" cy="18" r="15.9155" fill="none" stroke-width="3"/>
+            <circle class="val" cx="18" cy="18" r="15.9155" fill="none" stroke-width="3"
+              stroke-dasharray="0 100" stroke-dashoffset="25" stroke-linecap="round"/>
+          </svg>
+          <div class="donut-center">
+            <div class="big" id="ram-pct">—</div>
+          </div>
+        </div>
+        <div class="res-gauge-info">
+          <div class="ri" id="ram-info">—</div>
+        </div>
+      </div>
+      <!-- #ram-bar kept hidden for shared-function ID contract -->
+      <div style="display:none"><div id="ram-bar"></div></div>
     </div>
   </div>
 
diff --git a/templates/aurora/pages/rdp.njk b/templates/aurora/pages/rdp.njk
index 52e3d262..d9bc392f 100644
--- a/templates/aurora/pages/rdp.njk
+++ b/templates/aurora/pages/rdp.njk
@@ -456,9 +456,69 @@
         </div>
 
         {# Browser-access section (hidden until toggle enabled; rdp.js reveals) #}
+        {# Issue 15: Add all 6 browser checkboxes + SFTP/audio inputs required by rdp.js populate code #}
         <div id="rdp-browser-reveal" style="display:none">
           <div style="font-size:12px;font-weight:700;color:var(--teal);text-transform:uppercase;letter-spacing:.5px;margin-bottom:10px">{{ t('rdp.browser.section') }}</div>
           <label style="display:flex;align-items:center;gap:6px;font-size:12px;cursor:pointer"><input type="checkbox" id="rdp-browser-enabled" style="accent-color:var(--teal)"> {{ t('rdp.browser.enable') }}</label>
+          {# DA-2: SFTP + Audio are blocked for gateway/external access #}
+          <div id="rdp-browser-gateway-hint" style="display:none;margin-top:8px;font-size:11px;color:var(--faint)">{{ t('rdp.browser.gateway_blocked') }}</div>
+          {# Clipboard (not gated by access mode) #}
+          <label style="display:flex;align-items:center;gap:6px;font-size:12px;cursor:pointer;margin-top:8px"><input type="checkbox" id="rdp-browser-clipboard" style="accent-color:var(--teal)"> {{ t('rdp.browser.clipboard') }}</label>
+          {# SFTP toggle #}
+          <div id="rdp-browser-sftp-row" style="margin-top:6px">
+            <label style="display:flex;align-items:center;gap:6px;font-size:12px;cursor:pointer"><input type="checkbox" id="rdp-browser-sftp" style="accent-color:var(--teal)"> {{ t('rdp.browser.sftp') }} <span id="rdp-browser-sftp-mode-hint" style="font-size:11px;color:var(--faint)"></span></label>
+          </div>
+          {# Audio — rdp (rdp_disable_audio shown INVERTED as "Audio active") #}
+          <div id="rdp-browser-audio-rdp-row" style="margin-top:6px">
+            <label style="display:flex;align-items:center;gap:6px;font-size:12px;cursor:pointer"><input type="checkbox" id="rdp-browser-audio-rdp" checked style="accent-color:var(--teal)"> {{ t('rdp.browser.audio_active') }}</label>
+          </div>
+          {# Audio — vnc (browser_enable_audio) #}
+          <div id="rdp-browser-audio-vnc-row" style="margin-top:6px">
+            <label style="display:flex;align-items:center;gap:6px;font-size:12px;cursor:pointer"><input type="checkbox" id="rdp-browser-audio-vnc" style="accent-color:var(--teal)"> {{ t('rdp.browser.audio_vnc') }}</label>
+          </div>
+          {# Advanced — SFTP locks + secondary host/creds + audio servername #}
+          <details id="rdp-browser-advanced" style="margin-top:10px">
+            <summary style="font-size:12px;cursor:pointer;color:var(--muted)">{{ t('rdp.browser.advanced') }}</summary>
+            <div style="margin-top:10px;display:flex;flex-direction:column;gap:10px">
+              <div id="rdp-sftp-locks" style="display:grid;grid-template-columns:1fr 1fr;gap:10px">
+                <label style="display:flex;align-items:center;gap:6px;font-size:12px;cursor:pointer"><input type="checkbox" id="rdp-sftp-disable-download" checked style="accent-color:var(--teal)"> {{ t('rdp.browser.sftp_lock_download') }}</label>
+                <label style="display:flex;align-items:center;gap:6px;font-size:12px;cursor:pointer"><input type="checkbox" id="rdp-sftp-disable-upload" checked style="accent-color:var(--teal)"> {{ t('rdp.browser.sftp_lock_upload') }}</label>
+              </div>
+              <div id="rdp-sftp-secondary" style="display:grid;grid-template-columns:1fr 1fr;gap:10px">
+                <div>
+                  <label style="font-size:11px;font-weight:600;color:var(--muted);display:block;margin-bottom:3px">{{ t('rdp.browser.sftp_host') }}</label>
+                  <input type="text" id="rdp-sftp-host" autocomplete="off" style="width:100%;padding:8px 12px;font-size:12px;border:1px solid var(--line);border-radius:var(--radius-sm);background:var(--surface-2);font-family:var(--font-body);box-sizing:border-box">
+                </div>
+                <div>
+                  <label style="font-size:11px;font-weight:600;color:var(--muted);display:block;margin-bottom:3px">{{ t('rdp.browser.sftp_port') }}</label>
+                  <input type="number" id="rdp-sftp-port" min="1" max="65535" style="width:100%;padding:8px 12px;font-size:12px;border:1px solid var(--line);border-radius:var(--radius-sm);background:var(--surface-2);font-family:var(--font-body);box-sizing:border-box">
+                </div>
+                <div>
+                  <label style="font-size:11px;font-weight:600;color:var(--muted);display:block;margin-bottom:3px">{{ t('rdp.browser.sftp_username') }}</label>
+                  <input type="text" id="rdp-sftp-username" autocomplete="off" data-1p-ignore data-lpignore="true" style="width:100%;padding:8px 12px;font-size:12px;border:1px solid var(--line);border-radius:var(--radius-sm);background:var(--surface-2);font-family:var(--font-body);box-sizing:border-box">
+                </div>
+                <div>
+                  <label style="font-size:11px;font-weight:600;color:var(--muted);display:block;margin-bottom:3px">{{ t('rdp.browser.sftp_password') }}</label>
+                  <input type="password" id="rdp-sftp-password" autocomplete="new-password" data-1p-ignore data-lpignore="true" style="width:100%;padding:8px 12px;font-size:12px;border:1px solid var(--line);border-radius:var(--radius-sm);background:var(--surface-2);font-family:var(--font-body);box-sizing:border-box">
+                  <div id="rdp-cred-set-sftp-password" style="display:none;font-size:11px;color:var(--faint)">{{ t('rdp.browser.set_kept') }}</div>
+                </div>
+                <div style="grid-column:1/-1">
+                  <label style="font-size:11px;font-weight:600;color:var(--muted);display:block;margin-bottom:3px">{{ t('rdp.browser.sftp_private_key') }}</label>
+                  <textarea id="rdp-sftp-private-key" rows="3" autocomplete="off" data-1p-ignore data-lpignore="true" spellcheck="false" style="width:100%;padding:8px 12px;font-size:12px;border:1px solid var(--line);border-radius:var(--radius-sm);background:var(--surface-2);font-family:var(--font-mono);box-sizing:border-box;resize:vertical"></textarea>
+                  <div id="rdp-cred-set-sftp-private-key" style="display:none;font-size:11px;color:var(--faint)">{{ t('rdp.browser.set_kept') }}</div>
+                </div>
+                <div>
+                  <label style="font-size:11px;font-weight:600;color:var(--muted);display:block;margin-bottom:3px">{{ t('rdp.browser.sftp_passphrase') }}</label>
+                  <input type="password" id="rdp-sftp-passphrase" autocomplete="new-password" data-1p-ignore data-lpignore="true" style="width:100%;padding:8px 12px;font-size:12px;border:1px solid var(--line);border-radius:var(--radius-sm);background:var(--surface-2);font-family:var(--font-body);box-sizing:border-box">
+                  <div id="rdp-cred-set-sftp-passphrase" style="display:none;font-size:11px;color:var(--faint)">{{ t('rdp.browser.set_kept') }}</div>
+                </div>
+              </div>
+              <div id="rdp-audio-servername-row">
+                <label style="font-size:11px;font-weight:600;color:var(--muted);display:block;margin-bottom:3px">{{ t('rdp.browser.audio_servername') }}</label>
+                <input type="text" id="rdp-audio-servername" autocomplete="off" style="width:100%;padding:8px 12px;font-size:12px;border:1px solid var(--line);border-radius:var(--radius-sm);background:var(--surface-2);font-family:var(--font-body);box-sizing:border-box">
+              </div>
+            </div>
+          </details>
         </div>
 
       </div>
diff --git a/templates/aurora/pages/settings.njk b/templates/aurora/pages/settings.njk
index ea09e2ed..9196b9d6 100644
--- a/templates/aurora/pages/settings.njk
+++ b/templates/aurora/pages/settings.njk
@@ -40,22 +40,88 @@
 
 {# ─── General Tab ─────────────────────────────────────── #}
 <div class="settings-panel" data-settings-panel="general">
+  {# Fix 4: single merged grid — App info sits in same flex-column as Default Theme etc., eliminating gap #}
   <div class="grid">
-    <div class="card span6">
-      <div class="card-title">
-        <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 01-2.83 2.83l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83-2.83l.06-.06A1.65 1.65 0 004.68 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 012.83-2.83l.06.06A1.65 1.65 0 009 4.68a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 2.83l-.06.06A1.65 1.65 0 0019.4 9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z"/></svg></span>
-        {{ t('settings.app_info') }}
+    <div class="span6" style="display:flex;flex-direction:column;gap:14px">
+      <div class="card">
+        <div class="card-title">
+          <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 01-2.83 2.83l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83-2.83l.06-.06A1.65 1.65 0 004.68 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 012.83-2.83l.06.06A1.65 1.65 0 009 4.68a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 2.83l-.06.06A1.65 1.65 0 0019.4 9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z"/></svg></span>
+          {{ t('settings.app_info') }}
+        </div>
+        <div style="margin-top:14px">
+          <div class="set-row" style="border-bottom:1px solid var(--border)"><span class="l">{{ t('settings.app_name') }}</span><code style="font-family:var(--font-mono);font-size:12px;font-weight:600">{{ appName }}</code></div>
+          <div class="set-row" style="border-bottom:1px solid var(--border)"><span class="l">{{ t('settings.version') }}</span><code style="font-family:var(--font-mono);font-size:12px">v{{ appVersion }}</code></div>
+          <div class="set-row" style="border-bottom:1px solid var(--border)"><span class="l">{{ t('settings.wg_host') }}</span><code style="font-family:var(--font-mono);font-size:12px;color:var(--accent)">{{ wgHost }}:{{ wgPort }}</code></div>
+          <div class="set-row" style="border-bottom:1px solid var(--border)"><span class="l">{{ t('settings.subnet') }}</span><code style="font-family:var(--font-mono);font-size:12px">{{ wgSubnet }}</code></div>
+          <div class="set-row"><span class="l">{{ t('settings.default_language') }}</span><code style="font-family:var(--font-mono);font-size:12px">{{ language }}</code></div>
+        </div>
+      </div>
+
+      <div class="card">
+        <div class="card-title">
+          <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 01-2.83 2.83l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83-2.83l.06-.06A1.65 1.65 0 004.68 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 012.83-2.83l.06.06A1.65 1.65 0 009 4.68a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 2.83l-.06.06A1.65 1.65 0 0019.4 9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z"/></svg></span>
+          {{ t('settings.default_theme') }}
+        </div>
+        <div style="margin-top:14px;display:flex;flex-direction:column;gap:12px">
+          <div style="display:flex;gap:8px" id="default-theme-buttons">
+            <button class="btn {{ 'btn-primary' if theme == 'default' or not theme else 'btn-ghost' }}" data-default-theme="default" style="flex:1;justify-content:center">{{ t('profile.theme_classic') }}</button>
+            <button class="btn {{ 'btn-primary' if theme == 'pro' else 'btn-ghost' }}" data-default-theme="pro" style="flex:1;justify-content:center">{{ t('profile.theme_pro') }}</button>
+            <button class="btn {{ 'btn-primary' if theme == 'aurora' else 'btn-ghost' }}" data-default-theme="aurora" style="flex:1;justify-content:center">{{ t('profile.theme_aurora') }}</button>
+          </div>
+          <div style="font-size:11px;color:var(--text-3)">{{ t('settings.default_theme_hint') }}</div>
+        </div>
+      </div>
+
+      <div style="display:grid;grid-template-columns:repeat(auto-fit,minmax(280px,1fr));gap:14px">
+        <div class="card">
+          <div class="card-title">
+            <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg></span>
+            {{ t('peer_groups.title') }}
+          </div>
+          <div style="display:flex;flex-direction:column;gap:12px;margin-top:14px">
+            <div style="font-size:12px;color:var(--text-3)">{{ t('peer_groups.subtitle') }}</div>
+            <div id="peer-groups-list"></div>
+            <div style="display:flex;flex-direction:column;gap:8px;padding-top:8px;border-top:1px solid var(--border)">
+              <div style="display:flex;gap:8px">
+                <input type="text" id="pg-name" placeholder="{{ t('peer_groups.name_placeholder') }}" style="flex:1;padding:8px 12px;font-size:12px" maxlength="100">
+                <input type="color" id="pg-color" value="#6b7280" style="width:40px;height:36px;padding:2px;border:1px solid var(--border);border-radius:var(--radius-sm);cursor:pointer">
+              </div>
+              <input type="text" id="pg-desc" placeholder="{{ t('peer_groups.description_placeholder') }}" style="width:100%;padding:8px 12px;font-size:12px" maxlength="255">
+              <div id="pg-error" class="form-error" style="display:none"></div>
+              <button class="btn btn-primary" id="btn-add-peer-group" style="align-self:flex-start">{{ t('peer_groups.add') }}</button>
+            </div>
+          </div>
+        </div>
+
+        <div class="card">
+          <div class="card-title">
+            <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M20.59 13.41L13.42 20.58a2 2 0 01-2.83 0L2 12V2h10l8.59 8.59a2 2 0 010 2.82z"/><line x1="7" y1="7" x2="7.01" y2="7"/></svg></span>
+            {{ t('tags.title') or 'Tags' }}
+          </div>
+          <div style="display:flex;flex-direction:column;gap:12px;margin-top:14px">
+            <div style="font-size:12px;color:var(--text-3)">{{ t('tags.subtitle') or 'Zentrale Verwaltung aller Peer-Tags' }}</div>
+            <div id="tags-list"></div>
+            <div style="display:flex;flex-direction:column;gap:8px;padding-top:8px;border-top:1px solid var(--border)">
+              <input type="text" id="tag-name" placeholder="{{ t('tags.name_placeholder') or 'Tag-Name' }}" style="width:100%;padding:8px 12px;font-size:12px" maxlength="64" autocomplete="off">
+              <div id="tag-error" class="form-error" style="display:none"></div>
+              <button class="btn btn-primary" id="btn-add-tag" style="align-self:flex-start">{{ t('tags.add') or 'Tag anlegen' }}</button>
+            </div>
+          </div>
+        </div>
       </div>
-      <div style="margin-top:14px">
-        <div class="set-row" style="border-bottom:1px solid var(--border)"><span class="l">{{ t('settings.app_name') }}</span><code style="font-family:var(--font-mono);font-size:12px;font-weight:600">{{ appName }}</code></div>
-        <div class="set-row" style="border-bottom:1px solid var(--border)"><span class="l">{{ t('settings.version') }}</span><code style="font-family:var(--font-mono);font-size:12px">v{{ appVersion }}</code></div>
-        <div class="set-row" style="border-bottom:1px solid var(--border)"><span class="l">{{ t('settings.wg_host') }}</span><code style="font-family:var(--font-mono);font-size:12px;color:var(--accent)">{{ wgHost }}:{{ wgPort }}</code></div>
-        <div class="set-row" style="border-bottom:1px solid var(--border)"><span class="l">{{ t('settings.subnet') }}</span><code style="font-family:var(--font-mono);font-size:12px">{{ wgSubnet }}</code></div>
-        <div class="set-row"><span class="l">{{ t('settings.default_language') }}</span><code style="font-family:var(--font-mono);font-size:12px">{{ language }}</code></div>
+
+      <div class="card">
+        <div class="card-title">
+          <span class="ic" style="color:var(--red);background:var(--red-bg)"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg></span>
+          {{ t('settings.danger_zone') }}
+        </div>
+        <div style="margin-top:14px">
+          <button class="btn btn-danger" style="width:100%;justify-content:center" id="btn-clear-logs">{{ t('settings.clear_logs') }}</button>
+        </div>
       </div>
     </div>
 
-    <div class="span6">
+    <div class="span6" style="display:flex;flex-direction:column;gap:14px">
       <div class="card">
         <div class="card-title">
           <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="2" y1="12" x2="22" y2="12"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg></span>
@@ -80,7 +146,7 @@
         </div>
       </div>
 
-      <div class="card" style="margin-top:14px">
+      <div class="card">
         <div class="card-title">
           <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 20h9"/><path d="M16.5 3.5a2.121 2.121 0 013 3L7 19l-4 1 1-4L16.5 3.5z"/></svg></span>
           {{ t('data.title') or 'Data & Retention' }}
@@ -108,7 +174,7 @@
         </div>
       </div>
 
-      <div class="card" style="margin-top:14px">
+      <div class="card">
         <div class="card-title">
           <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="4.93" y1="4.93" x2="19.07" y2="19.07"/></svg></span>
           {{ t('settings.route_block_title') }}
@@ -131,75 +197,7 @@
           </div>
         </div>
       </div>
-    </div>
-  </div>
-
-  <div class="grid">
-    <div class="span6" style="display:flex;flex-direction:column;gap:14px">
-      <div class="card">
-        <div class="card-title">
-          <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 00.33 1.82l.06.06a2 2 0 01-2.83 2.83l-.06-.06a1.65 1.65 0 00-1.82-.33 1.65 1.65 0 00-1 1.51V21a2 2 0 01-4 0v-.09A1.65 1.65 0 009 19.4a1.65 1.65 0 00-1.82.33l-.06.06a2 2 0 01-2.83-2.83l.06-.06A1.65 1.65 0 004.68 15a1.65 1.65 0 00-1.51-1H3a2 2 0 010-4h.09A1.65 1.65 0 004.6 9a1.65 1.65 0 00-.33-1.82l-.06-.06a2 2 0 012.83-2.83l.06.06A1.65 1.65 0 009 4.68a1.65 1.65 0 001-1.51V3a2 2 0 014 0v.09a1.65 1.65 0 001 1.51 1.65 1.65 0 001.82-.33l.06-.06a2 2 0 012.83 2.83l-.06.06A1.65 1.65 0 0019.4 9a1.65 1.65 0 001.51 1H21a2 2 0 010 4h-.09a1.65 1.65 0 00-1.51 1z"/></svg></span>
-          {{ t('settings.default_theme') }}
-        </div>
-        <div style="margin-top:14px;display:flex;flex-direction:column;gap:12px">
-          <div style="display:flex;gap:8px" id="default-theme-buttons">
-            <button class="btn {{ 'btn-primary' if theme == 'default' or not theme else 'btn-ghost' }}" data-default-theme="default" style="flex:1;justify-content:center">{{ t('profile.theme_classic') }}</button>
-            <button class="btn {{ 'btn-primary' if theme == 'pro' else 'btn-ghost' }}" data-default-theme="pro" style="flex:1;justify-content:center">{{ t('profile.theme_pro') }}</button>
-          </div>
-          <div style="font-size:11px;color:var(--text-3)">{{ t('settings.default_theme_hint') }}</div>
-        </div>
-      </div>
-
-      <div style="display:grid;grid-template-columns:repeat(auto-fit,minmax(280px,1fr));gap:14px">
-        <div class="card">
-          <div class="card-title">
-            <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg></span>
-            {{ t('peer_groups.title') }}
-          </div>
-          <div style="display:flex;flex-direction:column;gap:12px;margin-top:14px">
-            <div style="font-size:12px;color:var(--text-3)">{{ t('peer_groups.subtitle') }}</div>
-            <div id="peer-groups-list"></div>
-            <div style="display:flex;flex-direction:column;gap:8px;padding-top:8px;border-top:1px solid var(--border)">
-              <div style="display:flex;gap:8px">
-                <input type="text" id="pg-name" placeholder="{{ t('peer_groups.name_placeholder') }}" style="flex:1;padding:8px 12px;font-size:12px" maxlength="100">
-                <input type="color" id="pg-color" value="#6b7280" style="width:40px;height:36px;padding:2px;border:1px solid var(--border);border-radius:var(--radius-sm);cursor:pointer">
-              </div>
-              <input type="text" id="pg-desc" placeholder="{{ t('peer_groups.description_placeholder') }}" style="width:100%;padding:8px 12px;font-size:12px" maxlength="255">
-              <div id="pg-error" class="form-error" style="display:none"></div>
-              <button class="btn btn-primary" id="btn-add-peer-group" style="align-self:flex-start">{{ t('peer_groups.add') }}</button>
-            </div>
-          </div>
-        </div>
-
-        <div class="card">
-          <div class="card-title">
-            <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M20.59 13.41L13.42 20.58a2 2 0 01-2.83 0L2 12V2h10l8.59 8.59a2 2 0 010 2.82z"/><line x1="7" y1="7" x2="7.01" y2="7"/></svg></span>
-            {{ t('tags.title') or 'Tags' }}
-          </div>
-          <div style="display:flex;flex-direction:column;gap:12px;margin-top:14px">
-            <div style="font-size:12px;color:var(--text-3)">{{ t('tags.subtitle') or 'Zentrale Verwaltung aller Peer-Tags' }}</div>
-            <div id="tags-list"></div>
-            <div style="display:flex;flex-direction:column;gap:8px;padding-top:8px;border-top:1px solid var(--border)">
-              <input type="text" id="tag-name" placeholder="{{ t('tags.name_placeholder') or 'Tag-Name' }}" style="width:100%;padding:8px 12px;font-size:12px" maxlength="64" autocomplete="off">
-              <div id="tag-error" class="form-error" style="display:none"></div>
-              <button class="btn btn-primary" id="btn-add-tag" style="align-self:flex-start">{{ t('tags.add') or 'Tag anlegen' }}</button>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="card">
-        <div class="card-title">
-          <span class="ic" style="color:var(--red);background:var(--red-bg)"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg></span>
-          {{ t('settings.danger_zone') }}
-        </div>
-        <div style="margin-top:14px">
-          <button class="btn btn-danger" style="width:100%;justify-content:center" id="btn-clear-logs">{{ t('settings.clear_logs') }}</button>
-        </div>
-      </div>
-    </div>
 
-    <div class="span6" style="display:flex;flex-direction:column;gap:14px">
       <div class="card">
         <div class="card-title">
           <span class="ic"><svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="17" cy="7" r="3"/><circle cx="7" cy="17" r="3"/><path d="M14 10l-4 4"/><circle cx="7" cy="7" r="3"/><circle cx="17" cy="17" r="3"/></svg></span>
diff --git a/tests/aurora_theme.test.js b/tests/aurora_theme.test.js
index 364a9e51..3ec87543 100644
--- a/tests/aurora_theme.test.js
+++ b/tests/aurora_theme.test.js
@@ -1334,3 +1334,247 @@ describe('aurora theme — profile layout (Task P2-12)', () => {
     assert.ok(de['profile.security_display'], 'profile.security_display present in de.json');
   });
 });
+
+// ── UX-fixes: Dashboard donut gauges + bug fixes ─────────────────────────────
+describe('aurora theme — dashboard UX fixes (ux-dash)', () => {
+  it('dashboard.njk has #cpu-donut and #ram-donut SVG elements', async () => {
+    selectAurora();
+    const res = await agent.get('/dashboard').expect(200);
+    assert.match(res.text, /id="cpu-donut"/, '#cpu-donut SVG present in aurora dashboard');
+    assert.match(res.text, /id="ram-donut"/, '#ram-donut SVG present in aurora dashboard');
+    // Both donuts must contain the .val arc circle
+    assert.match(res.text, /id="cpu-donut"[\s\S]{0,400}class="val"/, '#cpu-donut has .val arc');
+    assert.match(res.text, /id="ram-donut"[\s\S]{0,400}class="val"/, '#ram-donut has .val arc');
+  });
+
+  it('dashboard.njk still has all required resource IDs after donut redesign', async () => {
+    selectAurora();
+    const res = await agent.get('/dashboard').expect(200);
+    assert.match(res.text, /id="cpu-pct"/, '#cpu-pct present inside donut center');
+    assert.match(res.text, /id="cpu-info"/, '#cpu-info present');
+    assert.match(res.text, /id="cpu-bar"/, '#cpu-bar present (hidden, for JS contract)');
+    assert.match(res.text, /id="ram-pct"/, '#ram-pct present inside donut center');
+    assert.match(res.text, /id="ram-info"/, '#ram-info present');
+    assert.match(res.text, /id="ram-bar"/, '#ram-bar present (hidden, for JS contract)');
+  });
+
+  it('dashboard.js uses /api/v1/pihole/summary (not the wrong /api/pihole/stats)', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'dashboard.js'), 'utf8');
+    assert.match(js, /\/api\/v1\/pihole\/summary/, 'dashboard.js fetches /api/v1/pihole/summary');
+    assert.doesNotMatch(js, /\/api\/pihole\/stats/, '/api/pihole/stats (wrong URL) absent');
+  });
+
+  it('dashboard.js has auroraRefreshResources() and auroraSetResourceDonut() functions', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'dashboard.js'), 'utf8');
+    assert.match(js, /function auroraRefreshResources\(/, 'auroraRefreshResources() present');
+    assert.match(js, /function auroraSetResourceDonut\(/, 'auroraSetResourceDonut() present');
+    assert.match(js, /if \(isAurora\(\)\) return auroraRefreshResources/, 'refreshResources() has isAurora guard');
+  });
+
+  it('aurora.css has .res-gauge-wrap and .res-gauge-info rules', () => {
+    const css = fs.readFileSync(path.join(__dirname, '..', 'public', 'css', 'aurora.css'), 'utf8');
+    assert.match(css, /\.res-gauge-wrap\b/, '.res-gauge-wrap rule in aurora.css');
+    assert.match(css, /\.res-gauge-info\b/, '.res-gauge-info rule in aurora.css');
+  });
+});
+
+// ── UX-fixes: Peers gateway card — badge inside, gear-edit, card→detail nav ──
+describe('aurora theme — peers gateway card UX fixes (Issues 5/6/7)', () => {
+  it('auroraRenderGatewayCard builds badge inside the card using DOM (not detached)', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'peers.js'), 'utf8');
+    // Badge is created with DOM createElement and appended inside uh (card header)
+    assert.match(js, /badge\.className\s*=\s*statusClass/, 'badge.className assigned from statusClass inside auroraRenderGatewayCard');
+    assert.match(js, /right\.appendChild\(badge\)/, 'badge appended to the right-side header span (inside card)');
+    // The "right" span is added to uh (header row), which is added to unit (card)
+    assert.match(js, /uh\.appendChild\(right\)/, 'right span appended to uh header row');
+    assert.match(js, /unit\.appendChild\(uh\)/, 'uh header row appended to unit card');
+  });
+
+  it('auroraRenderGatewayCard emits a gear button with data-action="edit" and data-id=peer_id', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'peers.js'), 'utf8');
+    // Gear button gets setAttribute('data-action', 'edit')
+    assert.match(js, /gearBtn\.setAttribute\('data-action',\s*'edit'\)/, "gear button has data-action='edit'");
+    assert.match(js, /gearBtn\.setAttribute\('data-id',\s*String\(gw\.peer_id\)\)/, 'gear button data-id is String(gw.peer_id)');
+    // Gear button is appended inside the right span (inside card header)
+    assert.match(js, /right\.appendChild\(gearBtn\)/, 'gear button appended inside card header');
+  });
+
+  it('auroraRenderGatewayCard gear button stops propagation and calls showEditModal', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'peers.js'), 'utf8');
+    assert.match(js, /e\.stopPropagation\(\)[\s\S]{0,40}showEditModal\(gw\.peer_id\)/, 'gear click: stopPropagation then showEditModal(gw.peer_id)');
+  });
+
+  it('auroraRenderGatewayCard sets dataset.gwDetail for test assertions and a11y', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'peers.js'), 'utf8');
+    assert.match(js, /unit\.dataset\.gwDetail\s*=\s*'\/gateways#gw\/'/, "unit.dataset.gwDetail set to '/gateways#gw/' prefix");
+  });
+
+  it('auroraRenderGatewayCard card click navigates to /gateways#gw/<id> (Issue 7)', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'peers.js'), 'utf8');
+    assert.match(js, /window\.location\.href\s*=\s*'\/gateways#gw\/'/, "card click sets window.location.href to '/gateways#gw/' + peer_id");
+    // Must NOT call showEditModal on card click (that's now the gear's job)
+    // Check: the card-click listener no longer contains showEditModal (the gear listener has it)
+    // We verify this by checking that the card-click handler only has window.location.href
+    const cardClickMatch = js.match(/unit\.addEventListener\('click',\s*function\(e\)\s*\{([\s\S]*?)\}\);/g);
+    assert.ok(cardClickMatch, 'unit addEventListener click handler present');
+    const hasNav = cardClickMatch.some(function(s) { return /window\.location\.href/.test(s); });
+    assert.ok(hasNav, 'card-click handler navigates via window.location.href');
+  });
+
+  it('auroraRenderGatewayCard card click uses button/a guard (gear and badge excluded from nav)', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'peers.js'), 'utf8');
+    // Card click guard: e.target.closest('button, a') prevents nav when gear is clicked
+    assert.match(js, /e\.target\.closest\('button,\s*a'\)[\s\S]{0,20}return/, 'card-click has button/a closest guard before nav');
+  });
+
+  it('i18n has peers.gateway.action_edit_gear in both en.json and de.json', () => {
+    const en = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'src', 'i18n', 'en.json'), 'utf8'));
+    const de = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'src', 'i18n', 'de.json'), 'utf8'));
+    assert.ok(en['peers.gateway.action_edit_gear'], 'peers.gateway.action_edit_gear present in en.json');
+    assert.ok(de['peers.gateway.action_edit_gear'], 'peers.gateway.action_edit_gear present in de.json');
+  });
+});
+
+// ── UX-fixes: Gateways fleet card + detail (Issues 8/9/10/11) ────────────────
+describe('aurora theme — gateways UX fixes (Issues 8/9/10/11)', () => {
+  it('Issue 8: auroraCard builds badge inside card header using right container', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'gateways.js'), 'utf8');
+    // stTag appended to right container, right container appended to uh (inside card)
+    assert.match(js, /right\.appendChild\(stTag\)/, 'badge (stTag) appended to right container');
+    assert.match(js, /uh\.appendChild\(right\)/, 'right container appended to uh header row (inside card)');
+  });
+
+  it('Issue 9: aurora.css has .tag.tag-dot::after (dot after text) and suppresses ::before', () => {
+    const css = fs.readFileSync(path.join(__dirname, '..', 'public', 'css', 'aurora.css'), 'utf8');
+    assert.match(css, /\.tag\.tag-dot::after/, '.tag.tag-dot::after present (dot positioned after text)');
+    assert.match(css, /\.tag\.tag-dot::before\s*\{[^}]*content:\s*none/, '.tag.tag-dot::before has content:none (before-dot suppressed)');
+  });
+
+  it('Issue 10: auroraVersionsCard() present and called from auroraRenderDetail()', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'gateways.js'), 'utf8');
+    assert.match(js, /function auroraVersionsCard\(/, 'auroraVersionsCard() present in gateways.js');
+    assert.match(js, /grid2\.appendChild\(auroraVersionsCard\(g\)\)/, 'auroraRenderDetail() calls auroraVersionsCard(g)');
+  });
+
+  it('Issue 11: auroraRenderDetail uses gw-detail-grid and aurora.css has responsive column rule', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'gateways.js'), 'utf8');
+    const css = fs.readFileSync(path.join(__dirname, '..', 'public', 'css', 'aurora.css'), 'utf8');
+    assert.match(js, /el\('div',\s*'gw-detail-grid'\)/, 'auroraRenderDetail() uses gw-detail-grid class');
+    assert.match(css, /\.gw-detail-grid\s*\{[^}]*repeat\(auto-fit,minmax\(280px,1fr\)\)/, 'gw-detail-grid uses responsive auto-fit column layout');
+  });
+});
+
+// ── UX-fixes: RDP page (Issues 12/13/14/15/16) ───────────────────────────────
+describe('aurora theme — rdp UX fixes (Issues 12/13/14/15/16)', () => {
+  it('Issue 12: auroraRenderGrid uses rdp-card-grid container (not span6/full-width)', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'rdp.js'), 'utf8');
+    const css = fs.readFileSync(path.join(__dirname, '..', 'public', 'css', 'aurora.css'), 'utf8');
+    // Container must use rdp-card-grid, not grid (which yields span6 half-width cards)
+    assert.match(js, /container\.className\s*=\s*'rdp-card-grid'/, "auroraRenderGrid uses 'rdp-card-grid' container");
+    // Cards must not use span6 (which is half-width in 12-col grid)
+    assert.doesNotMatch(js, /card\.className\s*=\s*'card span6'/, "card.className no longer uses 'card span6'");
+    // aurora.css must define the grid rule with auto-fill
+    assert.match(css, /\.rdp-card-grid\s*\{[^}]*auto-fill/, 'aurora.css .rdp-card-grid uses auto-fill grid');
+  });
+
+  it('Issue 13: status badge built inside card header (cardTitle) with tag-dot (text-left-of-dot)', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'rdp.js'), 'utf8');
+    // Status tag is appended to cardTitle (inside header), not to a separate health kv row
+    assert.match(js, /statusTag\.style\.marginLeft\s*=\s*'auto'/, 'statusTag has margin-left:auto (pushed to header right)');
+    assert.match(js, /cardTitle\.appendChild\(statusTag\)/, 'statusTag appended to cardTitle (inside card header)');
+    // Uses tag-dot class (text left of dot via ::after in aurora.css)
+    assert.match(js, /statusTag\.className\s*=\s*'tag tag-green tag-dot'/, 'online state uses tag-green tag-dot');
+    assert.match(js, /statusTag\.className\s*=\s*'tag tag-red tag-dot'/, 'offline state uses tag-red tag-dot');
+  });
+
+  it('Issue 14: browser session button wired to /rdp/:id/session (real mechanism)', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'rdp.js'), 'utf8');
+    // Button only shown when browser_enabled + browser_sessions licensed
+    assert.match(js, /r\.browser_enabled && GC\.features && GC\.features\.browser_sessions/, 'browser button gated on browser_enabled+license');
+    // Opens the real session URL
+    assert.match(js, /window\.open\('\/rdp\/' \+ id \+ '\/session'/, "browser button opens '/rdp/:id/session'");
+  });
+
+  it('Issue 15: aurora rdp.njk has all 6 browser checkbox ids', () => {
+    const njk = fs.readFileSync(path.join(__dirname, '..', 'templates', 'aurora', 'pages', 'rdp.njk'), 'utf8');
+    assert.match(njk, /id="rdp-browser-clipboard"/, 'rdp-browser-clipboard present in aurora rdp.njk');
+    assert.match(njk, /id="rdp-browser-sftp"/, 'rdp-browser-sftp present in aurora rdp.njk');
+    assert.match(njk, /id="rdp-sftp-disable-download"/, 'rdp-sftp-disable-download present in aurora rdp.njk');
+    assert.match(njk, /id="rdp-sftp-disable-upload"/, 'rdp-sftp-disable-upload present in aurora rdp.njk');
+    assert.match(njk, /id="rdp-browser-audio-rdp"/, 'rdp-browser-audio-rdp present in aurora rdp.njk');
+    assert.match(njk, /id="rdp-browser-audio-vnc"/, 'rdp-browser-audio-vnc present in aurora rdp.njk');
+    // Also check the SFTP text inputs needed by populate code (lines 1053-1062)
+    assert.match(njk, /id="rdp-sftp-host"/, 'rdp-sftp-host present (populate code sets .value)');
+    assert.match(njk, /id="rdp-audio-servername"/, 'rdp-audio-servername present (populate code sets .value)');
+  });
+
+  it('Issue 15: aurora rdp template renders (200) with all browser-section ids visible in HTML', async () => {
+    selectAurora();
+    const res = await agent.get('/rdp').expect(200);
+    assert.match(res.text, /id="rdp-browser-clipboard"/, 'rdp-browser-clipboard in rendered HTML');
+    assert.match(res.text, /id="rdp-browser-sftp"/, 'rdp-browser-sftp in rendered HTML');
+    assert.match(res.text, /id="rdp-sftp-disable-download"/, 'rdp-sftp-disable-download in rendered HTML');
+    assert.match(res.text, /id="rdp-sftp-disable-upload"/, 'rdp-sftp-disable-upload in rendered HTML');
+    assert.match(res.text, /id="rdp-browser-audio-rdp"/, 'rdp-browser-audio-rdp in rendered HTML');
+    assert.match(res.text, /id="rdp-browser-audio-vnc"/, 'rdp-browser-audio-vnc in rendered HTML');
+  });
+
+  it('Issue 16: aurora check handler uses isAurora() branch — color+icon, not big text', () => {
+    const js = fs.readFileSync(path.join(__dirname, '..', 'public', 'js', 'rdp.js'), 'utf8');
+    // Must have isAurora() branch inside check handler
+    assert.match(js, /if \(isAurora\(\)\)[\s\S]{0,200}checkBtn\.style\.color/, 'isAurora() branch sets color on checkBtn');
+    // Aurora branch sets innerHTML (icon), not textContent
+    assert.match(js, /checkBtn\.innerHTML\s*=\s*result\.online/, 'Aurora branch sets innerHTML to status icon on check result');
+    // Non-aurora path still sets textContent
+    assert.match(js, /checkBtn\.textContent\s*=\s*result\.online/, 'non-aurora branch still sets textContent');
+  });
+});
+
+// ── UX-fixes: Settings + sidebar chrome (Issues 17/18/19) ────────────────────
+describe('aurora theme — settings + sidebar UX fixes (Issues 17/18/19)', () => {
+  it('Issue 17: settings default-theme picker has an aurora button (data-default-theme=aurora)', async () => {
+    selectAurora();
+    const res = await agent.get('/settings').expect(200);
+    assert.match(res.text, /data-default-theme="aurora"/, 'aurora theme button present in default-theme picker');
+  });
+
+  it('Issue 17: aurora settings.njk has data-default-theme="aurora" button in source', () => {
+    const njk = fs.readFileSync(
+      path.join(__dirname, '..', 'templates', 'aurora', 'pages', 'settings.njk'),
+      'utf8'
+    );
+    assert.match(njk, /data-default-theme="aurora"/, 'aurora button present in settings.njk template');
+  });
+
+  it('Issue 18: aurora.css scopes align-items:start to settings panels (no card stretching)', () => {
+    const css = fs.readFileSync(
+      path.join(__dirname, '..', 'public', 'css', 'aurora.css'),
+      'utf8'
+    );
+    assert.match(css, /\.settings-panel\s+\.grid\s*\{[^}]*align-items\s*:\s*start/, '.settings-panel .grid has align-items:start');
+  });
+
+  it('Issue 19: aurora.css .sidebar rule has position:static (sidebar stays in grid flow)', () => {
+    const css = fs.readFileSync(
+      path.join(__dirname, '..', 'public', 'css', 'aurora.css'),
+      'utf8'
+    );
+    // Verify desktop .sidebar has position:static (overrides pro.css position:fixed)
+    assert.match(css, /\.sidebar\s*\{[^}]*position\s*:\s*static/, '.sidebar rule has position:static');
+    // Verify mobile media query is still present (drawer still works)
+    assert.match(css, /max-width\s*:\s*980px/, 'mobile 980px media query present');
+    // Both position:static (desktop) and position:fixed (mobile drawer) must co-exist in the file
+    assert.ok(
+      css.includes('position:static') && css.includes('position:fixed'),
+      'aurora.css has both position:static (desktop sidebar) and position:fixed (mobile drawer)'
+    );
+  });
+
+  it('Issue 19: app shell still renders with sidebar in grid after position:static fix', async () => {
+    selectAurora();
+    const res = await agent.get('/dashboard').expect(200);
+    // .app-brand must be present in the rendered HTML (not hidden because sidebar covers it)
+    assert.match(res.text, /class="app-brand"/, '.app-brand present in aurora dashboard HTML');
+    assert.match(res.text, /class="[^"]*app[^"]*"/, '.app shell present');
+  });
+});