diff --git a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
index c1a82649e..f8784cfdd 100644
--- a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
+++ b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
@@ -35,7 +35,7 @@
                         <span asp-validation-for="Template" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-                        <input type="submit" class="btn btn-success" />
+                        <input type="submit" class="btn btn-primary" />
                     </div>
                 </form>
                 <a asp-action="ListApps">Back to the app list</a>
diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
index e15011704..c90bf0870 100644
--- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
@@ -39,7 +39,7 @@
         </div>
 
         <div class="row">
-            <a asp-action="CreateInvoice" class="btn btn-success" role="button"><span class="fa fa-plus"></span> Create a new invoice</a>
+            <a asp-action="CreateInvoice" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new invoice</a>
             <table class="table table-sm table-responsive-md">
                 <thead>
                     <tr>
diff --git a/BTCPayServer/Views/Server/Emails.cshtml b/BTCPayServer/Views/Server/Emails.cshtml
index b7726e638..04694abd1 100644
--- a/BTCPayServer/Views/Server/Emails.cshtml
+++ b/BTCPayServer/Views/Server/Emails.cshtml
@@ -56,7 +56,7 @@
                 <input asp-for="TestEmail" class="form-control" />
             </div>
 
-            <button type="submit" class="btn btn-success" name="command" value="Save">Save</button>
+            <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
             <button type="submit" class="btn btn-primary" name="command" value="Test">Test</button>
         </form>
     </div>
diff --git a/BTCPayServer/Views/Server/Policies.cshtml b/BTCPayServer/Views/Server/Policies.cshtml
index f744ac4dc..f8c99b5d5 100644
--- a/BTCPayServer/Views/Server/Policies.cshtml
+++ b/BTCPayServer/Views/Server/Policies.cshtml
@@ -23,7 +23,7 @@
                 <label asp-for="LockSubscription"></label>
                 <input asp-for="LockSubscription" type="checkbox" class="form-check-inline" />
             </div>
-            <button type="submit" class="btn btn-success" name="command" value="Save">Save</button>
+            <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Server/User.cshtml b/BTCPayServer/Views/Server/User.cshtml
index 56a1d8d05..8cf3b44d4 100644
--- a/BTCPayServer/Views/Server/User.cshtml
+++ b/BTCPayServer/Views/Server/User.cshtml
@@ -16,7 +16,7 @@
                 <label asp-for="IsAdmin"></label>
                 <input asp-for="IsAdmin" type="checkbox" class="form-check" />
             </div>
-            <button name="command" type="submit" class="btn btn-success" value="Save">Save</button>
+            <button name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
index dd167bd47..5e9e42120 100644
--- a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
+++ b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
@@ -116,7 +116,7 @@
                     <input asp-for="HintAddress" class="form-control" />
                     <span asp-validation-for="HintAddress" class="text-danger"></span>
                 </div>
-                <button name="command" type="submit" class="btn btn-success">Confirm</button>
+                <button name="command" type="submit" class="btn btn-primary">Confirm</button>
             }
         </form>
     </div>
diff --git a/BTCPayServer/Views/Stores/AddLightningNode.cshtml b/BTCPayServer/Views/Stores/AddLightningNode.cshtml
index 3289245f2..d938480b7 100644
--- a/BTCPayServer/Views/Stores/AddLightningNode.cshtml
+++ b/BTCPayServer/Views/Stores/AddLightningNode.cshtml
@@ -46,7 +46,7 @@
                     </p>
                 }
             </div>
-            <button name="command" type="submit" value="save" class="btn btn-success">Submit</button>
+            <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>
         </form>
     </div>
diff --git a/BTCPayServer/Views/Stores/CheckoutExperience.cshtml b/BTCPayServer/Views/Stores/CheckoutExperience.cshtml
index 8899f4d97..93d552083 100644
--- a/BTCPayServer/Views/Stores/CheckoutExperience.cshtml
+++ b/BTCPayServer/Views/Stores/CheckoutExperience.cshtml
@@ -50,7 +50,7 @@
                 <span asp-validation-for="OnChainMinValue" class="text-danger"></span>
                 <p class="form-text text-muted">Example: 5.50 USD</p>
             </div>
-            <button name="command" type="submit" class="btn btn-success" value="Save">Save</button>
+            <button name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Stores/ListTokens.cshtml b/BTCPayServer/Views/Stores/ListTokens.cshtml
index 006df3e54..b301f358d 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-success" 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/StoreUsers.cshtml b/BTCPayServer/Views/Stores/StoreUsers.cshtml
index 7af89d36a..dc4b4d6c0 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-success"><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">
diff --git a/BTCPayServer/Views/Stores/UpdateStore.cshtml b/BTCPayServer/Views/Stores/UpdateStore.cshtml
index 1f9d82ccc..5672902cc 100644
--- a/BTCPayServer/Views/Stores/UpdateStore.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateStore.cshtml
@@ -137,7 +137,7 @@
                     Available placeholders are: {StoreName}, {ItemDescription} and {OrderId}
                 </p>
             </div>
-            <button name="command" type="submit" class="btn btn-success" value="Save">Save</button>
+            <button name="command" type="submit" class="btn btn-primary" value="Save">Save</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Stores/Wallet.cshtml b/BTCPayServer/Views/Stores/Wallet.cshtml
index fbdf41455..70fbeeee3 100644
--- a/BTCPayServer/Views/Stores/Wallet.cshtml
+++ b/BTCPayServer/Views/Stores/Wallet.cshtml
@@ -58,7 +58,7 @@
                 <label>Subtract fees from amount</label>
                 <input id="substract-checkbox" name="SubstractFees" class="form-check" type="checkbox" />
             </div>
-            <button id="confirm-button" name="command" type="submit" class="btn btn-success">Confirm</button>
+            <button id="confirm-button" name="command" type="submit" class="btn btn-primary">Confirm</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/UserStores/ListStores.cshtml b/BTCPayServer/Views/UserStores/ListStores.cshtml
index 8a911d5da..3ae4ebf58 100644
--- a/BTCPayServer/Views/UserStores/ListStores.cshtml
+++ b/BTCPayServer/Views/UserStores/ListStores.cshtml
@@ -21,7 +21,7 @@
         </div>
 
         <div class="row">
-            <a asp-action="CreateStore" class="btn btn-success" role="button"><span class="fa fa-plus"></span> Create a new store</a>
+            <a asp-action="CreateStore" class="btn btn-primary" role="button"><span class="fa fa-plus"></span> Create a new store</a>
             <table class="table table-sm table-responsive-md">
                 <thead>
                     <tr>