diff --git a/BTCPayServer/Views/Account/ForgotPassword.cshtml b/BTCPayServer/Views/Account/ForgotPassword.cshtml
index 48d7fc087..5c3262a8b 100644
--- a/BTCPayServer/Views/Account/ForgotPassword.cshtml
+++ b/BTCPayServer/Views/Account/ForgotPassword.cshtml
@@ -14,8 +14,8 @@
         </div>
         }
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
             </div>
             <div class="col-md-4">
diff --git a/BTCPayServer/Views/Account/Lockout.cshtml b/BTCPayServer/Views/Account/Lockout.cshtml
index 4d8c0e1cf..d7bc0e07e 100644
--- a/BTCPayServer/Views/Account/Lockout.cshtml
+++ b/BTCPayServer/Views/Account/Lockout.cshtml
@@ -5,8 +5,8 @@
     <div class="container">
 
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
             </div>
 
diff --git a/BTCPayServer/Views/Account/LoginWith2fa.cshtml b/BTCPayServer/Views/Account/LoginWith2fa.cshtml
index 2438df386..166aebff0 100644
--- a/BTCPayServer/Views/Account/LoginWith2fa.cshtml
+++ b/BTCPayServer/Views/Account/LoginWith2fa.cshtml
@@ -3,8 +3,8 @@
 <section>
     <div class="container-fluid">
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">Two-factor authentication</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>Two-factor authentication</h2>
                 <hr class="primary">
             </div>
         </div>
@@ -28,7 +28,7 @@
                 <div class="form-group">
                     <button type="submit" class="btn btn-primary">Log in</button>
                 </div>
-                
+
             </form>
         </div>
         <div class="row">
diff --git a/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml b/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml
index 6298b2c96..1af51bcaa 100644
--- a/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml
+++ b/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml
@@ -8,8 +8,8 @@
 <section>
     <div class="container">
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
                 <p>
                     You have requested to login with a recovery code. This login will not be remembered until you provide
diff --git a/BTCPayServer/Views/Account/LoginWithU2F.cshtml b/BTCPayServer/Views/Account/LoginWithU2F.cshtml
index e7b832382..97949f43d 100644
--- a/BTCPayServer/Views/Account/LoginWithU2F.cshtml
+++ b/BTCPayServer/Views/Account/LoginWithU2F.cshtml
@@ -16,10 +16,10 @@
 <section>
     <div class="container-fluid">
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading"><span class="fa fa-spinner fa-spin"></span>U2F Authentication</h2>
+            <div class="col-lg-12 section-heading">
+                <h2><span class="fa fa-spinner fa-spin"></span>U2F Authentication</h2>
                 <hr class="primary">
-                
+
                 <p>Insert your U2F device or a hardware wallet into your computer's USB port. If it has a button, tap on it.</p>
             </div>
         </div>
diff --git a/BTCPayServer/Views/Account/SecondaryLogin.cshtml b/BTCPayServer/Views/Account/SecondaryLogin.cshtml
index 4c6c2dd5e..1d985d167 100644
--- a/BTCPayServer/Views/Account/SecondaryLogin.cshtml
+++ b/BTCPayServer/Views/Account/SecondaryLogin.cshtml
@@ -8,24 +8,24 @@
         @if (Model.LoginWith2FaViewModel != null && Model.LoginWithU2FViewModel != null)
         {
             <div class="row">
-                <div class="col-lg-12 text-center">
-                    <h2 class="section-heading">@ViewData["Title"]</h2>
+                <div class="col-lg-12 section-heading">
+                    <h2>@ViewData["Title"]</h2>
                     <hr class="primary">
-                    
+
                     <div asp-validation-summary="ModelOnly" class="text-danger"></div>
                 </div>
             </div>
         }else if (Model.LoginWith2FaViewModel == null && Model.LoginWithU2FViewModel == null)
         {
             <div class="row">
-                <div class="col-lg-12 text-center">
-                    <h2 class="section-heading bg-danger">Both 2FA and U2F Authentication Methods are not available. Please go to the https endpoint</h2>
+                <div class="col-lg-12 section-heading">
+                    <h2 class="bg-danger">Both 2FA and U2F Authentication Methods are not available. Please go to the https endpoint</h2>
                     <hr class="danger">
                 </div>
             </div>
         }
-        
-        
+
+
         <div class="row justify-content-center">
             @if (Model.LoginWith2FaViewModel != null)
             {
diff --git a/BTCPayServer/Views/Apps/CreateApp.cshtml b/BTCPayServer/Views/Apps/CreateApp.cshtml
index 50bc80c55..09ca302c6 100644
--- a/BTCPayServer/Views/Apps/CreateApp.cshtml
+++ b/BTCPayServer/Views/Apps/CreateApp.cshtml
@@ -5,8 +5,8 @@
 <section>
     <div class="container">
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
             </div>
         </div>
diff --git a/BTCPayServer/Views/Apps/ListApps.cshtml b/BTCPayServer/Views/Apps/ListApps.cshtml
index 88632663d..db1b81dc0 100644
--- a/BTCPayServer/Views/Apps/ListApps.cshtml
+++ b/BTCPayServer/Views/Apps/ListApps.cshtml
@@ -14,8 +14,8 @@
             </div>
         }
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
                 <p>Create and manage apps.</p>
             </div>
diff --git a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml b/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
index ef6d272b7..ffcb90361 100644
--- a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
+++ b/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
@@ -25,8 +25,8 @@
     </div>
     <div class="container">
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
             </div>
         </div>
diff --git a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
index bdb1c9900..0e412913b 100644
--- a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
+++ b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
@@ -25,8 +25,8 @@
     </div>
     <div class="container">
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
             </div>
         </div>
diff --git a/BTCPayServer/Views/Authorization/Authorize.cshtml b/BTCPayServer/Views/Authorization/Authorize.cshtml
index f4d9cb170..57085b8d9 100644
--- a/BTCPayServer/Views/Authorization/Authorize.cshtml
+++ b/BTCPayServer/Views/Authorization/Authorize.cshtml
@@ -14,8 +14,8 @@
     <section>
         <div class="card container">
             <div class="row">
-                <div class="col-lg-12 text-center">
-                    <h2 class="section-heading">Authorization Request</h2>
+                <div class="col-lg-12 section-heading">
+                    <h2>Authorization Request</h2>
                     <hr class="primary">
                     <p>@Model.ApplicationName is requesting access to your account.</p>
                 </div>
diff --git a/BTCPayServer/Views/Home/BitpayTranslator.cshtml b/BTCPayServer/Views/Home/BitpayTranslator.cshtml
index 98b25abd1..302563c85 100644
--- a/BTCPayServer/Views/Home/BitpayTranslator.cshtml
+++ b/BTCPayServer/Views/Home/BitpayTranslator.cshtml
@@ -21,8 +21,8 @@
             </div>
         }
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">The Bitpay Translator</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>The Bitpay Translator</h2>
                 <hr class="primary">
                 <p>Bitpay is using a deprecated standard in their invoices that most wallets do not support. Use this tool to transform their invoices to a regular address/amount.</p>
             </div>
diff --git a/BTCPayServer/Views/Home/Home.cshtml b/BTCPayServer/Views/Home/Home.cshtml
index 5aec22c65..07912c8ed 100644
--- a/BTCPayServer/Views/Home/Home.cshtml
+++ b/BTCPayServer/Views/Home/Home.cshtml
@@ -19,7 +19,7 @@
     <div class="container">
         <div class="row">
             <div class="col-lg-12 text-center">
-                <h2 class="section-heading">A Payment Server for Bitcoin</h2>
+                <h2>A Payment Server for Bitcoin</h2>
                 <hr class="primary">
             </div>
         </div>
@@ -73,7 +73,7 @@
     <div class="container">
         <div class="row">
             <div class="col-lg-8 mx-auto text-center">
-                <h2 class="section-heading">Donate</h2>
+                <h2>Donate</h2>
                 <hr class="primary">
                 <p>
                     BTCPay Server is proudly free and open-source, built and maintained<br /> by a world-wide community of passionate contributors.<br />
@@ -92,7 +92,7 @@
 <div class="container">
     <div class="row">
         <div class="col-lg-8 mx-auto text-center">
-            <h2 class="section-heading">Let's Get In Touch!</h2>
+            <h2>Let's Get In Touch!</h2>
             <hr class="primary">
             <p>
                 An open source project is nothing without its community<br />
@@ -100,6 +100,8 @@
             </p>
         </div>
     </div>
+    <br />
+    <br />
     <div class="row">
         <div class="col-lg-3 ml-auto text-center">
             <a href="https://chat.btcpayserver.org/" target="_blank">
@@ -131,4 +133,3 @@
         </div>
     </div>
 </div>
-
diff --git a/BTCPayServer/Views/Invoice/CreateInvoice.cshtml b/BTCPayServer/Views/Invoice/CreateInvoice.cshtml
index 0edee5a80..5ba652967 100644
--- a/BTCPayServer/Views/Invoice/CreateInvoice.cshtml
+++ b/BTCPayServer/Views/Invoice/CreateInvoice.cshtml
@@ -13,8 +13,8 @@
 <section>
     <div class="container">
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
             </div>
         </div>
diff --git a/BTCPayServer/Views/Invoice/Invoice.cshtml b/BTCPayServer/Views/Invoice/Invoice.cshtml
index 099b21692..f49544c58 100644
--- a/BTCPayServer/Views/Invoice/Invoice.cshtml
+++ b/BTCPayServer/Views/Invoice/Invoice.cshtml
@@ -27,8 +27,8 @@
         }
 
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
             </div>
         </div>
diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
index 5dd86093f..49c4653c9 100644
--- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
@@ -18,8 +18,8 @@
         }
 
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
                 <p>Create, search or pay an invoice. (<a href="#help" data-toggle="collapse">Help</a>)</p>
                 <div id="help" class="collapse text-left">
diff --git a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
index 5bb6cccf7..5d5ce1d24 100644
--- a/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
@@ -5,8 +5,8 @@
 <section>
     <div class="container">
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@(string.IsNullOrEmpty(Model.Id) ? "Create" : "Edit") Payment Request</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@(string.IsNullOrEmpty(Model.Id) ? "Create" : "Edit") Payment Request</h2>
                 <hr class="primary">
             </div>
         </div>
diff --git a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml b/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
index 50874a7d5..443bc00d3 100644
--- a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
@@ -14,8 +14,9 @@
             </div>
         }
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">Payment Requests</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>Payment Requests</h2>
+                <hr class="primary">
             </div>
         </div>
         <div class="row no-gutter" style="margin-bottom: 5px;">
diff --git a/BTCPayServer/Views/Shared/_NavLayout.cshtml b/BTCPayServer/Views/Shared/_NavLayout.cshtml
index 41437ef2c..08e8d46b3 100644
--- a/BTCPayServer/Views/Shared/_NavLayout.cshtml
+++ b/BTCPayServer/Views/Shared/_NavLayout.cshtml
@@ -11,10 +11,10 @@
 <section>
     <div class="container">
         <div class="row">
-            <div class="col-lg-12">
+            <div class="col-lg-12 section-heading">
                 @if (ViewBag.ShowMenu)
                 {
-                    <h4 class="section-heading">@title</h4>
+                    <h2>@title</h2>
                     <hr class="primary ml-0">
                 }
             </div>
diff --git a/BTCPayServer/Views/Stores/RequestPairing.cshtml b/BTCPayServer/Views/Stores/RequestPairing.cshtml
index fca35e04c..d4eafab1d 100644
--- a/BTCPayServer/Views/Stores/RequestPairing.cshtml
+++ b/BTCPayServer/Views/Stores/RequestPairing.cshtml
@@ -6,8 +6,8 @@
 <section>
     <div class="container">
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
                 <p>Create and manage store settings.</p>
             </div>
diff --git a/BTCPayServer/Views/UserStores/CreateStore.cshtml b/BTCPayServer/Views/UserStores/CreateStore.cshtml
index d7c0edc10..b1d3da5b6 100644
--- a/BTCPayServer/Views/UserStores/CreateStore.cshtml
+++ b/BTCPayServer/Views/UserStores/CreateStore.cshtml
@@ -5,8 +5,8 @@
 <section>
     <div class="container">
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
             </div>
         </div>
diff --git a/BTCPayServer/Views/UserStores/ListStores.cshtml b/BTCPayServer/Views/UserStores/ListStores.cshtml
index db4620df1..b0c376b6f 100644
--- a/BTCPayServer/Views/UserStores/ListStores.cshtml
+++ b/BTCPayServer/Views/UserStores/ListStores.cshtml
@@ -14,8 +14,8 @@
         </div>
         }
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
                 <p>Create and manage store settings.</p>
             </div>
diff --git a/BTCPayServer/Views/Wallets/ListWallets.cshtml b/BTCPayServer/Views/Wallets/ListWallets.cshtml
index abed6f779..9ea3b1327 100644
--- a/BTCPayServer/Views/Wallets/ListWallets.cshtml
+++ b/BTCPayServer/Views/Wallets/ListWallets.cshtml
@@ -15,8 +15,8 @@
         }
 
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">@ViewData["Title"]</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>@ViewData["Title"]</h2>
                 <hr class="primary">
                 <p>Create and manage wallets. <a href="https://docs.btcpayserver.org/features/wallet" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a></p>
             </div>
diff --git a/BTCPayServer/Views/Wallets/WalletPSBTReady.cshtml b/BTCPayServer/Views/Wallets/WalletPSBTReady.cshtml
index f2b76fe8d..7cb09e21f 100644
--- a/BTCPayServer/Views/Wallets/WalletPSBTReady.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletPSBTReady.cshtml
@@ -12,8 +12,8 @@
             </div>
         }
         <div class="row">
-            <div class="col-lg-12 text-center">
-                <h2 class="section-heading">Transaction review</h2>
+            <div class="col-lg-12 section-heading">
+                <h2>Transaction review</h2>
                 <hr class="primary">
                 @if (Model.CanCalculateBalance)
                 {
diff --git a/BTCPayServer/wwwroot/css/creative.css b/BTCPayServer/wwwroot/css/creative.css
index eced54071..e24433398 100644
--- a/BTCPayServer/wwwroot/css/creative.css
+++ b/BTCPayServer/wwwroot/css/creative.css
@@ -22,17 +22,18 @@ p {
 }
 
 hr {
-  max-width: 50px;
-  border-width: 3px;
-  border-color: var(--btcpay-color-primary);
+  width: 50px;
+  height: 3px;
+  background: var(--btcpay-color-primary);
+  display: inline-block;
 }
 
 hr.light {
-  border-color: var(--btcpay-color-white);
+  background: var(--btcpay-color-white);
 }
 
 #mainNav {
-  background-color: var(--btcpay-bg-dark);
+  background: var(--btcpay-bg-dark);
   font-family: var(--btcpay-font-family-head);
   transition: all 0.2s;
 }
diff --git a/BTCPayServer/wwwroot/css/site.css b/BTCPayServer/wwwroot/css/site.css
index 0c8ffc162..4e600a79c 100644
--- a/BTCPayServer/wwwroot/css/site.css
+++ b/BTCPayServer/wwwroot/css/site.css
@@ -45,6 +45,10 @@ html {
     }
 }
 
+.section-heading {
+    text-align: var(--btcpay-section-heading-text-align, center);
+}
+
 a.nav-link {
     color: var(--btcpay-color-nav-link, var(--btcpay-color-neutral-600));
     background: var(--btcpay-bg-nav-link, transparent);
diff --git a/BTCPayServer/wwwroot/css/themes/classic.css b/BTCPayServer/wwwroot/css/themes/classic.css
index d53fc6a1a..49c98c7a8 100644
--- a/BTCPayServer/wwwroot/css/themes/classic.css
+++ b/BTCPayServer/wwwroot/css/themes/classic.css
@@ -68,7 +68,7 @@ html {
 }
 
 .table {
-  margin: 16px 0;
+  margin: 1rem 0;
   border: 1px solid var(--btcpay-color-neutral-300);
   border-radius: 4px;
   border-collapse: separate !important;
diff --git a/BTCPayServer/wwwroot/css/themes/modern.css b/BTCPayServer/wwwroot/css/themes/modern.css
index 490f52fb4..e269aa816 100644
--- a/BTCPayServer/wwwroot/css/themes/modern.css
+++ b/BTCPayServer/wwwroot/css/themes/modern.css
@@ -53,6 +53,8 @@
   --btcpay-color-link: var(--btcpay-color-primary);
   --btcpay-color-link-hover: var(--btcpay-color-primary-dark);
 
+  --btcpay-section-heading-text-align: left;
+
   --btcpay-font-size-base: 16px;
   --btcpay-font-family-head: 'Open Sans', 'Helvetica Neue', Arial, sans-serif;
   --btcpay-font-family-base: -apple-system, 'Open Sans', BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
@@ -72,7 +74,7 @@ header.masthead::before,
   filter: hue-rotate(410deg) saturate(33%); }
 
 .table {
-  margin: 24px 0 48px;
+  margin: 1.5rem 0 3rem;
 }
 
 .table th {