diff --git a/BTCPayServer/Views/UIInvoice/Invoice.cshtml b/BTCPayServer/Views/UIInvoice/Invoice.cshtml
index e309c0c78..f9de9939f 100644
--- a/BTCPayServer/Views/UIInvoice/Invoice.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Invoice.cshtml
@@ -106,7 +106,7 @@
             <button href="#" class="btn btn-secondary text-nowrap" data-bs-toggle="tooltip" title="You can only refund an invoice that has been settled. Please wait for the transaction to confirm on the blockchain before attempting to refund it." disabled>Issue refund</button>
         }
         <form asp-action="ToggleArchive" asp-route-invoiceId="@Model.Id" method="post">
-            <button type="submit" class="btn @(Model.Archived ? "btn-warning" : "btn btn-danger")" id="btn-archive-toggle">
+            <button type="submit" class="btn btn-secondary" id="btn-archive-toggle">
                 @if (Model.Archived)
                 {
                     <span class="text-nowrap" data-bs-toggle="tooltip" title="Unarchive this invoice">Unarchive</span>
diff --git a/BTCPayServer/Views/UIServer/ListUsers.cshtml b/BTCPayServer/Views/UIServer/ListUsers.cshtml
index 22d5c9e9c..a4bd3e351 100644
--- a/BTCPayServer/Views/UIServer/ListUsers.cshtml
+++ b/BTCPayServer/Views/UIServer/ListUsers.cshtml
@@ -23,7 +23,7 @@
     var sortByAsc = "Sort by ascending...";
 }
 
-<div class="d-flex align-items-center justify-content-between mb-4">
+<div class="d-flex align-items-center justify-content-between mb-3">
     <h3 class="mb-0">@ViewData["Title"]</h3>
     <a asp-action="CreateUser" class="btn btn-primary" role="button" id="CreateUser">
         <span class="fa fa-plus"></span>
@@ -31,7 +31,7 @@
     </a>
 </div>
 
-<form asp-action="ListUsers" asp-route-sortOrder="@(userEmailSortOrder)" style="max-width:960px" class="mb-4">
+<form asp-action="ListUsers" asp-route-sortOrder="@(userEmailSortOrder)" style="max-width:640px">
     <div class="input-group">
         <input asp-for="SearchTerm" class="form-control" placeholder="Search by email..." />
         <button type="submit" class="btn btn-secondary" title="Search by email">
diff --git a/BTCPayServer/wwwroot/main/layout.css b/BTCPayServer/wwwroot/main/layout.css
index 9e4187853..8742e35de 100644
--- a/BTCPayServer/wwwroot/main/layout.css
+++ b/BTCPayServer/wwwroot/main/layout.css
@@ -553,7 +553,7 @@
         --header-height: var(--desktop-header-height);
         --content-padding-top: 5rem;
         --content-padding-bottom: 5rem;
-        --content-padding-horizontal: var(--btcpay-space-xl);
+        --content-padding-horizontal: 5rem;
     }
     
     #mainMenu {