diff --git a/BTCPayServer/Views/Apps/ListApps.cshtml b/BTCPayServer/Views/Apps/ListApps.cshtml
index 05f3863ed..f61af878b 100644
--- a/BTCPayServer/Views/Apps/ListApps.cshtml
+++ b/BTCPayServer/Views/Apps/ListApps.cshtml
@@ -21,7 +21,7 @@
         </div>
 
         <div class="row">
-            <a asp-action="CreateApp" class="btn btn-success" role="button"><span class="fa fa-plus"></span> Create a new app</a>
+            <a asp-action="CreateApp" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new app</a>
             <table class="table table-sm table-responsive-md">
                 <thead>
                     <tr>
diff --git a/BTCPayServer/Views/Shared/Confirm.cshtml b/BTCPayServer/Views/Shared/Confirm.cshtml
index ad488cb3c..eb0c54855 100644
--- a/BTCPayServer/Views/Shared/Confirm.cshtml
+++ b/BTCPayServer/Views/Shared/Confirm.cshtml
@@ -15,7 +15,7 @@
         <div class="row">
             <div class="col-lg-12 text-center">
                 <form method="post">
-                    <button type="submit" class="btn btn-info btn-danger" title="Continue">@Model.Action</button>
+                    <button type="submit" class="btn btn-secondary btn-danger" title="Continue">@Model.Action</button>
                 </form>
             </div>
         </div>
diff --git a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
index 5e9e42120..f116aa55c 100644
--- a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
+++ b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
@@ -77,7 +77,7 @@
                         </tbody>
                     </table>
                 </div>
-                <button name="command" type="submit" class="btn btn-info">Continue</button>
+                <button name="command" type="submit" class="btn btn-primary">Continue</button>
             }
             else
             {
diff --git a/BTCPayServer/Views/Stores/AddLightningNode.cshtml b/BTCPayServer/Views/Stores/AddLightningNode.cshtml
index d938480b7..f6a6c4ac3 100644
--- a/BTCPayServer/Views/Stores/AddLightningNode.cshtml
+++ b/BTCPayServer/Views/Stores/AddLightningNode.cshtml
@@ -47,7 +47,7 @@
                 }
             </div>
             <button name="command" type="submit" value="save" class="btn btn-primary">Submit</button>
-            <button name="command" type="submit" value="test" class="btn btn-info">Test connection</button>
+            <button name="command" type="submit" value="test" class="btn btn-secondary">Test connection</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Stores/ListTokens.cshtml b/BTCPayServer/Views/Stores/ListTokens.cshtml
index b301f358d..eccc1a77b 100644
--- a/BTCPayServer/Views/Stores/ListTokens.cshtml
+++ b/BTCPayServer/Views/Stores/ListTokens.cshtml
@@ -8,7 +8,7 @@
 <h4>@ViewData["Title"]</h4>
 <p>You can allow a public key to access the API of this store</p>
 @Html.Partial("_StatusMessage", Model.StatusMessage)
-<a asp-action="CreateToken" class="btn btn-primary" role="button"><span class="fa fa-plus"></span>Create a new token</a>
+<a asp-action="CreateToken" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new token</a>
 <table class="table table-sm table-responsive-md">
     <thead>
         <tr>
diff --git a/BTCPayServer/Views/Stores/RequestPairing.cshtml b/BTCPayServer/Views/Stores/RequestPairing.cshtml
index 860d8f6aa..d41c617be 100644
--- a/BTCPayServer/Views/Stores/RequestPairing.cshtml
+++ b/BTCPayServer/Views/Stores/RequestPairing.cshtml
@@ -42,7 +42,7 @@
                         <span asp-validation-for="SelectedStore" class="text-danger"></span>
                     </div>
                     <input type="hidden" name="pairingCode" value="@Model.Id" />
-                    <button type="submit" class="btn btn-info" title="Approve this pairing demand">Approve</button>
+                    <button type="submit" class="btn btn-secondary" title="Approve this pairing demand">Approve</button>
                 </form>
             </div>
             <div class="col-md-4"></div>
diff --git a/BTCPayServer/Views/Stores/StoreUsers.cshtml b/BTCPayServer/Views/Stores/StoreUsers.cshtml
index dc4b4d6c0..6c0f04906 100644
--- a/BTCPayServer/Views/Stores/StoreUsers.cshtml
+++ b/BTCPayServer/Views/Stores/StoreUsers.cshtml
@@ -29,7 +29,7 @@
                     <option value="@StoreRoles.Owner">Owner</option>
                     <option value="@StoreRoles.Guest">Guest</option>
                 </select>
-                <button type="submit" role="button" class="form-control btn btn-primary"><span class="fa fa-plus"></span>Add user</button>
+                <button type="submit" role="button" class="form-control btn btn-primary"><span class="fa fa-plus"></span> Add user</button>
             </form>
         </div>
         <div class="form-group">