diff --git a/BTCPayServer/wwwroot/css/bootstrap.css b/BTCPayServer/wwwroot/css/bootstrap.css
index 648e85440..d473443db 100644
--- a/BTCPayServer/wwwroot/css/bootstrap.css
+++ b/BTCPayServer/wwwroot/css/bootstrap.css
@@ -3497,7 +3497,7 @@ input[type="button"].btn-block {
 .alert-primary {
   color: var(--btcpay-color-primary-accent);
   background-color: var(--btcpay-color-primary-backdrop);
-  border-color: var(--btcpay-color-primary-accent); }
+  border-color: var(--btcpay-color-primary-backdrop); }
   .alert-primary hr {
     border-top-color: var(--btcpay-color-primary-accent); }
   .alert-primary .alert-link {
@@ -3506,7 +3506,7 @@ input[type="button"].btn-block {
 .alert-secondary {
   color: var(--btcpay-color-secondary-accent);
   background-color: var(--btcpay-color-secondary-backdrop);
-  border-color: var(--btcpay-color-secondary-accent); }
+  border-color: var(--btcpay-color-secondary-backdrop); }
   .alert-secondary hr {
     border-top-color: var(--btcpay-color-secondary-accent); }
   .alert-secondary .alert-link {
@@ -3515,7 +3515,7 @@ input[type="button"].btn-block {
 .alert-success {
   color: var(--btcpay-color-success-accent);
   background-color: var(--btcpay-color-success-backdrop);
-  border-color: var(--btcpay-color-success-accent); }
+  border-color: var(--btcpay-color-success-backdrop); }
   .alert-success hr {
     border-top-color: var(--btcpay-color-success-accent); }
   .alert-success .alert-link {
@@ -3524,7 +3524,7 @@ input[type="button"].btn-block {
 .alert-info {
   color: var(--btcpay-color-info-accent);
   background-color: var(--btcpay-color-info-backdrop);
-  border-color: var(--btcpay-color-info-accent); }
+  border-color: var(--btcpay-color-info-backdrop); }
   .alert-info hr {
     border-top-color: var(--btcpay-color-info-accent); }
   .alert-info .alert-link {
@@ -3533,7 +3533,7 @@ input[type="button"].btn-block {
 .alert-warning {
   color: var(--btcpay-color-warning-accent);
   background-color: var(--btcpay-color-warning-backdrop);
-  border-color: var(--btcpay-color-warning-accent); }
+  border-color: var(--btcpay-color-warning-backdrop); }
   .alert-warning hr {
     border-top-color: var(--btcpay-color-warning-accent); }
   .alert-warning .alert-link {
@@ -3542,7 +3542,7 @@ input[type="button"].btn-block {
 .alert-danger {
   color: var(--btcpay-color-danger-accent);
   background-color: var(--btcpay-color-danger-backdrop);
-  border-color: var(--btcpay-color-danger-accent); }
+  border-color: var(--btcpay-color-danger-backdrop); }
   .alert-danger hr {
     border-top-color: var(--btcpay-color-danger-accent); }
   .alert-danger .alert-link {
@@ -3551,7 +3551,7 @@ input[type="button"].btn-block {
 .alert-light {
   color: var(--btcpay-color-light-accent);
   background-color: var(--btcpay-color-light-backdrop);
-  border-color: var(--btcpay-color-light-accent); }
+  border-color: var(--btcpay-color-light-backdrop); }
   .alert-light hr {
     border-top-color: var(--btcpay-color-light-accent); }
   .alert-light .alert-link {
@@ -3560,7 +3560,7 @@ input[type="button"].btn-block {
 .alert-dark {
   color: var(--btcpay-color-dark-accent);
   background-color: var(--btcpay-color-dark-backdrop);
-  border-color: var(--btcpay-color-dark-accent); }
+  border-color: var(--btcpay-color-dark-backdrop); }
   .alert-dark hr {
     border-top-color: var(--btcpay-color-dark-accent); }
   .alert-dark .alert-link {
diff --git a/BTCPayServer/wwwroot/css/themes/classic.css b/BTCPayServer/wwwroot/css/themes/classic.css
index ff15d58e5..35325a863 100644
--- a/BTCPayServer/wwwroot/css/themes/classic.css
+++ b/BTCPayServer/wwwroot/css/themes/classic.css
@@ -55,9 +55,11 @@
   --btcpay-body-color-link: var(--btcpay-color-primary);
   --btcpay-body-color-link-accent: var(--btcpay-color-primary-accent);
 
-  --btcpay-font-size-base: 16px;
+  --btcpay-bg-nav-link-active: #d9f7ef;
+
+  --btcpay-font-size-base: 14px;
   --btcpay-font-family-head: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
-  --btcpay-font-family-base: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  --btcpay-font-family-base: 'Helvetica Neue', Arial, sans-serif;
   --btcpay-font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 }
 
@@ -72,6 +74,7 @@ html {
 
 .table {
   margin: 1.5rem 0;
+  background: var(--btcpay-color-white);
   border: 1px solid var(--btcpay-color-neutral-300);
   border-radius: 4px;
   border-collapse: separate !important;
@@ -90,7 +93,7 @@ html {
 .table th,
 .table td {
   display: table-cell;
-  padding: 4px 12px;
+  padding: 8px 12px;
   vertical-align: middle;
 }