diff --git a/BTCPayServer/wwwroot/main/bootstrap4-creativestart/creative.css b/BTCPayServer/wwwroot/main/bootstrap4-creativestart/creative.css
index dd079520c..ae28cc119 100644
--- a/BTCPayServer/wwwroot/main/bootstrap4-creativestart/creative.css
+++ b/BTCPayServer/wwwroot/main/bootstrap4-creativestart/creative.css
@@ -55,6 +55,7 @@ hr.light {
   font-weight: bold;
   text-transform: uppercase;
   color: var(--btcpay-header-color-link, var(--btcpay-color-neutral-100));
+  border: 2px solid transparent;
 }
 
 #mainNav .navbar-nav > li.nav-item > a.nav-link:focus,
diff --git a/BTCPayServer/wwwroot/main/themes/default.css b/BTCPayServer/wwwroot/main/themes/default.css
index 703f01196..941a75fe8 100644
--- a/BTCPayServer/wwwroot/main/themes/default.css
+++ b/BTCPayServer/wwwroot/main/themes/default.css
@@ -54,11 +54,12 @@
 
   --btcpay-body-color: var(--btcpay-color-neutral-900);
   --btcpay-body-color-link: var(--btcpay-color-primary);
-  --btcpay-body-color-link-accent: var(--btcpay-color-primary-accent);
+  --btcpay-body-color-link-accent: var(--btcpay-color-primary);
 
   --btcpay-header-bg: var(--btcpay-color-white);
   --btcpay-header-color: var(--btcpay-body-color);
   --btcpay-header-color-link: var(--btcpay-body-color);
+  --btcpay-header-color-link-accent: var(--btcpay-body-color);
 
   --btcpay-footer-bg: var(--btcpay-brand-dark);
   --btcpay-footer-color: var(--btcpay-color-neutral-400);
@@ -114,6 +115,11 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   border-top: none;
 }
 
+#mainNav .navbar-nav > li.nav-item > a.nav-link:focus,
+#mainNav .navbar-nav > li.nav-item > a.nav-link:hover {
+  border-bottom-color: var(--btcpay-header-color-link-accent);
+}
+
 /* Dark theme */
 @media (prefers-color-scheme: dark) {
   :root {