diff --git a/templates/icon-dark.svg b/templates/icon-dark.svg
index 94caf5d6..c18c2a82 100644
--- a/templates/icon-dark.svg
+++ b/templates/icon-dark.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="1024" height="1024" role="img" aria-label="Stackyard">
-<g transform="translate(512,512) scale(1.135814) translate(-528.50,-518.50)"><g transform="translate(0,1024) scale(0.1,-0.1)"><path fill="#00D2E0" d="M4978 9180 c-75 -13 -146 -39 -233 -83 -112 -57 -244 -190 -302 -302 -70 -135 -88 -210 -88 -360 0 -150 18 -225 88 -360 58 -112 190 -244 302 -302 141 -72 193 -84 430 -93 354 -15 602 -64 885 -177 803 -319 1400 -1028 1569 -1863 39 -195 46 -272 46 -520 0 -155 -5 -278 -14 -335 -50 -332 -129 -578 -281 -870 -108 -207 -125 -266 -125 -430 0 -150 18 -225 88 -360 58 -112 190 -244 302 -302 135 -70 210 -88 360 -88 108 0 143 4 205 24 174 54 330 167 424 309 65 100 195 366 269 552 135 343 219 677 263 1055 13 111 18 226 18 445 0 318 -13 473 -60 730 -102 550 -309 1064 -617 1525 -668 1002 -1742 1656 -2937 1790 -169 19 -524 28 -592 15z"/><path fill="#F2F2F7" d="M2131 7549 c-287 -51 -529 -264 -623 -549 -29 -87 -32 -106 -32 -230 0 -111 3 -149 22 -213 55 -191 173 -354 330 -454 32 -21 426 -249 875 -508 707 -407 814 -472 799 -483 -9 -7 -396 -232 -861 -500 -747 -431 -852 -495 -917 -555 -314 -293 -338 -763 -56 -1104 85 -103 257 -210 402 -249 47 -13 102 -18 195 -18 146 0 214 14 330 69 39 18 441 247 894 509 453 262 826 476 828 476 1 0 3 -445 3 -989 0 -1079 -1 -1063 58 -1213 77 -199 249 -369 448 -444 470 -177 976 104 1070 593 12 63 14 339 14 1723 0 1064 -4 1685 -10 1751 -25 247 -119 435 -284 571 -61 51 -2844 1666 -3014 1749 -40 21 -104 45 -140 54 -79 20 -255 28 -331 14z"/></g></g>
+<g transform="translate(512,512) scale(1.135814) translate(-528.50,-518.50)"><path fill="#00D2E0" d="M512 105.5A406.5 406.5 0 0 1 864.04 715.25A75.5 75.5 0 0 1 733.27 639.75A255.5 255.5 0 0 0 512 256.5A75.5 75.5 0 0 1 512 105.5Z"/><path fill="#F2F2F7" d="M551.5 443.58L264.85 278.08A79 79 0 0 0 185.85 414.92L472.5 580.42A79 79 0 0 0 551.5 443.58ZM472.5 443.58L185.85 609.08A79 79 0 0 0 264.85 745.92L551.5 580.42A79 79 0 0 0 472.5 443.58ZM433 512L433 843A79 79 0 0 0 591 843L591 512A79 79 0 0 0 433 512Z"/></g>
 </svg>
diff --git a/templates/icon-light.svg b/templates/icon-light.svg
index 99221344..ce61ab89 100644
--- a/templates/icon-light.svg
+++ b/templates/icon-light.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="1024" height="1024" role="img" aria-label="Stackyard">
-<g transform="translate(512,512) scale(1.135814) translate(-528.50,-518.50)"><g transform="translate(0,1024) scale(0.1,-0.1)"><path fill="#00D2E0" d="M4978 9180 c-75 -13 -146 -39 -233 -83 -112 -57 -244 -190 -302 -302 -70 -135 -88 -210 -88 -360 0 -150 18 -225 88 -360 58 -112 190 -244 302 -302 141 -72 193 -84 430 -93 354 -15 602 -64 885 -177 803 -319 1400 -1028 1569 -1863 39 -195 46 -272 46 -520 0 -155 -5 -278 -14 -335 -50 -332 -129 -578 -281 -870 -108 -207 -125 -266 -125 -430 0 -150 18 -225 88 -360 58 -112 190 -244 302 -302 135 -70 210 -88 360 -88 108 0 143 4 205 24 174 54 330 167 424 309 65 100 195 366 269 552 135 343 219 677 263 1055 13 111 18 226 18 445 0 318 -13 473 -60 730 -102 550 -309 1064 -617 1525 -668 1002 -1742 1656 -2937 1790 -169 19 -524 28 -592 15z"/><path fill="#1C1C1E" d="M2131 7549 c-287 -51 -529 -264 -623 -549 -29 -87 -32 -106 -32 -230 0 -111 3 -149 22 -213 55 -191 173 -354 330 -454 32 -21 426 -249 875 -508 707 -407 814 -472 799 -483 -9 -7 -396 -232 -861 -500 -747 -431 -852 -495 -917 -555 -314 -293 -338 -763 -56 -1104 85 -103 257 -210 402 -249 47 -13 102 -18 195 -18 146 0 214 14 330 69 39 18 441 247 894 509 453 262 826 476 828 476 1 0 3 -445 3 -989 0 -1079 -1 -1063 58 -1213 77 -199 249 -369 448 -444 470 -177 976 104 1070 593 12 63 14 339 14 1723 0 1064 -4 1685 -10 1751 -25 247 -119 435 -284 571 -61 51 -2844 1666 -3014 1749 -40 21 -104 45 -140 54 -79 20 -255 28 -331 14z"/></g></g>
+<g transform="translate(512,512) scale(1.135814) translate(-528.50,-518.50)"><path fill="#00D2E0" d="M512 105.5A406.5 406.5 0 0 1 864.04 715.25A75.5 75.5 0 0 1 733.27 639.75A255.5 255.5 0 0 0 512 256.5A75.5 75.5 0 0 1 512 105.5Z"/><path fill="#1C1C1E" d="M551.5 443.58L264.85 278.08A79 79 0 0 0 185.85 414.92L472.5 580.42A79 79 0 0 0 551.5 443.58ZM472.5 443.58L185.85 609.08A79 79 0 0 0 264.85 745.92L551.5 580.42A79 79 0 0 0 472.5 443.58ZM433 512L433 843A79 79 0 0 0 591 843L591 512A79 79 0 0 0 433 512Z"/></g>
 </svg>
diff --git a/templates/icon.svg b/templates/icon.svg
index 3c2ecbb9..c9e18367 100644
--- a/templates/icon.svg
+++ b/templates/icon.svg
@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="1024" height="1024" role="img" aria-label="Stackyard">
 <rect width="1024" height="1024" rx="228" ry="228" fill="#1C1C1E"/>
-<g transform="translate(512,512) scale(0.749154) translate(-528.50,-518.50)"><g transform="translate(0,1024) scale(0.1,-0.1)"><path fill="#00D2E0" d="M4978 9180 c-75 -13 -146 -39 -233 -83 -112 -57 -244 -190 -302 -302 -70 -135 -88 -210 -88 -360 0 -150 18 -225 88 -360 58 -112 190 -244 302 -302 141 -72 193 -84 430 -93 354 -15 602 -64 885 -177 803 -319 1400 -1028 1569 -1863 39 -195 46 -272 46 -520 0 -155 -5 -278 -14 -335 -50 -332 -129 -578 -281 -870 -108 -207 -125 -266 -125 -430 0 -150 18 -225 88 -360 58 -112 190 -244 302 -302 135 -70 210 -88 360 -88 108 0 143 4 205 24 174 54 330 167 424 309 65 100 195 366 269 552 135 343 219 677 263 1055 13 111 18 226 18 445 0 318 -13 473 -60 730 -102 550 -309 1064 -617 1525 -668 1002 -1742 1656 -2937 1790 -169 19 -524 28 -592 15z"/><path fill="#F2F2F7" d="M2131 7549 c-287 -51 -529 -264 -623 -549 -29 -87 -32 -106 -32 -230 0 -111 3 -149 22 -213 55 -191 173 -354 330 -454 32 -21 426 -249 875 -508 707 -407 814 -472 799 -483 -9 -7 -396 -232 -861 -500 -747 -431 -852 -495 -917 -555 -314 -293 -338 -763 -56 -1104 85 -103 257 -210 402 -249 47 -13 102 -18 195 -18 146 0 214 14 330 69 39 18 441 247 894 509 453 262 826 476 828 476 1 0 3 -445 3 -989 0 -1079 -1 -1063 58 -1213 77 -199 249 -369 448 -444 470 -177 976 104 1070 593 12 63 14 339 14 1723 0 1064 -4 1685 -10 1751 -25 247 -119 435 -284 571 -61 51 -2844 1666 -3014 1749 -40 21 -104 45 -140 54 -79 20 -255 28 -331 14z"/></g></g>
+<g transform="translate(512,512) scale(0.749154) translate(-528.50,-518.50)"><path fill="#00D2E0" d="M512 105.5A406.5 406.5 0 0 1 864.04 715.25A75.5 75.5 0 0 1 733.27 639.75A255.5 255.5 0 0 0 512 256.5A75.5 75.5 0 0 1 512 105.5Z"/><path fill="#F2F2F7" d="M551.5 443.58L264.85 278.08A79 79 0 0 0 185.85 414.92L472.5 580.42A79 79 0 0 0 551.5 443.58ZM472.5 443.58L185.85 609.08A79 79 0 0 0 264.85 745.92L551.5 580.42A79 79 0 0 0 472.5 443.58ZM433 512L433 843A79 79 0 0 0 591 843L591 512A79 79 0 0 0 433 512Z"/></g>
 </svg>
diff --git a/tsconfig.frontend.json b/tsconfig.frontend.json
index a402ace3..6b0cf4bb 100644
--- a/tsconfig.frontend.json
+++ b/tsconfig.frontend.json
@@ -303,12 +303,6 @@
         "./ui/js/spotlight.js"
       ],
 
-      "/js/brand-mark.js": [
-        "./ui/js/brand-mark.js"
-      ],
-      "/js/brand-mark.js?v=*": [
-        "./ui/js/brand-mark.js"
-      ],
       "/js/settings-icon.js": [
         "./ui/js/settings-icon.js"
       ],
diff --git a/ui/admin/index.html b/ui/admin/index.html
index 2de61aaf..d48f212d 100644
--- a/ui/admin/index.html
+++ b/ui/admin/index.html
@@ -11,7 +11,7 @@
   <script src="/js/mobile-class.js?v=fe95da0d"></script>
   <script src="/js/admin-theme.js?v=66565254"></script>
   <link rel="stylesheet" href="/css/tokens.css?v=0f4ba0b8">
-  <link rel="stylesheet" href="/css/admin.css?v=03e2f74a">
+  <link rel="stylesheet" href="/css/admin.css?v=3ddff8cc">
   <link rel="stylesheet" href="/css/widget-config-form.css?v=53b91d5f">
 </head>
 <body>
@@ -21,7 +21,7 @@
   <!-- Sidebar -->
   <nav class="sb" aria-label="Settings navigation" data-i18n-al="nav.navigation">
     <a class="sb-brand" href="/" aria-label="Back to dashboard" data-i18n-al="nav.backToDashboard">
-      <svg width="30" height="30" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" aria-hidden="true"><path fill="var(--accent)" d="M512 105.5A406.5 406.5 0 0 1 864.04 715.25A75.5 75.5 0 0 1 733.27 639.75A255.5 255.5 0 0 0 512 256.5A75.5 75.5 0 0 1 512 105.5Z"/><path fill="var(--tx)" d="M551.5 443.58L264.85 278.08A79 79 0 0 0 185.85 414.92L472.5 580.42A79 79 0 0 0 551.5 443.58ZM472.5 443.58L185.85 609.08A79 79 0 0 0 264.85 745.92L551.5 580.42A79 79 0 0 0 472.5 443.58ZM433 512L433 843A79 79 0 0 0 591 843L591 512A79 79 0 0 0 433 512Z"/></svg>
+      <svg class="sy-icon brand-logo" width="30" height="30" aria-hidden="true" focusable="false"><use href="#sy-solid-logo"/></svg>
       <div>
         <div class="sb-name">Stackyard</div>
         <div class="sb-ver" id="sidebar-version"></div>
@@ -220,7 +220,7 @@ <h1 class="sec-title" id="ev-title">General</h1>
       <div class="sec-hdr"><a class="m-back" href="/" aria-label="Back to dashboard" data-i18n-al="nav.backToDashboard"><svg class="sy-icon" width="18" height="18" aria-hidden="true" focusable="false"><use href="#sy-solid-back"/></svg></a><h1 class="sec-title" data-i18n="nav.about">About</h1></div>
       <div class="about-hero">
         <div class="about-ic-wrap">
-          <svg width="64" height="64" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" aria-hidden="true"><path fill="var(--accent)" d="M512 105.5A406.5 406.5 0 0 1 864.04 715.25A75.5 75.5 0 0 1 733.27 639.75A255.5 255.5 0 0 0 512 256.5A75.5 75.5 0 0 1 512 105.5Z"/><path fill="var(--tx)" d="M551.5 443.58L264.85 278.08A79 79 0 0 0 185.85 414.92L472.5 580.42A79 79 0 0 0 551.5 443.58ZM472.5 443.58L185.85 609.08A79 79 0 0 0 264.85 745.92L551.5 580.42A79 79 0 0 0 472.5 443.58ZM433 512L433 843A79 79 0 0 0 591 843L591 512A79 79 0 0 0 433 512Z"/></svg>
+          <svg class="sy-icon brand-logo" width="64" height="64" aria-hidden="true" focusable="false"><use href="#sy-solid-logo"/></svg>
           <div class="about-dot d-none" id="about-update-dot" title="Update available" data-i18n-title="about.updateAvailable">
             <svg class="sy-icon" width="10" height="10" aria-hidden="true" focusable="false"><use href="#sy-solid-up"/></svg>
           </div>
@@ -292,6 +292,6 @@ <h1 class="sec-title" id="ev-title">General</h1>
   </div></div>
 </div>
 
-<script type="module" src="/js/admin.js?v=eb673e33"></script>
+<script type="module" src="/js/admin.js?v=1f6569de"></script>
 </body>
 </html>
diff --git a/ui/css/admin.css b/ui/css/admin.css
index f67cfd40..12b39776 100644
--- a/ui/css/admin.css
+++ b/ui/css/admin.css
@@ -453,6 +453,7 @@ html[data-theme="light"] .cc-kw-clear{background:radial-gradient(circle at 32% 2
 .about-dot{position:absolute;top:-3px;inset-inline-end:-5px;width:20px;height:20px;background:var(--gn);border-radius:50%;border:2px solid var(--cp);display:flex;align-items:center;justify-content:center;color:var(--on-fill)}
 .about-name{font-size:var(--fs-title-2);line-height:var(--lh-title-2);letter-spacing:var(--tr-title-2);font-weight:700;}
 .about-ver{font-size:var(--fs-footnote);line-height:var(--lh-footnote);letter-spacing:var(--tr-footnote);color:var(--dm);margin-top:3px}
+.sy-icon.brand-logo{color:var(--tx);--icon-accent:var(--accent)}
 /* Orange and green fall below 3:1 behind white. Do not use them here. */
 .sy-icon.about-ri{flex-shrink:0;box-sizing:content-box;width:18px;height:18px;padding:6px;border-radius:7px;color:#FFFFFF;--icon-accent:#FFFFFF;background:var(--sy-gray)}
 .grp:has(.about-ri) .row::after{inset-inline-start:56px}
diff --git a/ui/css/dashboard.css b/ui/css/dashboard.css
index 226314f2..b23c732e 100644
--- a/ui/css/dashboard.css
+++ b/ui/css/dashboard.css
@@ -846,7 +846,8 @@
   pointer-events: none;
 }
 .empty-state-mark {
-  width: clamp(84px, 13vh, 132px); height: auto;
+  width: clamp(71px, 11vh, 112px); height: clamp(71px, 11vh, 112px);
+  color: var(--label-primary);
   margin-block-end: var(--sp-32);
 }
 .empty-state-title {
diff --git a/ui/icons/favicon-maskable.png b/ui/icons/favicon-maskable.png
index 047b6e5f..a73e2499 100644
Binary files a/ui/icons/favicon-maskable.png and b/ui/icons/favicon-maskable.png differ
diff --git a/ui/index.html b/ui/index.html
index f9742f33..10aa5876 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -26,7 +26,7 @@
   <script src="/js/admin-theme.js?v=66565254"></script>
   <title>Stackyard</title>
   <link rel="stylesheet" href="/css/tokens.css?v=0f4ba0b8">
-  <link rel="stylesheet" href="/css/dashboard.css?v=982a82c8">
+  <link rel="stylesheet" href="/css/dashboard.css?v=b4ee81e3">
 </head>
 <body>
 <header class="visually-hidden"><h1>Stackyard</h1></header>
@@ -55,5 +55,5 @@
     </div>
   </div>
 </dialog>
-<script type="module" src="/js/dashboard.js?v=688fb224"></script>
+<script type="module" src="/js/dashboard.js?v=c633e276"></script>
 </body></html>
diff --git a/ui/js/admin-app-form.js b/ui/js/admin-app-form.js
index ff9eaeb0..80e432fb 100644
--- a/ui/js/admin-app-form.js
+++ b/ui/js/admin-app-form.js
@@ -1,4 +1,4 @@
-import { clr, el, inp as inpById, q as qSel, qa, qi, tgt } from '/js/utils.js?v=eadafbcd';
+import { clr, el, inp as inpById, q as qSel, qa, qi, tgt } from '/js/utils.js?v=7d0a2f7d';
 import { html, raw, setHtml } from '/js/html.js?v=c71f8903';
 import { loadLocalIcons, resolveIcon, iconChain, cdnIconRef, splitIconRef } from '/js/icons.js?v=9c8c550c';
 import { state } from '/js/admin-state.js?v=831e219e';
@@ -21,13 +21,13 @@ import {
   reveal,
   setTogDisabled,
   swapContent,
-} from '/js/admin-shared.js?v=d2e8b6dc';
-import { createListbox } from '/js/listbox.js?v=f057351d';
+} from '/js/admin-shared.js?v=9d789975';
+import { createListbox } from '/js/listbox.js?v=c14ab216';
 import { MAX_LABELS } from '/js/badge-logic.js?v=9e6d9d4b';
-import { renderColorControl, BADGE_DEFAULT } from '/js/admin-color-control.js?v=e963853a';
+import { renderColorControl, BADGE_DEFAULT } from '/js/admin-color-control.js?v=15d6a495';
 import { badgeErrorAdvice, TONE } from '/js/admin-error.js?v=e4ea7820';
 import { fluidHoverClear, fluidHoverKb } from '/js/fluid-hover.js?v=cb886e86';
-import { iconSvg } from '/js/icon-set.js?v=08b74a28';
+import { iconSvg } from '/js/icon-set.js?v=34af798f';
 
 export function buildFolderForm(body, item) {
   const children = item?.children || [];
diff --git a/ui/js/admin-auth.js b/ui/js/admin-auth.js
index bf268073..f728468b 100644
--- a/ui/js/admin-auth.js
+++ b/ui/js/admin-auth.js
@@ -1,7 +1,7 @@
-import { apiGet, apiPost } from '/js/admin-shared.js?v=d2e8b6dc';
+import { apiGet, apiPost } from '/js/admin-shared.js?v=9d789975';
 import { t } from '/js/i18n.js?v=1f1ea9c1';
 import { pwStrength } from '/js/password-strength.js?v=42f45ac7';
-import { el, inp as inpById, qa } from '/js/utils.js?v=eadafbcd';
+import { el, inp as inpById, qa } from '/js/utils.js?v=7d0a2f7d';
 
 export async function checkAuth(onLogin) {
   try {
diff --git a/ui/js/admin-color-control.js b/ui/js/admin-color-control.js
index 18a7e73c..8906f92c 100644
--- a/ui/js/admin-color-control.js
+++ b/ui/js/admin-color-control.js
@@ -1,8 +1,8 @@
-import { PE_SVG, initInlineEdit, toast, reveal } from '/js/admin-shared.js?v=d2e8b6dc';
+import { PE_SVG, initInlineEdit, toast, reveal } from '/js/admin-shared.js?v=9d789975';
 import { t } from '/js/i18n.js?v=1f1ea9c1';
 import { html, raw, setHtml } from '/js/html.js?v=c71f8903';
-import { qa, q } from '/js/utils.js?v=eadafbcd';
-import { iconSvg } from '/js/icon-set.js?v=08b74a28';
+import { qa, q } from '/js/utils.js?v=7d0a2f7d';
+import { iconSvg } from '/js/icon-set.js?v=34af798f';
 import { HUE_NAMES, ROLE_NAMES, TILE_KEYWORDS, pageTheme, tileColor } from '/js/palette.js?v=3fb8ae43';
 
 const CC_SWATCHES = ['#1c1c1e', '#8e8e93', '#f2f2f7', '#ff393c', '#ffcd00', '#35c759', '#0289ff', '#cb30df'];
diff --git a/ui/js/admin-drag.js b/ui/js/admin-drag.js
index b624a1a6..5150905d 100644
--- a/ui/js/admin-drag.js
+++ b/ui/js/admin-drag.js
@@ -12,7 +12,7 @@
 import { applyDrop, canJoinFolder, folderRowZone } from '/js/admin-drag-logic.js?v=6b767e76';
 import { state } from '/js/admin-state.js?v=831e219e';
 import { snapshotItems } from '/js/admin-save-logic.js?v=60a82419';
-import { qa } from '/js/utils.js?v=eadafbcd';
+import { qa } from '/js/utils.js?v=7d0a2f7d';
 
 /** @type {(before: unknown) => void} */
 let _save = () => {};
diff --git a/ui/js/admin-list.js b/ui/js/admin-list.js
index 9b7e806a..29357a8f 100644
--- a/ui/js/admin-list.js
+++ b/ui/js/admin-list.js
@@ -14,14 +14,14 @@
 import { collapsedFolders, filter, state } from '/js/admin-state.js?v=831e219e';
 import { snapshotItems } from '/js/admin-save-logic.js?v=60a82419';
 import { reorderItems } from '/js/admin-logic.js?v=cbb7417d';
-import { initDrag, wireRowDrag } from '/js/admin-drag.js?v=36006b2b';
-import { paintIcon } from '/js/admin-shared.js?v=d2e8b6dc';
-import { clr, el, qa, setUserText } from '/js/utils.js?v=eadafbcd';
+import { initDrag, wireRowDrag } from '/js/admin-drag.js?v=e31d2128';
+import { paintIcon } from '/js/admin-shared.js?v=9d789975';
+import { clr, el, qa, setUserText } from '/js/utils.js?v=7d0a2f7d';
 import { html, raw, setHtml } from '/js/html.js?v=c71f8903';
 import { t } from '/js/i18n.js?v=1f1ea9c1';
-import { sizeLabel } from '/js/admin-widget-form.js?v=fd3dcc6c';
-import { widgetGlyph } from '/js/widget-glyphs.js?v=e1d968ad';
-import { iconSvg } from '/js/icon-set.js?v=08b74a28';
+import { sizeLabel } from '/js/admin-widget-form.js?v=f9235794';
+import { widgetGlyph } from '/js/widget-glyphs.js?v=648cc374';
+import { iconSvg } from '/js/icon-set.js?v=34af798f';
 
 /** @type {{ openModal: (idx: number|null) => void,
              openFolderPicker: (appId: string|null, targetFolderId?: string|null) => void,
diff --git a/ui/js/admin-settings.js b/ui/js/admin-settings.js
index 548323aa..60b95e62 100644
--- a/ui/js/admin-settings.js
+++ b/ui/js/admin-settings.js
@@ -1,4 +1,4 @@
-import { toast, apiGet, apiPost, reveal, swapContent } from '/js/admin-shared.js?v=d2e8b6dc';
+import { toast, apiGet, apiPost, reveal, swapContent } from '/js/admin-shared.js?v=9d789975';
 import { pwStrength } from '/js/password-strength.js?v=42f45ac7';
 import { t } from '/js/i18n.js?v=1f1ea9c1';
 import {
@@ -9,9 +9,9 @@ import {
   BLOCK,
 } from '/js/admin-logic.js?v=cbb7417d';
 import { confirmText } from '/js/modal.js?v=11fa1eff';
-import { el, inp, setUserText } from '/js/utils.js?v=eadafbcd';
-import { renderColorControl } from '/js/admin-color-control.js?v=e963853a';
-import { BACKDROP } from '/js/background.js?v=175d9a7f';
+import { el, inp, setUserText } from '/js/utils.js?v=7d0a2f7d';
+import { renderColorControl } from '/js/admin-color-control.js?v=15d6a495';
+import { BACKDROP } from '/js/background.js?v=92d3f3c2';
 
 /* Mirrors the server's rule: auth cannot be switched on with no password. */
 let _passwordSet = false;
diff --git a/ui/js/admin-shared.js b/ui/js/admin-shared.js
index 32fc5f03..a22c81b9 100644
--- a/ui/js/admin-shared.js
+++ b/ui/js/admin-shared.js
@@ -1,9 +1,9 @@
 /* Stateless helpers shared by the admin modules. Mutable state stays out. */
 import { recoversSession, toastHoldMs } from '/js/admin-logic.js?v=cbb7417d';
-import { el, q } from '/js/utils.js?v=eadafbcd';
+import { el, q } from '/js/utils.js?v=7d0a2f7d';
 import { t } from '/js/i18n.js?v=1f1ea9c1';
 import { iconChain } from '/js/icons.js?v=9c8c550c';
-import { iconSvg } from '/js/icon-set.js?v=08b74a28';
+import { iconSvg } from '/js/icon-set.js?v=34af798f';
 
 export const API = '';
 
diff --git a/ui/js/admin-widget-form.js b/ui/js/admin-widget-form.js
index efc15803..e48a3a71 100644
--- a/ui/js/admin-widget-form.js
+++ b/ui/js/admin-widget-form.js
@@ -1,12 +1,12 @@
 import { state } from '/js/admin-state.js?v=831e219e';
-import { PE_SVG, initInlineEdit, swapContent } from '/js/admin-shared.js?v=d2e8b6dc';
-import { createListbox } from '/js/listbox.js?v=f057351d';
-import { renderWidgetConfigForm } from '/js/widget-config-form.js?v=73604add';
+import { PE_SVG, initInlineEdit, swapContent } from '/js/admin-shared.js?v=9d789975';
+import { createListbox } from '/js/listbox.js?v=c14ab216';
+import { renderWidgetConfigForm } from '/js/widget-config-form.js?v=a57a9501';
 import { html, raw, setHtml } from '/js/html.js?v=c71f8903';
 import { sizesForView, widgetConfigMode, rejectionLines, carriesTypedValues } from '/js/admin-logic.js?v=cbb7417d';
 import { t } from '/js/i18n.js?v=1f1ea9c1';
-import { q, qi, qa } from '/js/utils.js?v=eadafbcd';
-import { iconSvg } from '/js/icon-set.js?v=08b74a28';
+import { q, qi, qa } from '/js/utils.js?v=7d0a2f7d';
+import { iconSvg } from '/js/icon-set.js?v=34af798f';
 
 const SIZES_WITH_ICONS = new Set(['small', 'medium', 'large', 'xlarge']);
 
diff --git a/ui/js/admin.js b/ui/js/admin.js
index 564171fd..a353a078 100644
--- a/ui/js/admin.js
+++ b/ui/js/admin.js
@@ -1,6 +1,6 @@
-import { buildAppForm, buildFolderForm, captureActLabels, serializeKvRows } from '/js/admin-app-form.js?v=58e2b685';
-import { checkAuth, requireLogin, wirePasswordStrength } from '/js/admin-auth.js?v=2bd61e6c';
-import { initList, render, syncFilterUI } from '/js/admin-list.js?v=4e82ea4a';
+import { buildAppForm, buildFolderForm, captureActLabels, serializeKvRows } from '/js/admin-app-form.js?v=7604b201';
+import { checkAuth, requireLogin, wirePasswordStrength } from '/js/admin-auth.js?v=1d822df2';
+import { initList, render, syncFilterUI } from '/js/admin-list.js?v=fe5e00b2';
 import { resolveAdminSection } from '/js/admin-logic.js?v=cbb7417d';
 import {
   buildAppItem,
@@ -10,7 +10,7 @@ import {
   snapshotItems,
   upsertItem,
 } from '/js/admin-save-logic.js?v=60a82419';
-import { loadSettings, settingsDirty, showBgFields, showWallpaperFile } from '/js/admin-settings.js?v=23cfe19f';
+import { loadSettings, settingsDirty, showBgFields, showWallpaperFile } from '/js/admin-settings.js?v=9ed2fd03';
 import {
   apiGet,
   apiPost,
@@ -19,16 +19,16 @@ import {
   reveal,
   setReauthHandler,
   toast,
-} from '/js/admin-shared.js?v=d2e8b6dc';
+} from '/js/admin-shared.js?v=9d789975';
 import { collapsedFolders, filter, state } from '/js/admin-state.js?v=831e219e';
-import { buildWidgetForm } from '/js/admin-widget-form.js?v=fd3dcc6c';
+import { buildWidgetForm } from '/js/admin-widget-form.js?v=f9235794';
 import { initFluidHover } from '/js/fluid-hover.js?v=cb886e86';
 import { initGlideSelect, syncGlideSelect } from '/js/glide-select.js?v=8b39e9d0';
-import { createListbox } from '/js/listbox.js?v=f057351d';
+import { createListbox } from '/js/listbox.js?v=c14ab216';
 import { html, raw, setHtml } from '/js/html.js?v=c71f8903';
 import { initI18n, LANGUAGES, t } from '/js/i18n.js?v=1f1ea9c1';
 import { loadLocalIcons } from '/js/icons.js?v=9c8c550c';
-import { ensureSprite, iconSvg } from '/js/icon-set.js?v=08b74a28';
+import { ensureSprite, iconSvg } from '/js/icon-set.js?v=34af798f';
 import {
   clearSkipTls,
   convert,
@@ -49,8 +49,8 @@ import {
   watchSystemTheme,
   writeMode,
 } from '/js/theme.js?v=eeafa4b5';
-import { el, inp, q, qa, clr, setUserText, tgt } from '/js/utils.js?v=eadafbcd';
-import { applyBackground, resolveBackground } from '/js/background.js?v=175d9a7f';
+import { el, inp, q, qa, clr, setUserText, tgt } from '/js/utils.js?v=7d0a2f7d';
+import { applyBackground, resolveBackground } from '/js/background.js?v=92d3f3c2';
 import { parseYamlTolerant, YamlLiteError } from '/js/yaml-lite.js?v=6ebb564c';
 
 ensureSprite();
diff --git a/ui/js/background.js b/ui/js/background.js
index b76503d1..0e322516 100644
--- a/ui/js/background.js
+++ b/ui/js/background.js
@@ -1,5 +1,5 @@
 // @ts-check
-import { cssColor, sanitizeCssUrl } from '/js/utils.js?v=eadafbcd';
+import { cssColor, sanitizeCssUrl } from '/js/utils.js?v=7d0a2f7d';
 import { loadWallpaper, saveWallpaper } from '/js/wallpaper-cache.js?v=c5f8a3e6';
 
 export const BACKDROP = '#0d1117';
diff --git a/ui/js/brand-mark.js b/ui/js/brand-mark.js
deleted file mode 100644
index a82b167d..00000000
--- a/ui/js/brand-mark.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// @ts-check
-/* Do not move this to /icons. That path is a user volume. A file of the same
-   name left there shadows the bundled artwork. */
-
-export const BRAND_MARK =
-  'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDI0IDEwMjQiIHdpZHRoPSIxMDI0IiBoZWlnaHQ9IjEwMjQiPgoKPGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNjQuNiw3My40KSBzY2FsZSgwLjg0NikiPjxwYXRoIGZpbGw9IiMwMEQyRTAiIGQ9Ik01MTIgMTA1LjVBNDA2LjUgNDA2LjUgMCAwIDEgODY0LjA0IDcxNS4yNUE3NS41IDc1LjUgMCAwIDEgNzMzLjI3IDYzOS43NUEyNTUuNSAyNTUuNSAwIDAgMCA1MTIgMjU2LjVBNzUuNSA3NS41IDAgMCAxIDUxMiAxMDUuNVoiLz48cGF0aCBmaWxsPSIjRjJGMkY3IiBkPSJNNTUxLjUgNDQzLjU4TDI2NC44NSAyNzguMDhBNzkgNzkgMCAwIDAgMTg1Ljg1IDQxNC45Mkw0NzIuNSA1ODAuNDJBNzkgNzkgMCAwIDAgNTUxLjUgNDQzLjU4Wk00NzIuNSA0NDMuNThMMTg1Ljg1IDYwOS4wOEE3OSA3OSAwIDAgMCAyNjQuODUgNzQ1LjkyTDU1MS41IDU4MC40MkE3OSA3OSAwIDAgMCA0NzIuNSA0NDMuNThaTTQzMyA1MTJMNDMzIDg0M0E3OSA3OSAwIDAgMCA1OTEgODQzTDU5MSA1MTJBNzkgNzkgMCAwIDAgNDMzIDUxMloiLz48L2c+Cjwvc3ZnPgo=';
diff --git a/ui/js/dashboard.js b/ui/js/dashboard.js
index aeb97261..bad2a2c0 100644
--- a/ui/js/dashboard.js
+++ b/ui/js/dashboard.js
@@ -24,9 +24,9 @@ import {
   setUserText,
   teardownWidgets,
   titleWhenTruncated,
-} from '/js/utils.js?v=eadafbcd';
+} from '/js/utils.js?v=7d0a2f7d';
 import { initFluidHover } from '/js/fluid-hover.js?v=cb886e86';
-import { initSpotlight } from '/js/spotlight.js?v=9056fab5';
+import { initSpotlight } from '/js/spotlight.js?v=a6f5775a';
 import { html, setHtml, raw } from '/js/html.js?v=c71f8903';
 import { initI18n, t, currentLang } from '/js/i18n.js?v=1f1ea9c1';
 import { pwStrength, passwordMismatch } from '/js/password-strength.js?v=42f45ac7';
@@ -40,7 +40,7 @@ import {
   buildMobile,
   resetMobileChrome,
   mkFolderGlyph,
-} from '/js/ui.js?v=cdfe7685';
+} from '/js/ui.js?v=67ae7e42';
 import { badgeMinimum, badgeSignature, computeBadgeVisual, readBadgeUpdate } from '/js/badge-logic.js?v=9e6d9d4b';
 import { formatNumber } from '/js/format-number.js?v=4a5ccef4';
 import { closeBadgePopover, wireBadgePopover } from '/js/badge-popover.js?v=aa52b1a3';
@@ -52,12 +52,12 @@ import {
   landingAfterSetup,
   restorePage,
 } from '/js/dashboard-logic.js?v=0d519f8b';
-import { applyBackground, BACKDROP, resolveBackground } from '/js/background.js?v=175d9a7f';
+import { applyBackground, BACKDROP, resolveBackground } from '/js/background.js?v=92d3f3c2';
 import { jitter } from '/js/jitter.js?v=4eeef4c9';
 import { isMobileLayout, onLayoutChange } from '/js/layout.js?v=e9f4b607';
 import { startWakeLock } from '/js/wake-lock.js?v=6b9591cf';
 import { applyLabelTones, loadSamplingImage, sampleImage, toneForColor } from '/js/label-contrast.js?v=c1ac6fb8';
-import { ensureSprite, iconSvg } from '/js/icon-set.js?v=08b74a28';
+import { ensureSprite, iconSvg } from '/js/icon-set.js?v=34af798f';
 import { pageTheme, paletteColor } from '/js/palette.js?v=3fb8ae43';
 import { THEME_KEY, applyTheme, prefersDark, readMode, resolveTheme } from '/js/theme.js?v=eeafa4b5';
 
diff --git a/ui/js/icon-set.js b/ui/js/icon-set.js
index c1c6d8a9..c1c56769 100644
--- a/ui/js/icon-set.js
+++ b/ui/js/icon-set.js
@@ -112,7 +112,6 @@ const TOGGLES = {
 };
 const CLOUD = 'M6 20h10a4 4 0 0 0 0-8 5 5 0 0 0-9.6 1.2A3.5 3.5 0 0 0 6 20z';
 
-/* Keep the fractions. Whole units drift from the logo files. */
 function logoIcon() {
   const f = n => +n.toFixed(3);
   const k = 24 / 1024;
diff --git a/ui/js/listbox.js b/ui/js/listbox.js
index 4f4f1029..80638fd5 100644
--- a/ui/js/listbox.js
+++ b/ui/js/listbox.js
@@ -9,8 +9,8 @@
 import { nextActiveIndex } from '/js/admin-logic.js?v=cbb7417d';
 import { fluidHoverClear, fluidHoverKb } from '/js/fluid-hover.js?v=cb886e86';
 import { html, raw, setHtml } from '/js/html.js?v=c71f8903';
-import { qa } from '/js/utils.js?v=eadafbcd';
-import { iconSvg } from '/js/icon-set.js?v=08b74a28';
+import { qa } from '/js/utils.js?v=7d0a2f7d';
+import { iconSvg } from '/js/icon-set.js?v=34af798f';
 
 const CHEV = iconSvg('chevrons', 22, 'solid', 'dd-chev');
 
diff --git a/ui/js/spotlight.js b/ui/js/spotlight.js
index edd3ac56..59033dd4 100644
--- a/ui/js/spotlight.js
+++ b/ui/js/spotlight.js
@@ -1,5 +1,5 @@
 import { fluidHoverClear, fluidHoverKb } from '/js/fluid-hover.js?v=cb886e86';
-import { mk, clr, el, inp as inpById, q, qa, setUserText } from '/js/utils.js?v=eadafbcd';
+import { mk, clr, el, inp as inpById, q, qa, setUserText } from '/js/utils.js?v=7d0a2f7d';
 import { t } from '/js/i18n.js?v=1f1ea9c1';
 
 /* Attached to the window so a re-open can undo the previous one. */
diff --git a/ui/js/ui.js b/ui/js/ui.js
index 810ff728..de5392cd 100644
--- a/ui/js/ui.js
+++ b/ui/js/ui.js
@@ -14,7 +14,7 @@ import {
   q,
   qa,
   setUserText,
-} from '/js/utils.js?v=eadafbcd';
+} from '/js/utils.js?v=7d0a2f7d';
 import { t, currentLang } from '/js/i18n.js?v=1f1ea9c1';
 import { toneForColor } from '/js/label-contrast.js?v=c1ac6fb8';
 import { mobileMetrics, gridColumnWidth, gridCellCount } from '/js/mobile-metrics.js?v=349f4300';
diff --git a/ui/js/utils.js b/ui/js/utils.js
index 7a94913e..b96120b5 100644
--- a/ui/js/utils.js
+++ b/ui/js/utils.js
@@ -3,7 +3,6 @@ import { toneForColor } from '/js/label-contrast.js?v=c1ac6fb8';
 import { SETTINGS_ICON, SETTINGS_ICON_LIGHT } from '/js/settings-icon.js?v=4079b66a';
 import { mkGlassRim } from '/js/glass-rim.js?v=3faec233';
 import { smoothRectPath } from '/js/smooth-corner.js?v=b7dda7e1';
-import { BRAND_MARK } from '/js/brand-mark.js?v=e363e477';
 import { t } from '/js/i18n.js?v=1f1ea9c1';
 import { pageTheme, tileColor } from '/js/palette.js?v=3fb8ae43';
 
@@ -436,8 +435,13 @@ export function renderEmptyState(items) {
 
   const box = mk('div');
   box.className = 'empty-state';
-  const mark = mk('img', { src: BRAND_MARK, alt: '' });
-  mark.className = 'empty-state-mark';
+  const mark = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+  mark.setAttribute('class', 'sy-icon empty-state-mark');
+  mark.setAttribute('aria-hidden', 'true');
+  mark.setAttribute('focusable', 'false');
+  const use = document.createElementNS('http://www.w3.org/2000/svg', 'use');
+  use.setAttribute('href', '#sy-solid-logo');
+  mark.append(use);
   const title = mk('h2');
   title.className = 'empty-state-title';
   title.textContent = t('home.emptyTitle');
diff --git a/ui/js/widget-config-form.js b/ui/js/widget-config-form.js
index e8c36ec9..36164774 100644
--- a/ui/js/widget-config-form.js
+++ b/ui/js/widget-config-form.js
@@ -3,9 +3,9 @@
 
 import { t } from '/js/i18n.js?v=1f1ea9c1';
 import { html, raw, setHtml } from '/js/html.js?v=c71f8903';
-import { reveal, wireInlineEdit } from '/js/admin-shared.js?v=d2e8b6dc';
-import { createListbox } from '/js/listbox.js?v=f057351d';
-import { renderColorControl } from '/js/admin-color-control.js?v=e963853a';
+import { reveal, wireInlineEdit } from '/js/admin-shared.js?v=9d789975';
+import { createListbox } from '/js/listbox.js?v=c14ab216';
+import { renderColorControl } from '/js/admin-color-control.js?v=15d6a495';
 import {
   seedCarried,
   applyOptionSet,
@@ -15,7 +15,7 @@ import {
   visibleFieldFlags,
 } from '/js/admin-logic.js?v=cbb7417d';
 import { optionsErrorAdvice, TONE } from '/js/admin-error.js?v=e4ea7820';
-import { qi } from '/js/utils.js?v=eadafbcd';
+import { qi } from '/js/utils.js?v=7d0a2f7d';
 
 const PE =
   '<svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M11 4H6a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-5"/><path d="M18.4 2.6a1.85 1.85 0 0 1 2.6 2.6l-9.1 9.1-3.4 1 1-3.4z"/></svg>';
diff --git a/ui/js/widget-glyphs.js b/ui/js/widget-glyphs.js
index 94382e15..9cfd635f 100644
--- a/ui/js/widget-glyphs.js
+++ b/ui/js/widget-glyphs.js
@@ -1,5 +1,5 @@
 // @ts-check
-import { iconSvg } from '/js/icon-set.js?v=08b74a28';
+import { iconSvg } from '/js/icon-set.js?v=34af798f';
 
 /* Keys are the glyph names in widget.json files. Renaming one breaks that widget. */
 /** @type {Record<string, string>} */
diff --git a/ui/test/empty-dashboard.test.mjs b/ui/test/empty-dashboard.test.mjs
index 43d98c77..038c6152 100644
--- a/ui/test/empty-dashboard.test.mjs
+++ b/ui/test/empty-dashboard.test.mjs
@@ -63,12 +63,11 @@ test('the placard strings exist in every catalog', () => {
   }
 });
 
-test('the placard carries the app mark without its plate', () => {
-  const mark = read('js/brand-mark.js');
-  const svg = Buffer.from(mark.split('base64,')[1].split("'")[0], 'base64').toString('utf8');
-  assert.equal(svg.includes('<rect'), false);
-  assert.match(svg, /#00D2E0/i);
-  assert.match(read('js/utils.js'), /BRAND_MARK/);
+test('the placard draws the logo from the icon set in theme colours', () => {
+  const src = read('js/utils.js');
+  assert.match(src, /href', '#sy-solid-logo'/);
+  assert.match(src, /'sy-icon empty-state-mark'/);
+  assert.match(read('css/dashboard.css'), /\.empty-state-mark\s*\{[^}]*color:\s*var\(--label-primary\)/);
 });
 
 test('both layouts drop the settings tile while the dashboard is empty', () => {
diff --git a/ui/test/icon-set-logo.test.mjs b/ui/test/icon-set-logo.test.mjs
index 0a6e7810..7c6944ac 100644
--- a/ui/test/icon-set-logo.test.mjs
+++ b/ui/test/icon-set-logo.test.mjs
@@ -1,17 +1,110 @@
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 
-const { ICONS, symbol } = await import('../js/icon-set.js');
+const { ICONS, STYLES, symbol } = await import('../js/icon-set.js');
+
+const repo = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', '..');
+const read = p => fs.readFileSync(path.join(repo, p), 'utf8');
+
+function segments(d) {
+  const out = [];
+  const re = /([MLHVAZmlhvaz])([^MLHVAZmlhvaz]*)/g;
+  const arity = { m: 2, l: 2, h: 1, v: 1, a: 7, z: 0 };
+  let [x, y, sx, sy] = [0, 0, 0, 0];
+  for (const [, c, args] of d.matchAll(re)) {
+    const lc = c.toLowerCase();
+    const rel = c !== c.toUpperCase();
+    const nums = (args.match(/-?(\d+\.?\d*|\.\d+)(e-?\d+)?/g) || []).map(Number);
+    if (lc === 'z') {
+      out.push({ c: 'L', p: [sx, sy], from: [x, y] });
+      [x, y] = [sx, sy];
+      continue;
+    }
+    for (let i = 0; i < nums.length; i += arity[lc]) {
+      const a = nums.slice(i, i + arity[lc]);
+      const from = [x, y];
+      if (lc === 'h') x = rel ? x + a[0] : a[0];
+      else if (lc === 'v') y = rel ? y + a[0] : a[0];
+      else [x, y] = rel ? [x + a.at(-2), y + a.at(-1)] : [a.at(-2), a.at(-1)];
+      const move = lc === 'm' && i === 0;
+      if (move) [sx, sy] = [x, y];
+      out.push({ c: lc === 'a' ? 'A' : move ? 'M' : 'L', a, p: [x, y], from });
+    }
+  }
+  return out;
+}
+
+/** Points along an arc, from the endpoint form in SVG 1.1 appendix F.6.5. */
+function arcPoints([x1, y1], s) {
+  const [rx0, ry0, rot, large, sweep] = s.a;
+  const [x2, y2] = s.p;
+  const phi = (rot * Math.PI) / 180;
+  const [cos, sin] = [Math.cos(phi), Math.sin(phi)];
+  const dx = (x1 - x2) / 2;
+  const dy = (y1 - y2) / 2;
+  const xp = cos * dx + sin * dy;
+  const yp = -sin * dx + cos * dy;
+  const k = Math.max(1, Math.sqrt((xp * xp) / (rx0 * rx0) + (yp * yp) / (ry0 * ry0)));
+  const [rx, ry] = [rx0 * k, ry0 * k];
+  const num = rx * rx * ry * ry - rx * rx * yp * yp - ry * ry * xp * xp;
+  const co = (large === sweep ? -1 : 1) * Math.sqrt(Math.max(0, num / (rx * rx * yp * yp + ry * ry * xp * xp)));
+  const cxp = (co * rx * yp) / ry;
+  const cyp = (-co * ry * xp) / rx;
+  const cx = cos * cxp - sin * cyp + (x1 + x2) / 2;
+  const cy = sin * cxp + cos * cyp + (y1 + y2) / 2;
+  const t1 = Math.atan2((yp - cyp) / ry, (xp - cxp) / rx);
+  let dt = Math.atan2((-yp - cyp) / ry, (-xp - cxp) / rx) - t1;
+  if (sweep && dt < 0) dt += 2 * Math.PI;
+  if (!sweep && dt > 0) dt -= 2 * Math.PI;
+  const pts = [];
+  for (let i = 0; i <= 64; i++) {
+    const t = t1 + (dt * i) / 64;
+    pts.push([
+      cx + rx * Math.cos(t) * cos - ry * Math.sin(t) * sin,
+      cy + rx * Math.cos(t) * sin + ry * Math.sin(t) * cos,
+    ]);
+  }
+  return pts;
+}
+
+function pathPoints(d) {
+  return segments(d).flatMap(s => (s.c === 'A' ? arcPoints(s.from, s) : s.c === 'M' ? [s.p] : [s.from, s.p]));
+}
+
+function extent(p) {
+  if (p.t === 'rect') return [p.x, p.y, p.x + p.w, p.y + p.h];
+  if (p.t === 'circle') return [p.cx - p.r, p.cy - p.r, p.cx + p.r, p.cy + p.r];
+  const pts = pathPoints(p.d);
+  const xs = pts.map(q => q[0]);
+  const ys = pts.map(q => q[1]);
+  return [Math.min(...xs), Math.min(...ys), Math.max(...xs), Math.max(...ys)];
+}
+
+/* Filled parts must paint inside 2 to 22, round ends included. A stroked line
+   keeps its centreline there, as every line in the set does. */
+function assertInsideGrid(id) {
+  for (const styleId of Object.keys(STYLES)) {
+    const st = STYLES[styleId];
+    for (const p0 of ICONS[id].shapes) {
+      const p = st.line && p0.lineAlt ? { ...p0, ...p0.lineAlt } : p0;
+      const [x0, y0, x1, y1] = extent(p);
+      const eps = 1e-6;
+      assert.ok(
+        x0 >= 2 - eps && y0 >= 2 - eps && x1 <= 22 + eps && y1 <= 22 + eps,
+        `${id} in ${styleId}: a part spans ${[x0, y0, x1, y1].map(n => n.toFixed(2))}`,
+      );
+    }
+  }
+}
 
 test('the logo draws one accent arc and three ink strokes inside the grid', () => {
   const { sym } = symbol('logo', ICONS.logo);
   assert.equal((sym.match(/class="sy-a"/g) || []).length, 1);
   assert.equal((sym.match(/class="sy-i"/g) || []).length, 3);
-  const nums = [...sym.matchAll(/\sd="([^"]+)"/g)].flatMap(m => m[1].match(/-?\d+(\.\d+)?/g).map(Number));
-  assert.ok(
-    nums.every(n => n >= 0 && n <= 24),
-    'every coordinate stays on the 24 grid',
-  );
+  assertInsideGrid('logo');
 });
 
 test('line styles draw the logo as strokes, not outlined areas', () => {
@@ -19,6 +112,46 @@ test('line styles draw the logo as strokes, not outlined areas', () => {
   assert.equal((sym.match(/fill="none"/g) || []).length, 4);
 });
 
-test('the docs section icons are in the set', () => {
-  for (const id of ['start', 'run', 'create']) assert.ok(ICONS[id], id);
+test('the docs section icons have one accent part and stay inside the grid', () => {
+  for (const id of ['start', 'run', 'create']) {
+    assert.equal(ICONS[id].shapes.filter(p => p.role === 'a').length, 1, id);
+    assertInsideGrid(id);
+    for (const styleId of Object.keys(STYLES)) assert.match(symbol(id, ICONS[id], styleId).sym, /<path|<rect/);
+  }
+});
+
+/* ── the standalone logo files ────────────────────────────────────────────── */
+
+const pathsOf = svg => [...svg.matchAll(/<path fill="[^"]+" d="([^"]+)"/g)].map(m => m[1]);
+
+test('the favicon draws the same geometry as the logo icon', () => {
+  const sym = symbol('logo', ICONS.logo).sym;
+  const ink = [...sym.matchAll(/<path d="([^"]+)" class="sy-i"/g)].map(m => m[1]).join('');
+  const accent = /<path d="([^"]+)" class="sy-a"/.exec(sym)[1];
+  const [favArc, favInk] = pathsOf(read('ui/icons/favicon.svg'));
+  const scale = 1024 / 24;
+  for (const [file, icon] of [
+    [favArc, accent],
+    [favInk, ink],
+  ]) {
+    const a = segments(file);
+    const b = segments(icon);
+    assert.equal(a.length, b.length, 'the favicon and the logo icon have different outlines');
+    a.forEach((s, i) => {
+      assert.equal(s.c, b[i].c);
+      const want = b[i].p.map(n => n * scale);
+      assert.ok(Math.hypot(s.p[0] - want[0], s.p[1] - want[1]) < 0.1, `point ${i} is ${s.p}, the icon has ${want}`);
+      if (s.c === 'A') {
+        assert.ok(Math.abs(s.a[0] - b[i].a[0] * scale) < 0.1, `radius ${i} differs`);
+        assert.deepEqual(s.a.slice(3, 5), b[i].a.slice(3, 5), `arc flags ${i} differ`);
+      }
+    });
+  }
+});
+
+test('the Unraid icons use the favicon geometry', () => {
+  const fav = pathsOf(read('ui/icons/favicon.svg'));
+  for (const f of ['templates/icon.svg', 'templates/icon-light.svg', 'templates/icon-dark.svg']) {
+    assert.deepEqual(pathsOf(read(f)), fav, f);
+  }
 });
diff --git a/ui/test/manifest.test.mjs b/ui/test/manifest.test.mjs
index fcf4f68a..e077e52e 100644
--- a/ui/test/manifest.test.mjs
+++ b/ui/test/manifest.test.mjs
@@ -12,6 +12,7 @@ import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
 import path from 'node:path';
+import zlib from 'node:zlib';
 import { fileURLToPath } from 'node:url';
 
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
@@ -80,9 +81,7 @@ test('every icon file exists and matches its declared size', () => {
   }
 });
 
-/* The reason the two cannot be one image: a maskable icon must keep its content
-   inside the middle 80%, since a circular mask cuts the rest. */
-test('the maskable icon keeps its content inside the safe zone', () => {
+test('the maskable icon is square and large enough', () => {
   const icon = manifest.icons.find(i => i.purpose === 'maskable');
   const buf = fs.readFileSync(path.join(root, icon.src.replace(/^\//, '')));
   const [w, h] = [buf.readUInt32BE(16), buf.readUInt32BE(20)];
@@ -90,6 +89,50 @@ test('the maskable icon keeps its content inside the safe zone', () => {
   assert.ok(w >= 192, `${w}px is below the 192px Android asks for`);
 });
 
+function pngPixels(buf) {
+  const w = buf.readUInt32BE(16);
+  const h = buf.readUInt32BE(20);
+  assert.ok(buf[24] === 8 && [2, 6].includes(buf[25]) && buf[28] === 0, 'expected 8-bit RGB or RGBA, not interlaced');
+  const n = buf[25] === 6 ? 4 : 3;
+  const idat = [];
+  for (let i = 8; i < buf.length; ) {
+    const len = buf.readUInt32BE(i);
+    if (buf.toString('latin1', i + 4, i + 8) === 'IDAT') idat.push(buf.subarray(i + 8, i + 8 + len));
+    i += 12 + len;
+  }
+  const raw = zlib.inflateSync(Buffer.concat(idat));
+  const row = w * n;
+  const out = Buffer.alloc(row * h);
+  for (let y = 0; y < h; y++) {
+    const f = raw[y * (row + 1)];
+    for (let x = 0; x < row; x++) {
+      const v = raw[y * (row + 1) + 1 + x];
+      const a = x >= n ? out[y * row + x - n] : 0;
+      const b = y ? out[(y - 1) * row + x] : 0;
+      const c = x >= n && y ? out[(y - 1) * row + x - n] : 0;
+      const p = a + b - c;
+      const [pa, pb, pc] = [Math.abs(p - a), Math.abs(p - b), Math.abs(p - c)];
+      const pred = [0, a, b, (a + b) >> 1, pa <= pb && pa <= pc ? a : pb <= pc ? b : c][f];
+      out[y * row + x] = (v + pred) & 0xff;
+    }
+  }
+  const px = (x, y) => [...out.subarray(y * row + x * n, y * row + x * n + n)];
+  return { w, h, px: n === 4 ? px : (x, y) => [...px(x, y), 255] };
+}
+
+test('the maskable icon fills its frame and draws nothing outside the safe zone', () => {
+  const icon = manifest.icons.find(i => i.purpose === 'maskable');
+  const { w, h, px } = pngPixels(fs.readFileSync(path.join(root, icon.src.replace(/^\//, ''))));
+  const bg = px(0, 0);
+  assert.equal(bg[3], 255, 'transparent corners show the launcher backing through the mask');
+  const r = 0.4 * w;
+  for (let y = 0; y < h; y++)
+    for (let x = 0; x < w; x++) {
+      if (Math.hypot(x + 0.5 - w / 2, y + 0.5 - h / 2) <= r) continue;
+      assert.deepEqual(px(x, y), bg, `pixel ${x},${y} is outside the safe zone and a circular mask cuts it`);
+    }
+});
+
 /* ── language ─────────────────────────────────────────────────────────────── */
 
 test('the manifest declares a language and direction', () => {