From 4e45496360de66fffa86d2313866ec58185f9eb8 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Wed, 8 Jul 2026 23:54:27 -0400
Subject: [PATCH 01/12] feat(header): gate consolidated <unraid-header> on
 Unraid 7.3+

Render the single consolidated header web component (<unraid-header>,
provided by the unraid-api web build) on Unraid 7.3 and later, passing the
server state JSON the same way myservers2.php does for <unraid-user-profile>.

On releases before 7.3 the existing multi-component header is unchanged:
<unraid-header-os-version> + the sidebar array-usage graph + the
myservers2.php user-profile include.

Gate uses version_compare against /etc/unraid-version. The consolidated
header owns the whole header layout, fixing the mobile overlap of the reboot
banner, server title, and notification bell.

Companion to unraid/api#2037.
---
 .../include/DefaultPageLayout/Header.php      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 579dd637df..1550352d4e 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -1,7 +1,28 @@
+<?php
+// Unraid 7.3+ ships a single consolidated header web component (<unraid-header>)
+// that owns the whole header and its responsive layout. Older releases keep the
+// legacy multi-component header (logo/version + user profile) as a fallback.
+$headerOsVersion = @parse_ini_file('/etc/unraid-version')['version'] ?? '0';
+$headerUseConsolidated = version_compare($headerOsVersion, '7.3', '>=');
+?>
 <div id="header" class="<?=$display['banner']?>">
+<?php if ($headerUseConsolidated): ?>
+    <?php
+        require_once "$docroot/plugins/dynamix.my.servers/include/state.php";
+        $headerServerState = new ServerState();
+    ?>
+    <script>
+    window.LOCALE = <?= json_encode($_SESSION['locale'] ?? 'en_US', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP) ?>;
+    </script>
+    <unraid-header server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"></unraid-header>
+    <? if ($display['usage'] && $themeHelper->isSidebarTheme()): ?>
+        <span id='array-usage-sidenav'></span>
+    <? endif; ?>
+<?php else: ?>
     <unraid-header-os-version></unraid-header-os-version>
     <? if ($display['usage'] && $themeHelper->isSidebarTheme()): ?>
         <span id='array-usage-sidenav'></span>
     <? endif; ?>
     <?include "$docroot/plugins/dynamix.my.servers/include/myservers2.php"?>
+<?php endif; ?>
 </div>

From 47dd89242bde1104ac15cd3c2126c35d9fbd6698 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Thu, 9 Jul 2026 00:16:08 -0400
Subject: [PATCH 02/12] feat(header): consolidated header owns array-usage bar
 on 7.3+

Pass show-array-usage to <unraid-header> for sidebar themes with usage display
enabled, instead of the legacy #array-usage-sidenav placeholder span. The
consolidated header now renders the array-usage bar itself (GraphQL-driven), so
the Navigation/Main.php sidebar injection simply no-ops on 7.3+.
---
 .../dynamix/include/DefaultPageLayout/Header.php    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 1550352d4e..47856087c4 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -14,10 +14,15 @@
     <script>
     window.LOCALE = <?= json_encode($_SESSION['locale'] ?? 'en_US', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP) ?>;
     </script>
-    <unraid-header server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"></unraid-header>
-    <? if ($display['usage'] && $themeHelper->isSidebarTheme()): ?>
-        <span id='array-usage-sidenav'></span>
-    <? endif; ?>
+    <?php
+        // The consolidated header owns the array-usage bar for sidebar themes,
+        // where the legacy #array-usage-sidenav widget used to be injected.
+        $headerShowArrayUsage = ($display['usage'] && $themeHelper->isSidebarTheme()) ? 'true' : 'false';
+    ?>
+    <unraid-header
+        server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"
+        show-array-usage="<?= $headerShowArrayUsage ?>"
+    ></unraid-header>
 <?php else: ?>
     <unraid-header-os-version></unraid-header-os-version>
     <? if ($display['usage'] && $themeHelper->isSidebarTheme()): ?>

From 3eac8b193be1122a1d86ed51c957f647aaa11637 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Thu, 9 Jul 2026 10:29:23 -0400
Subject: [PATCH 03/12] fix(header): align consolidated host with legacy header
 spacing

---
 .../include/DefaultPageLayout/Header.php      |  3 ++-
 .../plugins/dynamix/styles/default-base.css   | 23 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 47856087c4..222e59ae4f 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -4,8 +4,9 @@
 // legacy multi-component header (logo/version + user profile) as a fallback.
 $headerOsVersion = @parse_ini_file('/etc/unraid-version')['version'] ?? '0';
 $headerUseConsolidated = version_compare($headerOsVersion, '7.3', '>=');
+$headerClass = trim($display['banner'] . ($headerUseConsolidated ? ' unraid-consolidated-header' : ''));
 ?>
-<div id="header" class="<?=$display['banner']?>">
+<div id="header" class="<?=$headerClass?>">
 <?php if ($headerUseConsolidated): ?>
     <?php
         require_once "$docroot/plugins/dynamix.my.servers/include/state.php";
diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index 6dfa65cea8..c3dae3a175 100755
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -476,6 +476,23 @@ textarea:where(:not(.unapi *)) {
     align-self: stretch;
 }
 
+#header.unraid-consolidated-header {
+    align-items: stretch;
+    gap: 0;
+    padding-left: 0;
+}
+
+#header.unraid-consolidated-header unraid-header {
+    align-self: stretch;
+    display: block;
+    width: 100%;
+}
+
+#header.unraid-consolidated-header #UnraidHeader {
+    min-height: inherit;
+    padding: .5rem;
+}
+
 /**
  * Tools page, rotate the Downgrade icon to prevent needing to add a new icon to the icon font.
  * The pseudo element is targeted here otherwise the rotation of the span would mess up spacing with the text.
@@ -2407,6 +2424,10 @@ div#title.ud {
         padding-left: 80px;
     }
 
+    #header.unraid-consolidated-header {
+        padding-left: 0;
+    }
+
     #header .logo {
         margin-left: 0;
         color: var(--brand-red);
@@ -2814,4 +2835,4 @@ div#title.ud {
     label.checkbox input:checked ~ .checkmark {
         background-color: var(--brand-orange);
     }
-}
\ No newline at end of file
+}

From 296ecfb683695ff50d8f6e9c245bc5531454e2d6 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Thu, 9 Jul 2026 10:58:58 -0400
Subject: [PATCH 04/12] feat(header): add adaptive logo display setting

---
 emhttp/plugins/dynamix/DisplaySettings.page            | 10 ++++++++++
 emhttp/plugins/dynamix/default.cfg                     |  1 +
 .../dynamix/include/DefaultPageLayout/Header.php       |  2 ++
 3 files changed, 13 insertions(+)

diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 741f173212..8818cb25bd 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -260,6 +260,16 @@ _(Dynamix color theme)_:
   <?endforeach; // $themeHelper set in DefaultPageLayout.php ?>
   </select>
 
+_(Header logo style)_:
+: <select name="headerLogo">
+  <?=mk_option($display['headerLogo'] ?? "", "", _('Gradient'))?>
+  <?=mk_option($display['headerLogo'] ?? "", "theme", _('Theme adaptive'))?>
+  </select>
+
+:display_header_logo_style_help:
+Choose **Gradient** to use the Unraid orange/red gradient logo. Choose **Theme adaptive** to use a single-color logo that follows the active header text color.
+:end
+
 _(Used / Free columns)_:
 : <select name="text">
   <?=mk_option($display['text'], "0", _('Text'))?>
diff --git a/emhttp/plugins/dynamix/default.cfg b/emhttp/plugins/dynamix/default.cfg
index d10aee010e..d862d7fcde 100644
--- a/emhttp/plugins/dynamix/default.cfg
+++ b/emhttp/plugins/dynamix/default.cfg
@@ -29,6 +29,7 @@ hotssd="60"
 maxssd="70"
 power=""
 theme="white"
+headerLogo=""
 locale=""
 raw=""
 rtl=""
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 222e59ae4f..849ebc2c36 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -19,10 +19,12 @@
         // The consolidated header owns the array-usage bar for sidebar themes,
         // where the legacy #array-usage-sidenav widget used to be injected.
         $headerShowArrayUsage = ($display['usage'] && $themeHelper->isSidebarTheme()) ? 'true' : 'false';
+        $headerLogoStyle = (($display['headerLogo'] ?? '') === 'theme') ? 'theme' : '';
     ?>
     <unraid-header
         server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"
         show-array-usage="<?= $headerShowArrayUsage ?>"
+        header-logo-style="<?= $headerLogoStyle ?>"
     ></unraid-header>
 <?php else: ?>
     <unraid-header-os-version></unraid-header-os-version>

From 3eeb70ef5397e1c7148f75a9f31850e1b0772f79 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Thu, 9 Jul 2026 11:07:18 -0400
Subject: [PATCH 05/12] fix(display): remove inline header logo help block

---
 emhttp/plugins/dynamix/DisplaySettings.page | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 8818cb25bd..30117fb823 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -266,10 +266,6 @@ _(Header logo style)_:
   <?=mk_option($display['headerLogo'] ?? "", "theme", _('Theme adaptive'))?>
   </select>
 
-:display_header_logo_style_help:
-Choose **Gradient** to use the Unraid orange/red gradient logo. Choose **Theme adaptive** to use a single-color logo that follows the active header text color.
-:end
-
 _(Used / Free columns)_:
 : <select name="text">
   <?=mk_option($display['text'], "0", _('Text'))?>

From a430865360bb4f2adc526d8cec282ab093886920 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Thu, 9 Jul 2026 11:10:29 -0400
Subject: [PATCH 06/12] fix(header): default logo style to theme adaptive

---
 emhttp/plugins/dynamix/DisplaySettings.page                 | 4 ++--
 emhttp/plugins/dynamix/default.cfg                          | 2 +-
 emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 30117fb823..68488d7a5f 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -262,8 +262,8 @@ _(Dynamix color theme)_:
 
 _(Header logo style)_:
 : <select name="headerLogo">
-  <?=mk_option($display['headerLogo'] ?? "", "", _('Gradient'))?>
-  <?=mk_option($display['headerLogo'] ?? "", "theme", _('Theme adaptive'))?>
+  <?=mk_option(($display['headerLogo'] ?? '') === 'gradient' ? 'gradient' : 'theme', "theme", _('Theme adaptive'))?>
+  <?=mk_option(($display['headerLogo'] ?? '') === 'gradient' ? 'gradient' : 'theme', "gradient", _('Gradient'))?>
   </select>
 
 _(Used / Free columns)_:
diff --git a/emhttp/plugins/dynamix/default.cfg b/emhttp/plugins/dynamix/default.cfg
index d862d7fcde..464ee101f0 100644
--- a/emhttp/plugins/dynamix/default.cfg
+++ b/emhttp/plugins/dynamix/default.cfg
@@ -29,7 +29,7 @@ hotssd="60"
 maxssd="70"
 power=""
 theme="white"
-headerLogo=""
+headerLogo="theme"
 locale=""
 raw=""
 rtl=""
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 849ebc2c36..e7888b0b16 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -19,7 +19,7 @@
         // The consolidated header owns the array-usage bar for sidebar themes,
         // where the legacy #array-usage-sidenav widget used to be injected.
         $headerShowArrayUsage = ($display['usage'] && $themeHelper->isSidebarTheme()) ? 'true' : 'false';
-        $headerLogoStyle = (($display['headerLogo'] ?? '') === 'theme') ? 'theme' : '';
+        $headerLogoStyle = (($display['headerLogo'] ?? '') === 'gradient') ? 'gradient' : 'theme';
     ?>
     <unraid-header
         server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"

From 478532b4461bb96965eb6a18dceef10dac2ae985 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Thu, 9 Jul 2026 11:11:46 -0400
Subject: [PATCH 07/12] fix(header): preserve default gradient logo behavior

---
 emhttp/plugins/dynamix/DisplaySettings.page                 | 4 ++--
 emhttp/plugins/dynamix/default.cfg                          | 2 +-
 emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index 68488d7a5f..30117fb823 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -262,8 +262,8 @@ _(Dynamix color theme)_:
 
 _(Header logo style)_:
 : <select name="headerLogo">
-  <?=mk_option(($display['headerLogo'] ?? '') === 'gradient' ? 'gradient' : 'theme', "theme", _('Theme adaptive'))?>
-  <?=mk_option(($display['headerLogo'] ?? '') === 'gradient' ? 'gradient' : 'theme', "gradient", _('Gradient'))?>
+  <?=mk_option($display['headerLogo'] ?? "", "", _('Gradient'))?>
+  <?=mk_option($display['headerLogo'] ?? "", "theme", _('Theme adaptive'))?>
   </select>
 
 _(Used / Free columns)_:
diff --git a/emhttp/plugins/dynamix/default.cfg b/emhttp/plugins/dynamix/default.cfg
index 464ee101f0..d862d7fcde 100644
--- a/emhttp/plugins/dynamix/default.cfg
+++ b/emhttp/plugins/dynamix/default.cfg
@@ -29,7 +29,7 @@ hotssd="60"
 maxssd="70"
 power=""
 theme="white"
-headerLogo="theme"
+headerLogo=""
 locale=""
 raw=""
 rtl=""
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index e7888b0b16..849ebc2c36 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -19,7 +19,7 @@
         // The consolidated header owns the array-usage bar for sidebar themes,
         // where the legacy #array-usage-sidenav widget used to be injected.
         $headerShowArrayUsage = ($display['usage'] && $themeHelper->isSidebarTheme()) ? 'true' : 'false';
-        $headerLogoStyle = (($display['headerLogo'] ?? '') === 'gradient') ? 'gradient' : 'theme';
+        $headerLogoStyle = (($display['headerLogo'] ?? '') === 'theme') ? 'theme' : '';
     ?>
     <unraid-header
         server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"

From b6f6b8e0296c4862d36ebc6d8f0051aa5712a507 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Thu, 9 Jul 2026 11:16:32 -0400
Subject: [PATCH 08/12] fix(header): reset legacy block styles for consolidated
 header

---
 emhttp/plugins/dynamix/styles/default-base.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index c3dae3a175..8ccd6cbd35 100755
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -493,6 +493,14 @@ textarea:where(:not(.unapi *)) {
     padding: .5rem;
 }
 
+#header.unraid-consolidated-header .block {
+    background-color: transparent;
+    float: none;
+    margin: 0;
+    padding: 0;
+    text-align: inherit;
+}
+
 /**
  * Tools page, rotate the Downgrade icon to prevent needing to add a new icon to the icon font.
  * The pseudo element is targeted here otherwise the rotation of the span would mess up spacing with the text.

From 34be836adf5ccf38d625f627b11e198977347668 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Thu, 9 Jul 2026 11:19:16 -0400
Subject: [PATCH 09/12] fix(header): align consolidated header gutters

---
 emhttp/plugins/dynamix/styles/default-base.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index 8ccd6cbd35..48dea22d5f 100755
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -490,7 +490,7 @@ textarea:where(:not(.unapi *)) {
 
 #header.unraid-consolidated-header #UnraidHeader {
     min-height: inherit;
-    padding: .5rem;
+    padding: .5rem 1rem;
 }
 
 #header.unraid-consolidated-header .block {
@@ -2436,6 +2436,11 @@ div#title.ud {
         padding-left: 0;
     }
 
+    #header.unraid-consolidated-header #UnraidHeader {
+        padding-left: calc(64px + 1rem);
+        padding-right: 1rem;
+    }
+
     #header .logo {
         margin-left: 0;
         color: var(--brand-red);

From d664c311a42b28356dcde7d5e6451d184e3753a1 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Thu, 9 Jul 2026 12:16:44 -0400
Subject: [PATCH 10/12] fix(header): reduce consolidated header height

---
 emhttp/plugins/dynamix/styles/default-base.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index 48dea22d5f..82deabd9ef 100755
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -479,7 +479,9 @@ textarea:where(:not(.unapi *)) {
 #header.unraid-consolidated-header {
     align-items: stretch;
     gap: 0;
+    min-height: 74px;
     padding-left: 0;
+    background-size: 100% 74px;
 }
 
 #header.unraid-consolidated-header unraid-header {

From a63ccaf657e3337e286b29474fc92de96131b8c8 Mon Sep 17 00:00:00 2001
From: Eli Bosley <eli@bosley.dev>
Date: Thu, 9 Jul 2026 14:09:47 -0400
Subject: [PATCH 11/12] fix(header): prevent compact header clipping

---
 emhttp/plugins/dynamix/styles/default-base.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/styles/default-base.css b/emhttp/plugins/dynamix/styles/default-base.css
index 82deabd9ef..be0b8dba8a 100755
--- a/emhttp/plugins/dynamix/styles/default-base.css
+++ b/emhttp/plugins/dynamix/styles/default-base.css
@@ -479,9 +479,9 @@ textarea:where(:not(.unapi *)) {
 #header.unraid-consolidated-header {
     align-items: stretch;
     gap: 0;
-    min-height: 74px;
+    min-height: 86px;
     padding-left: 0;
-    background-size: 100% 74px;
+    background-size: 100% 86px;
 }
 
 #header.unraid-consolidated-header unraid-header {

From 10f09850b9e62795d4dbcc95eed6cc5181307efe Mon Sep 17 00:00:00 2001
From: Eli Bosley <11823237+elibosley@users.noreply.github.com>
Date: Tue, 14 Jul 2026 10:07:59 -0400
Subject: [PATCH 12/12] fix(header): server-render logo fallback to prevent
 consolidated header pop-in

Paint the Unraid logo inside <unraid-header> so it shows at first paint, before
the web-component bundle loads and Vue mounts. The mount engine calls
replaceChildren(), so this light-DOM fallback is discarded on upgrade. #header
already flex-centers its child, so the fallback logo sits where the mounted logo
does. Removes the header pop-in without a client-side fade.
---
 .../include/DefaultPageLayout/Header.php      | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
index 849ebc2c36..f557e2ca30 100755
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -21,11 +21,30 @@
         $headerShowArrayUsage = ($display['usage'] && $themeHelper->isSidebarTheme()) ? 'true' : 'false';
         $headerLogoStyle = (($display['headerLogo'] ?? '') === 'theme') ? 'theme' : '';
     ?>
+    <style>
+        /* Light-DOM fallback: paint the logo before <unraid-header> mounts so the
+           header does not pop in on page load. #header is already
+           display:flex; align-items:center, so the logo lands left + vertically
+           centered where the mounted logo sits. The mount engine calls
+           replaceChildren(), so this markup is discarded when the component
+           upgrades. */
+        #header.unraid-consolidated-header .unraid-header-boot-logo {
+            display: inline-flex;
+            align-items: center;
+        }
+        #header.unraid-consolidated-header .unraid-header-boot-logo img {
+            width: 14rem;
+            max-width: 100%;
+            max-height: 3rem;
+            height: auto;
+            object-fit: contain;
+        }
+    </style>
     <unraid-header
         server="<?= $headerServerState->getServerStateJsonForHtmlAttr() ?>"
         show-array-usage="<?= $headerShowArrayUsage ?>"
         header-logo-style="<?= $headerLogoStyle ?>"
-    ></unraid-header>
+    ><a class="unraid-header-boot-logo" href="https://unraid.net" target="_blank" rel="noopener" aria-label="Unraid"><img src="/webGui/images/UN-logotype-gradient.svg" alt="Unraid" /></a></unraid-header>
 <?php else: ?>
     <unraid-header-os-version></unraid-header-os-version>
     <? if ($display['usage'] && $themeHelper->isSidebarTheme()): ?>