fix(admin): prefer explicit admin.favicon over Site Icon

swissky · swissky · commit ec7f8c6bcaaf · 2026-07-01T15:35:23.000+02:00
Address review: an explicitly configured build-time admin.favicon is
admin-specific and should not be overridden by the more general Site
Icon. Flip precedence to admin.favicon -&gt; Site Icon -&gt; bundled mark.
The Site Icon still brands the admin for the common case where no
admin.favicon is set.
diff --git a/.changeset/admin-site-icon.md b/.changeset/admin-site-icon.md
@@ -2,4 +2,4 @@
 "emdash": patch
 ---
 
-The admin shell now uses the Site Icon configured in Settings → General as its favicon, so the EmDash backend is branded like the public site. Falls back to the build-time `admin.favicon` config and then the default EmDash mark when no Site Icon is set.
+The admin shell now falls back to the Site Icon configured in Settings → General for its favicon, so the EmDash backend is branded like the public site. An explicit build-time `admin.favicon` still takes precedence, and the default EmDash mark is used when neither is set.
diff --git a/packages/core/src/astro/routes/admin.astro b/packages/core/src/astro/routes/admin.astro
@@ -26,9 +26,10 @@ const messages = await loadMessages(resolvedLocale);
 const adminConfig = Astro.locals.emdash?.config?.admin;
 const pageTitle = adminConfig?.siteName ? `${adminConfig.siteName} Admin` : "EmDash Admin";
 
-// Prefer the Site Icon configured in Settings → General so the admin shell is
-// branded like the public site (WordPress-style Site Icon, which also brands
-// wp-admin). Falls back to the build-time `admin.favicon` config, then the
+// Favicon precedence: an explicit build-time `admin.favicon` is admin-specific
+// and always wins. Otherwise fall back to the Site Icon configured in
+// Settings → General, so the admin shell is branded like the public site
+// (WordPress-style Site Icon, which also brands wp-admin), and finally the
 // bundled EmDash mark below.
 const emdash = Astro.locals.emdash;
 let siteFavicon: string | undefined;
@@ -40,7 +41,7 @@ if (emdash?.db) {
 		// Settings unavailable (e.g. pre-setup) — fall back to the config/default.
 	}
 }
-const favicon = siteFavicon ?? adminConfig?.favicon;
+const favicon = adminConfig?.favicon ?? siteFavicon;
 ---
 
 <!doctype html>
