diff --git a/BTCPayServer/Views/Shared/EmailsBody.cshtml b/BTCPayServer/Views/Shared/EmailsBody.cshtml
index 281cf4ebd..af015ae84 100644
--- a/BTCPayServer/Views/Shared/EmailsBody.cshtml
+++ b/BTCPayServer/Views/Shared/EmailsBody.cshtml
@@ -5,7 +5,7 @@
         <div class="d-flex align-items-center justify-content-between mb-4">
             <h3 class="mb-0">@ViewData["Title"]</h3>
             <div class="dropdown only-for-js" id="quick-fill">
-                <button class="btn btn-primary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="QuickFillDropdownToggle">
+                <button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="QuickFillDropdownToggle">
                     Quick Fill
                 </button>
                 <div class="dropdown-menu" aria-labelledby="QuickFillDropdownToggle">
@@ -46,7 +46,7 @@
                 <span asp-validation-for="Settings.FromDisplay" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <label asp-for="Settings.From" class="form-label">Sender's email address</label>
+                <label asp-for="Settings.From" class="form-label">Sender's Email Address</label>
                 <input asp-for="Settings.From" class="form-control"/>
                 <span asp-validation-for="Settings.From" class="text-danger"></span>
             </div>
diff --git a/BTCPayServer/Views/UIApps/UpdateCrowdfund.cshtml b/BTCPayServer/Views/UIApps/UpdateCrowdfund.cshtml
index 7e0cd895a..6cb1d4a4c 100644
--- a/BTCPayServer/Views/UIApps/UpdateCrowdfund.cshtml
+++ b/BTCPayServer/Views/UIApps/UpdateCrowdfund.cshtml
@@ -65,7 +65,7 @@
             </div>
             <div class="form-group mb-0">
                 <div class="d-flex align-items-center mb-3">
-                    <input asp-for="Enabled" type="checkbox" class="btcpay-toggle me-2"/>
+                    <input asp-for="Enabled" type="checkbox" class="btcpay-toggle me-3"/>
                     <label asp-for="Enabled" class="form-label mb-0"></label>
                 </div>
                 <span asp-validation-for="Enabled" class="text-danger"></span>
@@ -180,7 +180,7 @@
             <h3 class="mt-5 mb-4">Sound</h3>
             <div class="form-group mb-0">
                 <div class="d-flex align-items-center">
-                    <input asp-for="SoundsEnabled" type="checkbox" class="btcpay-toggle me-2" data-bs-toggle="collapse" data-bs-target="#SoundsEnabledSettings" aria-expanded="@Model.SoundsEnabled" aria-controls="SoundsEnabledSettings"/>
+                    <input asp-for="SoundsEnabled" type="checkbox" class="btcpay-toggle me-3" data-bs-toggle="collapse" data-bs-target="#SoundsEnabledSettings" aria-expanded="@Model.SoundsEnabled" aria-controls="SoundsEnabledSettings"/>
                     <label asp-for="SoundsEnabled" class="form-label mb-0"></label>
                     <span asp-validation-for="SoundsEnabled" class="text-danger"></span>
                 </div>
@@ -196,7 +196,7 @@
             <h3 class="mt-5 mb-4">Animation</h3>
             <div class="form-group mb-3">
                 <div class="d-flex align-items-center">
-                    <input asp-for="AnimationsEnabled" type="checkbox" class="btcpay-toggle me-2" data-bs-toggle="collapse" data-bs-target="#AnimationsEnabledSettings" aria-expanded="@Model.AnimationsEnabled" aria-controls="AnimationsEnabledSettings"/>
+                    <input asp-for="AnimationsEnabled" type="checkbox" class="btcpay-toggle me-3" data-bs-toggle="collapse" data-bs-target="#AnimationsEnabledSettings" aria-expanded="@Model.AnimationsEnabled" aria-controls="AnimationsEnabledSettings"/>
                     <label asp-for="AnimationsEnabled" class="form-label mb-0"></label>
                     <span asp-validation-for="AnimationsEnabled" class="text-danger"></span>
                 </div>
@@ -212,7 +212,7 @@
             <h3 class="mt-5 mb-4">Discussion</h3>
             <div class="form-group mb-3">
                 <div class="d-flex align-items-center">
-                    <input asp-for="DisqusEnabled" type="checkbox" class="btcpay-toggle me-2" data-bs-toggle="collapse" data-bs-target="#DisqusEnabledSettings" aria-expanded="@Model.DisqusEnabled" aria-controls="DisqusEnabledSettings"/>
+                    <input asp-for="DisqusEnabled" type="checkbox" class="btcpay-toggle me-3" data-bs-toggle="collapse" data-bs-target="#DisqusEnabledSettings" aria-expanded="@Model.DisqusEnabled" aria-controls="DisqusEnabledSettings"/>
                     <label asp-for="DisqusEnabled" class="form-label mb-0"></label>
                     <span asp-validation-for="DisqusEnabled" class="text-danger"></span>
                 </div>
diff --git a/BTCPayServer/Views/UIApps/UpdatePointOfSale.cshtml b/BTCPayServer/Views/UIApps/UpdatePointOfSale.cshtml
index bb55c3898..f5c75c339 100644
--- a/BTCPayServer/Views/UIApps/UpdatePointOfSale.cshtml
+++ b/BTCPayServer/Views/UIApps/UpdatePointOfSale.cshtml
@@ -93,7 +93,7 @@
             <section id="custom-payments" class="p-0">
                 <h3 class="mt-5 mb-4">Custom Payments</h3>
                 <div class="form-group mb-4 d-flex align-items-center">
-                    <input asp-for="ShowCustomAmount" type="checkbox" class="btcpay-toggle me-2" data-bs-toggle="collapse" data-bs-target="#CustomAmountSettings" aria-expanded="@Model.ShowCustomAmount" aria-controls="CustomAmountSettings"/>
+                    <input asp-for="ShowCustomAmount" type="checkbox" class="btcpay-toggle me-3" data-bs-toggle="collapse" data-bs-target="#CustomAmountSettings" aria-expanded="@Model.ShowCustomAmount" aria-controls="CustomAmountSettings"/>
                     <label asp-for="ShowCustomAmount" class="form-label mb-0"></label>
                     <span asp-validation-for="ShowCustomAmount" class="text-danger"></span>
                 </div>
@@ -107,8 +107,8 @@
             </section>
             <section id="tips" class="p-0">
                 <h3 class="mt-5 mb-4">Tips</h3>
-                <div class="form-group d-flex align-items-center mb-0">
-                    <input asp-for="EnableTips" type="checkbox" class="btcpay-toggle me-2" data-bs-toggle="collapse" data-bs-target="#CustomTipsSettings" aria-expanded="@Model.EnableTips" aria-controls="CustomTipsSettings" />
+                <div class="form-group d-flex align-items-center">
+                    <input asp-for="EnableTips" type="checkbox" class="btcpay-toggle me-3" data-bs-toggle="collapse" data-bs-target="#CustomTipsSettings" aria-expanded="@Model.EnableTips" aria-controls="CustomTipsSettings" />
                     <label asp-for="EnableTips" class="form-label mb-0"></label>
                     <span asp-validation-for="EnableTips" class="text-danger"></span>
                 </div>
diff --git a/BTCPayServer/Views/UIManage/Index.cshtml b/BTCPayServer/Views/UIManage/Index.cshtml
index 1052ac57f..b136da1d1 100644
--- a/BTCPayServer/Views/UIManage/Index.cshtml
+++ b/BTCPayServer/Views/UIManage/Index.cshtml
@@ -10,19 +10,19 @@
         {
             <div asp-validation-summary="All" class="text-danger"></div>
         }
-        <div class="form-group row">
-            <div class="col-md-6 mb-3">
+        <div class="form-group">
+            <div class="col-md-6">
                 <label asp-for="Username" class="form-label"></label>
                 <input asp-for="Username" class="form-control" disabled />
             </div>
         </div>
         <div class="form-group row">
-            <div class="col-md-6 mb-3">
+            <div class="col-md-6">
                 <label asp-for="Email" class="form-label"></label>
                 <input asp-for="Email" class="form-control" />
                 <span asp-validation-for="Email" class="text-danger"></span>
             </div>
-            <div class="col-md-6 mb-3 d-flex align-items-end">
+            <div class="col-md-6 d-flex align-items-end">
                 @if (Model.IsEmailConfirmed)
                 {
                     <span class="badge bg-success p-2 my-1">
@@ -36,7 +36,7 @@
                 }
             </div>
         </div>
-        <button type="submit" id="save" class="btn btn-primary">Save</button>
+        <button type="submit" id="save" class="btn btn-primary mt-2">Save</button>
         <h3 class="mt-5 mb-4">Delete Account</h3>
         <div id="danger-zone">
             <a id="delete-user" class="btn btn-outline-danger mb-5" data-confirm-input="DELETE" data-bs-toggle="modal" data-bs-target="#ConfirmModal" asp-action="DeleteUserPost" data-description="This action will also delete all stores, invoices, apps and data associated with the user.">Delete Account</a>
diff --git a/BTCPayServer/Views/UIServer/Maintenance.cshtml b/BTCPayServer/Views/UIServer/Maintenance.cshtml
index 88c140d23..8b9ff2187 100644
--- a/BTCPayServer/Views/UIServer/Maintenance.cshtml
+++ b/BTCPayServer/Views/UIServer/Maintenance.cshtml
@@ -7,31 +7,23 @@
 
 <form method="post">
     <div class="row mb-5">
-    <div class="col-xl-8 col-xxl-constrain">
+        <div class="col-xl-8 col-xxl-constrain">
             <h4 class="mb-2">Domain name</h4>
             <p>You can change the domain name of your server by following <a href="https://docs.btcpayserver.org/Deployment/ChangeDomain/" target="_blank" rel="noreferrer noopener">this guide</a>.</p>
 
             <div class="d-flex">
                 <input asp-for="DNSDomain" class="form-control flex-fill" disabled="@(Model.CanUseSSH ? null : "disabled")" />
                 <span asp-validation-for="DNSDomain" class="text-danger"></span>
-                <button name="command" type="submit" class="btn btn-primary ms-3" value="changedomain" title="Change domain" disabled="@(Model.CanUseSSH ? null : "disabled")">
+                <button name="command" type="submit" class="btn btn-secondary ms-3" value="changedomain" title="Change domain" disabled="@(Model.CanUseSSH ? null : "disabled")">
                     Confirm
                 </button>
             </div>
 
-            <h4 class="mt-5 mb-2">Update</h4>
-            <p>Update to the latest version of BTCPay Server.</p>
-            <div class="form-group">
-                <div class="input-group">
-                    <button name="command" type="submit" class="btn btn-primary" value="update" disabled="@(Model.CanUseSSH ? null : "disabled")">Update</button>
-                </div>
-            </div>
-
             <h4 class="mt-5 mb-2">Restart</h4>
             <p>Restart BTCPay Server and related services.</p>
             <div class="form-group">
                 <div class="input-group">
-                    <button name="command" type="submit" class="btn btn-primary" value="restart" disabled="@(Model.CanUseSSH ? null : "disabled")">Restart</button>
+                    <button name="command" type="submit" class="btn btn-secondary" value="restart" disabled="@(Model.CanUseSSH ? null : "disabled")">Restart</button>
                 </div>
             </div>
 
@@ -42,6 +34,14 @@
                     <button name="command" type="submit" class="btn btn-secondary" value="clean" disabled="@(Model.CanUseSSH ? null : "disabled")">Clean</button>
                 </div>
             </div>
+
+            <h4 class="mt-5 mb-2">Update</h4>
+            <p>Update to the latest version of BTCPay Server.</p>
+            <div class="form-group">
+                <div class="input-group">
+                    <button name="command" type="submit" class="btn btn-primary" value="update" disabled="@(Model.CanUseSSH ? null : "disabled")">Update</button>
+                </div>
+            </div>
         </div>
     </div>
 </form>
diff --git a/BTCPayServer/Views/UIServer/Policies.cshtml b/BTCPayServer/Views/UIServer/Policies.cshtml
index 79746860c..51ab3c3e8 100644
--- a/BTCPayServer/Views/UIServer/Policies.cshtml
+++ b/BTCPayServer/Views/UIServer/Policies.cshtml
@@ -16,7 +16,7 @@
 <form method="post">
     <div class="form-group mb-5">
         <h4 class="mb-3">Existing User Settings</h4>
-        <div class="form-check my-1">
+        <div class="form-check my-3">
             <input asp-for="AllowLightningInternalNodeForAll" type="checkbox" class="form-check-input"/>
             <label asp-for="AllowLightningInternalNodeForAll" class="form-check-label"></label>
             <a href="https://docs.btcpayserver.org/FAQ/LightningNetwork/#how-many-users-can-use-lightning-network-in-btcpay" target="_blank" rel="noreferrer noopener">
@@ -24,7 +24,7 @@
             </a>
             <span asp-validation-for="AllowLightningInternalNodeForAll" class="text-danger"></span>
         </div>
-        <div class="form-check my-1">
+        <div class="form-check my-3">
             <input asp-for="AllowHotWalletForAll" type="checkbox" class="form-check-input"/>
             <label asp-for="AllowHotWalletForAll" class="form-check-label"></label>
             <a href="https://docs.btcpayserver.org/CreateWallet/#requirements-to-create-wallets" target="_blank" rel="noreferrer noopener">
@@ -32,7 +32,7 @@
             </a>
             <span asp-validation-for="AllowHotWalletForAll" class="text-danger"></span>
         </div>
-        <div class="form-check my-1">
+        <div class="form-check my-3">
             <input asp-for="AllowHotWalletRPCImportForAll" type="checkbox" class="form-check-input"/>
             <label asp-for="AllowHotWalletRPCImportForAll" class="form-check-label"></label>
             <span asp-validation-for="AllowHotWalletRPCImportForAll" class="text-danger"></span>
@@ -41,7 +41,7 @@
 
     <div class="form-group mb-5">
         <h4 class="mb-3">New User Settings</h4>
-        <div class="form-check my-1">
+        <div class="form-check my-3">
             @{
                 var emailSettings = (await _SettingsRepository.GetSettingAsync<EmailSettings>()) ?? new EmailSettings();
                 /* The "|| Model.RequiresConfirmedEmail" check is for the case when a user had checked
@@ -61,13 +61,13 @@
                 </div>
             }
         </div>
-        <div class="form-check my-1">
+        <div class="form-check my-3">
             <input asp-for="LockSubscription" type="checkbox" class="form-check-input"/>
             <label asp-for="LockSubscription" class="form-check-label"></label>
             <span asp-validation-for="LockSubscription" class="text-danger"></span>
         </div>
 
-        <div class="form-check my-1">
+        <div class="form-check my-3">
             <input asp-for="DisableNonAdminCreateUserApi" type="checkbox" class="form-check-input"/>
             <label asp-for="DisableNonAdminCreateUserApi" class="form-check-label"></label>
             <span asp-validation-for="DisableNonAdminCreateUserApi" class="text-danger"></span>
@@ -76,7 +76,7 @@
 
     <div class="form-group mb-5">
         <h4 class="mb-3">Notification Settings</h4>
-        <div class="form-check my-1">
+        <div class="form-check my-3">
             <input asp-for="DisableInstantNotifications" type="checkbox" class="form-check-input"/>
             <label asp-for="DisableInstantNotifications" class="form-check-label"></label>
             <a href="https://docs.btcpayserver.org/Notifications/#notifications" target="_blank" rel="noreferrer noopener">
@@ -84,7 +84,7 @@
             </a>
             <span asp-validation-for="DisableInstantNotifications" class="text-danger"></span>
         </div>
-        <div class="form-check my-1">
+        <div class="form-check my-3">
             <input asp-for="DisableStoresToUseServerEmailSettings" type="checkbox" class="form-check-input"/>
             <label asp-for="DisableStoresToUseServerEmailSettings" class="form-check-label"></label>
             <a href="https://docs.btcpayserver.org/Notifications/#server-emails" target="_blank" rel="noreferrer noopener">
@@ -98,13 +98,13 @@
         <h4 class="mb-3">Maintenance Settings</h4>
         @if (ViewBag.UpdateUrlPresent)
         {
-            <div class="form-check my-1">
+            <div class="form-check my-3">
                 <input asp-for="CheckForNewVersions" type="checkbox" class="form-check-input"/>
                 <label asp-for="CheckForNewVersions" class="form-check-label"></label>
                 <span asp-validation-for="CheckForNewVersions" class="text-danger"></span>
             </div>
         }
-        <div class="form-check my-1">
+        <div class="form-check my-3">
             <input asp-for="DiscourageSearchEngines" type="checkbox" class="form-check-input"/>
             <label asp-for="DiscourageSearchEngines" class="form-check-label"></label>
             <a href="https://docs.btcpayserver.org/FAQ/ServerSettings/#how-to-hide-my-btcpay-server-from-search-engines" target="_blank" rel="noreferrer noopener">
diff --git a/BTCPayServer/Views/UIServer/Theme.cshtml b/BTCPayServer/Views/UIServer/Theme.cshtml
index 537e7b0da..aef63961d 100644
--- a/BTCPayServer/Views/UIServer/Theme.cshtml
+++ b/BTCPayServer/Views/UIServer/Theme.cshtml
@@ -18,7 +18,7 @@
                 <div asp-validation-summary="All" class="text-danger"></div>
             }
             <div class="form-group d-flex align-items-center">
-                <input asp-for="CustomTheme" type="checkbox" class="btcpay-toggle me-2" data-bs-toggle="collapse" data-bs-target="#CustomThemeSettings" aria-expanded="@Model.CustomTheme" aria-controls="CustomThemeSettings" />
+                <input asp-for="CustomTheme" type="checkbox" class="btcpay-toggle me-3" data-bs-toggle="collapse" data-bs-target="#CustomThemeSettings" aria-expanded="@Model.CustomTheme" aria-controls="CustomThemeSettings" />
                 <label asp-for="CustomTheme" class="form-label mb-0"></label>
                 <span asp-validation-for="CustomTheme" class="text-danger"></span>
             </div>
diff --git a/BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml b/BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml
index b53a307de..e5b810f29 100644
--- a/BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml
+++ b/BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml
@@ -43,15 +43,15 @@
                     </table>
                 </div>
             }
-            <div class="form-check my-1">
+            <div class="form-check my-3">
                 <input asp-for="RequiresRefundEmail" type="checkbox" class="form-check-input" />
                 <label asp-for="RequiresRefundEmail" class="form-check-label"></label>
             </div>
-            <div class="form-check my-1">
+            <div class="form-check my-3">
                 <input asp-for="LazyPaymentMethods" type="checkbox" class="form-check-input" />
                 <label asp-for="LazyPaymentMethods" class="form-check-label"></label>
             </div>
-            <div class="form-check my-1">
+            <div class="form-check my-3">
                 <input asp-for="RedirectAutomatically" type="checkbox" class="form-check-input" />
                 <label asp-for="RedirectAutomatically" class="form-check-label"></label>
             </div>
diff --git a/BTCPayServer/Views/UIStores/GeneralSettings.cshtml b/BTCPayServer/Views/UIStores/GeneralSettings.cshtml
index 40d0b29ab..92e268ccb 100644
--- a/BTCPayServer/Views/UIStores/GeneralSettings.cshtml
+++ b/BTCPayServer/Views/UIStores/GeneralSettings.cshtml
@@ -34,7 +34,7 @@
                 <span asp-validation-for="DefaultCurrency" class="text-danger"></span>
             </div>
             <div class="form-group d-flex align-items-center">
-                <input asp-for="AnyoneCanCreateInvoice" type="checkbox" class="btcpay-toggle me-2"/>
+                <input asp-for="AnyoneCanCreateInvoice" type="checkbox" class="btcpay-toggle me-3"/>
                 <label asp-for="AnyoneCanCreateInvoice" class="form-label mb-0 me-1"></label>
                 <a href="https://docs.btcpayserver.org/FAQ/Stores/#allow-anyone-to-create-invoice" target="_blank" rel="noreferrer noopener">
                     <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
diff --git a/BTCPayServer/Views/UIStores/LightningSettings.cshtml b/BTCPayServer/Views/UIStores/LightningSettings.cshtml
index 5a5848ff5..1eb525da4 100644
--- a/BTCPayServer/Views/UIStores/LightningSettings.cshtml
+++ b/BTCPayServer/Views/UIStores/LightningSettings.cshtml
@@ -47,7 +47,7 @@
                   asp-route-storeId="@Model.StoreId"
                   class="d-flex align-items-center mt-4"
                   style="min-width:7rem">
-                <button type="submit" class="btcpay-toggle me-2 @if (Model.Enabled) { @("btcpay-toggle--active") }" name="Enabled" value="@(Model.Enabled ? "false" : "true")" id="@($"{Model.CryptoCode}LightningEnabled")">@(Model.Enabled ? "Disable" : "Enable")</button>
+                <button type="submit" class="btcpay-toggle me-3 @if (Model.Enabled) { @("btcpay-toggle--active") }" name="Enabled" value="@(Model.Enabled ? "false" : "true")" id="@($"{Model.CryptoCode}LightningEnabled")">@(Model.Enabled ? "Disable" : "Enable")</button>
                 <span>
                     Enabled
                 </span>
@@ -56,15 +56,15 @@
             <form method="post" class="mt-n2 text-center">
                 <div class="text-start">
                     <h3 class="mt-5 mb-3">Payment</h3>
-                    <div class="form-check my-1">
+                    <div class="form-check my-3">
                         <input asp-for="LightningAmountInSatoshi" type="checkbox" class="form-check-input"/>
                         <label asp-for="LightningAmountInSatoshi" class="form-check-label"></label>
                     </div>
-                    <div class="form-check my-1">
+                    <div class="form-check my-3">
                         <input asp-for="LightningPrivateRouteHints" type="checkbox" class="form-check-input"/>
                         <label asp-for="LightningPrivateRouteHints" class="form-check-label"></label>
                     </div>
-                    <div class="form-check my-1">
+                    <div class="form-check my-3">
                         <input asp-for="OnChainWithLnInvoiceFallback" type="checkbox" class="form-check-input"/>
                         <label asp-for="OnChainWithLnInvoiceFallback" class="form-check-label"></label>
                     </div>
@@ -80,35 +80,35 @@
                     
                     <h3 class="mt-5 mb-3" id="ln-url">LNURL</h3>
                     <div class="d-flex align-items-center">
-                        <input asp-for="LNURLEnabled" type="checkbox" class="btcpay-toggle me-2" data-bs-toggle="collapse" data-bs-target="#LNURLSettings" aria-expanded="@Model.LNURLEnabled" aria-controls="LNURLSettings"/>
+                        <input asp-for="LNURLEnabled" type="checkbox" class="btcpay-toggle me-3" data-bs-toggle="collapse" data-bs-target="#LNURLSettings" aria-expanded="@Model.LNURLEnabled" aria-controls="LNURLSettings"/>
                         <label asp-for="LNURLEnabled" class="form-label mb-0 me-1"></label>
                     </div>
                     <div class="collapse @(Model.LNURLEnabled ? "show" : "")" id="LNURLSettings">
                         <div class="form-group">
                             <div class="d-flex align-items-center pt-4">
-                                <input type="checkbox" asp-for="LNURLBech32Mode" class="btcpay-toggle me-2"/>
+                                <input type="checkbox" asp-for="LNURLBech32Mode" class="btcpay-toggle me-3"/>
                                 <label asp-for="LNURLBech32Mode" class="form-label mb-0 me-1"></label>
                                 <span asp-validation-for="LNURLBech32Mode" class="text-danger"></span>
                             </div>
-                            <p class="form-text text-muted mb-0 ms-5">For wallet compatibility: Bech32 encoded (classic) vs. cleartext URL (upcoming)</p>
+                            <p class="form-text text-muted mb-0">For wallet compatibility: Bech32 encoded (classic) vs. cleartext URL (upcoming)</p>
                         </div>
                         <div class="form-group">
                             <div class="d-flex align-items-center">
-                                <input type="checkbox" asp-for="LNURLStandardInvoiceEnabled" class="btcpay-toggle me-2"/>
+                                <input type="checkbox" asp-for="LNURLStandardInvoiceEnabled" class="btcpay-toggle me-3"/>
                                 <label asp-for="LNURLStandardInvoiceEnabled" class="form-label mb-0 me-1"></label>
                             </div>
-                            <p class="form-text text-muted mb-0 ms-5">Required for Lightning Address, the pay button and apps.</p>
+                            <p class="form-text text-muted mb-0">Required for Lightning Address, the pay button and apps.</p>
                         </div>
                         <div class="form-group">
                             <div class="d-flex align-items-center">
-                                <input type="checkbox" asp-for="DisableBolt11PaymentMethod" class="btcpay-toggle me-2"/>
+                                <input type="checkbox" asp-for="DisableBolt11PaymentMethod" class="btcpay-toggle me-3"/>
                                 <label asp-for="DisableBolt11PaymentMethod" class="form-label mb-0 me-1"></label>
                             </div>
-                            <p class="form-text text-muted mb-0 ms-5">Performance: Turn it off if users should pay only via LNURL.</p>
+                            <p class="form-text text-muted mb-0">Performance: Turn it off if users should pay only via LNURL.</p>
                         </div>
                         <div class="form-group mb-0 pb-2">
                             <div class="d-flex align-items-center">
-                                <input type="checkbox" asp-for="LUD12Enabled" class="btcpay-toggle me-2"/>
+                                <input type="checkbox" asp-for="LUD12Enabled" class="btcpay-toggle me-3"/>
                                 <label asp-for="LUD12Enabled" class="form-label mb-0 me-1"></label>
                             </div>
                         </div>
diff --git a/BTCPayServer/Views/UIStores/ModifyWebhook.cshtml b/BTCPayServer/Views/UIStores/ModifyWebhook.cshtml
index 314bb581a..43600b16a 100644
--- a/BTCPayServer/Views/UIStores/ModifyWebhook.cshtml
+++ b/BTCPayServer/Views/UIStores/ModifyWebhook.cshtml
@@ -32,15 +32,19 @@
                 <p class="text-muted small form-text">The endpoint receiving the payload must validate the payload by checking that the HTTP header <code>BTCPAY-SIG</code> of the callback matches the HMAC256 of the secret on the payload's body bytes.</p>
             </div>
             <div class="form-group">
-                <label asp-for="AutomaticRedelivery" class="form-label">Automatic redelivery</label>
-                <input asp-for="AutomaticRedelivery" type="checkbox" class="btcpay-toggle ms-2" />                
+                <label class="d-flex align-items-center mb-2">
+                    <input asp-for="AutomaticRedelivery" type="checkbox" class="btcpay-toggle me-3" />
+                    <span>Automatic redelivery</span>
+                </label>
                 <p class="text-muted small form-text">We will try to redeliver any failed delivery after 10 seconds, 1 minute and up to 6 times after 10 minutes</p>
             </div>
             <div class="form-group">
-                <label asp-for="Active" class="form-label">Is enabled</label>
-                <input asp-for="Active" type="checkbox" class="btcpay-toggle ms-2" />
+                <label class="d-flex align-items-center mb-2">
+                    <input asp-for="Active" type="checkbox" class="btcpay-toggle me-3" />
+                    <span>Is enabled</span>
+                </label>
             </div>
-            
+
             <h3 class="mb-3">Events</h3>
             <label asp-for="Everything" class="form-label">Which events would you like to trigger this webhook?</label>
             <select asp-for="Everything" class="form-select w-auto mb-3">
@@ -50,7 +54,7 @@
             <div id="event-selector" class="collapse">
                 <div class="pb-3">
                     @foreach (var evt in new[]
-                    {
+                   {
                         ("A new invoice has been created", WebhookEventType.InvoiceCreated),
                         ("A new payment has been received", WebhookEventType.InvoiceReceivedPayment),
                         ("A payment has been settled", WebhookEventType.InvoicePaymentSettled),
@@ -61,7 +65,7 @@
                     })
                     {
                         <div class="form-check my-1">
-                            <input name="Events" id="@evt.Item2" value="@evt.Item2" @(Model.Events.Contains(evt.Item2) ? "checked" : "") type="checkbox" class="form-check-input"/>
+                            <input name="Events" id="@evt.Item2" value="@evt.Item2" @(Model.Events.Contains(evt.Item2) ? "checked" : "") type="checkbox" class="form-check-input" />
                             <label for="@evt.Item2" class="form-check-label">@evt.Item1</label>
                         </div>
                     }
diff --git a/BTCPayServer/Views/UIStores/Rates.cshtml b/BTCPayServer/Views/UIStores/Rates.cshtml
index 076c7d87c..400050c41 100644
--- a/BTCPayServer/Views/UIStores/Rates.cshtml
+++ b/BTCPayServer/Views/UIStores/Rates.cshtml
@@ -160,7 +160,7 @@
             }
             <div class="form-group">
                 <label class="d-flex align-items-center mb-2">
-                    <button type="submit" id="ShowScripting" class="btcpay-toggle me-2 @if (Model.ShowScripting) { @("btcpay-toggle--active") }" value="scripting-@(Model.ShowScripting ? "off" : "on")" name="command" data-bs-toggle="modal" data-bs-target="#ConfirmModal">@(Model.ShowScripting ? "Disable" : "Enable") advanced rate rule scripting</button>
+                    <button type="submit" id="ShowScripting" class="btcpay-toggle me-3 @if (Model.ShowScripting) { @("btcpay-toggle--active") }" value="scripting-@(Model.ShowScripting ? "off" : "on")" name="command" data-bs-toggle="modal" data-bs-target="#ConfirmModal">@(Model.ShowScripting ? "Disable" : "Enable") advanced rate rule scripting</button>
                     <span>Advanced rate rule scripting</span>
                 </label>    
                 <p class="text-muted small form-text">