diff --git a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml
index 0a9fe9bd6..16410d04a 100644
--- a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml
@@ -250,7 +250,7 @@
                                                 <tr class="table-borderless">
                                                     <th class="font-weight-normal text-secondary" scope="col">Invoice Id</th>
                                                     <th class="font-weight-normal text-secondary w-175px">Expiry</th>
-                                                    <th class="font-weight-normal text-secondary text-right w-100px">Amount</th>
+                                                    <th class="font-weight-normal text-secondary text-right w-125px">Amount</th>
                                                     <th class="font-weight-normal text-secondary text-right w-125px"></th>
                                                     <th class="font-weight-normal text-secondary text-right">Status</th>
                                                 </tr>
@@ -309,7 +309,7 @@
                                             <tr class="table-borderless">
                                                 <th class="font-weight-normal text-secondary" scope="col">Invoice Id</th>
                                                 <th class="font-weight-normal text-secondary w-175px">Expiry</th>
-                                                <th class="font-weight-normal text-secondary text-right w-100px">Amount</th>
+                                                <th class="font-weight-normal text-secondary text-right w-125px">Amount</th>
                                                 <th class="font-weight-normal text-secondary text-right w-125px"></th>
                                                 <th class="font-weight-normal text-secondary text-right">Status</th>
                                             </tr>
diff --git a/BTCPayServer/wwwroot/main/themes/classic.css b/BTCPayServer/wwwroot/main/themes/classic.css
index c8a6ff71b..6bec62762 100644
--- a/BTCPayServer/wwwroot/main/themes/classic.css
+++ b/BTCPayServer/wwwroot/main/themes/classic.css
@@ -59,12 +59,18 @@
   --btcpay-bg-tile: var(--btcpay-color-white);
   --btcpay-bg-cta:  var(--btcpay-bg-dark);
 
-  --btcpay-footer-color: var(--btcpay-color-neutral-400);
-
   --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-header-bg: var(--btcpay-bg-dark);
+  --btcpay-header-color: var(--btcpay-color-white);
+  --btcpay-header-color-link: var(--btcpay-color-white);
+  --btcpay-header-color-link-accent: var(--btcpay-color-white);
+
+  --btcpay-footer-bg: var(--btcpay-bg-dark);
+  --btcpay-footer-color: var(--btcpay-color-neutral-400);
+
   --btcpay-bg-nav-link-active: #d9f7ef;
 
   --btcpay-preformatted-text-color: var(--btcpay-color-neutral-900);
@@ -114,3 +120,7 @@
 .removetopborder tr:first-child td {
   border-top: none;
 }
+
+#mainNav:not(.navbar-shrink) {
+  background: var(--btcpay-color-white);
+}