diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index 1d048e9d7..a0beddb13 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -8,15 +8,19 @@
   <ItemGroup>
     <Compile Remove="Build\dockerfiles\**" />
     <Compile Remove="wwwroot\bundles\jqueryvalidate\**" />
+    <Compile Remove="wwwroot\css\**" />
     <Compile Remove="wwwroot\vendor\jquery-nice-select\**" />
     <Content Remove="Build\dockerfiles\**" />
     <Content Remove="wwwroot\bundles\jqueryvalidate\**" />
+    <Content Remove="wwwroot\css\**" />
     <Content Remove="wwwroot\vendor\jquery-nice-select\**" />
     <EmbeddedResource Remove="Build\dockerfiles\**" />
     <EmbeddedResource Remove="wwwroot\bundles\jqueryvalidate\**" />
+    <EmbeddedResource Remove="wwwroot\css\**" />
     <EmbeddedResource Remove="wwwroot\vendor\jquery-nice-select\**" />
     <None Remove="Build\dockerfiles\**" />
     <None Remove="wwwroot\bundles\jqueryvalidate\**" />
+    <None Remove="wwwroot\css\**" />
     <None Remove="wwwroot\vendor\jquery-nice-select\**" />
   </ItemGroup>
   <ItemGroup>
@@ -108,7 +112,6 @@
 
 	<ItemGroup>
 	  <Folder Include="Build\" />
-	  <Folder Include="wwwroot\css\" />
 	  <Folder Include="wwwroot\vendor\clipboard.js\" />
 	</ItemGroup>
 
diff --git a/BTCPayServer/Views/Account/ExternalLogin.cshtml b/BTCPayServer/Views/Account/ExternalLogin.cshtml
index d08d86076..0da0eccc9 100644
--- a/BTCPayServer/Views/Account/ExternalLogin.cshtml
+++ b/BTCPayServer/Views/Account/ExternalLogin.cshtml
@@ -22,7 +22,7 @@
                 <input asp-for="Email" class="form-control" />
                 <span asp-validation-for="Email" class="text-danger"></span>
             </div>
-            <button type="submit" class="btn btn-default">Register</button>
+            <button type="submit" class="btn btn-primary">Register</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Account/ForgotPassword.cshtml b/BTCPayServer/Views/Account/ForgotPassword.cshtml
index c5a8e7c7b..d7997c1e1 100644
--- a/BTCPayServer/Views/Account/ForgotPassword.cshtml
+++ b/BTCPayServer/Views/Account/ForgotPassword.cshtml
@@ -15,7 +15,7 @@
                 <input asp-for="Email" class="form-control" />
                 <span asp-validation-for="Email" class="text-danger"></span>
             </div>
-            <button type="submit" class="btn btn-default">Submit</button>
+            <button type="submit" class="btn btn-primary">Submit</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Account/Login.cshtml b/BTCPayServer/Views/Account/Login.cshtml
index f1a69ab9e..c9af42dde 100644
--- a/BTCPayServer/Views/Account/Login.cshtml
+++ b/BTCPayServer/Views/Account/Login.cshtml
@@ -41,7 +41,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <button type="submit" class="btn btn-default">Log in</button>
+                            <button type="submit" class="btn btn-primary">Log in</button>
                         </div>
                         <div class="form-group">
                             <p>
@@ -76,7 +76,7 @@
                                     <p>
                                         @foreach(var provider in loginProviders)
                                         {
-                                            <button type="submit" class="btn btn-default" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.Name</button>
+                                            <button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.Name</button>
                                         }
                                     </p>
                                 </div>
diff --git a/BTCPayServer/Views/Account/LoginWith2fa.cshtml b/BTCPayServer/Views/Account/LoginWith2fa.cshtml
index 0d7be98e9..e5ce75168 100644
--- a/BTCPayServer/Views/Account/LoginWith2fa.cshtml
+++ b/BTCPayServer/Views/Account/LoginWith2fa.cshtml
@@ -31,7 +31,7 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <button type="submit" class="btn btn-default">Log in</button>
+                        <button type="submit" class="btn btn-primary">Log in</button>
                     </div>
                 </form>
             </div>
diff --git a/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml b/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml
index e2eb4c5a5..00d04a8a2 100644
--- a/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml
+++ b/BTCPayServer/Views/Account/LoginWithRecoveryCode.cshtml
@@ -18,7 +18,7 @@
                 <input asp-for="RecoveryCode" class="form-control" autocomplete="off" />
                 <span asp-validation-for="RecoveryCode" class="text-danger"></span>
             </div>
-            <button type="submit" class="btn btn-default">Log in</button>
+            <button type="submit" class="btn btn-primary">Log in</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Account/Register.cshtml b/BTCPayServer/Views/Account/Register.cshtml
index 67ddab5c3..1c9175918 100644
--- a/BTCPayServer/Views/Account/Register.cshtml
+++ b/BTCPayServer/Views/Account/Register.cshtml
@@ -35,7 +35,7 @@
                         <input asp-for="ConfirmPassword" class="form-control" />
                         <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
                     </div>
-                    <button type="submit" class="btn btn-default">Register</button>
+                    <button type="submit" class="btn btn-primary">Register</button>
                 </form>
             </div>
         </div>
diff --git a/BTCPayServer/Views/Account/ResetPassword.cshtml b/BTCPayServer/Views/Account/ResetPassword.cshtml
index d55c6793e..a501ff2df 100644
--- a/BTCPayServer/Views/Account/ResetPassword.cshtml
+++ b/BTCPayServer/Views/Account/ResetPassword.cshtml
@@ -26,7 +26,7 @@
                 <input asp-for="ConfirmPassword" class="form-control" />
                 <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
             </div>
-            <button type="submit" class="btn btn-default">Reset</button>
+            <button type="submit" class="btn btn-primary">Reset</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Apps/CreateApp.cshtml b/BTCPayServer/Views/Apps/CreateApp.cshtml
index 12cbe9763..8cb9517cb 100644
--- a/BTCPayServer/Views/Apps/CreateApp.cshtml
+++ b/BTCPayServer/Views/Apps/CreateApp.cshtml
@@ -28,7 +28,7 @@
                         <select asp-for="SelectedStore" asp-items="Model.Stores" class="form-control"></select>
                     </div>
                     <div class="form-group">
-                        <input type="submit" value="Create" class="btn btn-default" />
+                        <input type="submit" value="Create" class="btn btn-primary" />
                     </div>
                 </form>
                 <a asp-action="ListApps">Back to the app list</a>
diff --git a/BTCPayServer/Views/Invoice/CreateInvoice.cshtml b/BTCPayServer/Views/Invoice/CreateInvoice.cshtml
index c68271699..2ff8cdeec 100644
--- a/BTCPayServer/Views/Invoice/CreateInvoice.cshtml
+++ b/BTCPayServer/Views/Invoice/CreateInvoice.cshtml
@@ -55,7 +55,7 @@
                         <span asp-validation-for="StoreId" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-                        <input type="submit" value="Create" class="btn btn-default" />
+                        <input type="submit" value="Create" class="btn btn-primary" />
                     </div>
                 </form>
                 <a asp-action="ListInvoices">Back to List</a>
diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
index 656f87e11..c74fa1da5 100644
--- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
@@ -30,7 +30,7 @@
                         <input asp-for="SearchTerm" class="form-control" />
                         <input type="hidden" asp-for="Count" />
                         <span asp-validation-for="SearchTerm" class="text-danger"></span>
-                        <button type="submit" class="btn btn-default" title="Search invoice">
+                        <button type="submit" class="btn btn-primary" title="Search invoice">
                             <span class="fa fa-search"></span> Search
                         </button>
                     </form>
@@ -134,7 +134,7 @@
                 </div>
                 <div class="modal-footer">
                     <button type="submit" class="btn btn-danger">Yes, make invoice Invalid</button>
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-primary" data-dismiss="modal">Cancel</button>
                 </div>
             </div>
 
diff --git a/BTCPayServer/Views/Manage/ChangePassword.cshtml b/BTCPayServer/Views/Manage/ChangePassword.cshtml
index 0f7b041c9..4cb15dbda 100644
--- a/BTCPayServer/Views/Manage/ChangePassword.cshtml
+++ b/BTCPayServer/Views/Manage/ChangePassword.cshtml
@@ -25,7 +25,7 @@
                 <input asp-for="ConfirmPassword" class="form-control" />
                 <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
             </div>
-            <button type="submit" class="btn btn-default">Update password</button>
+            <button type="submit" class="btn btn-primary">Update password</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml b/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml
index b515d09b4..3da7075ba 100644
--- a/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml
+++ b/BTCPayServer/Views/Manage/EnableAuthenticator.cshtml
@@ -37,7 +37,7 @@
                             <input asp-for="Code" class="form-control" autocomplete="off" />
                             <span asp-validation-for="Code" class="text-danger"></span>
                         </div>
-                        <button type="submit" class="btn btn-default">Verify</button>
+                        <button type="submit" class="btn btn-primary">Verify</button>
                         <div asp-validation-summary="ModelOnly" class="text-danger"></div>
                     </form>
                 </div>
diff --git a/BTCPayServer/Views/Manage/ExternalLogins.cshtml b/BTCPayServer/Views/Manage/ExternalLogins.cshtml
index 9f54d8c5e..d2c8bd0ca 100644
--- a/BTCPayServer/Views/Manage/ExternalLogins.cshtml
+++ b/BTCPayServer/Views/Manage/ExternalLogins.cshtml
@@ -21,7 +21,7 @@
                                 <div>
                                     <input asp-for="@login.LoginProvider" name="LoginProvider" type="hidden" />
                                     <input asp-for="@login.ProviderKey" name="ProviderKey" type="hidden" />
-                                    <button type="submit" class="btn btn-default" title="Remove this @login.LoginProvider login from your account">Remove</button>
+                                    <button type="submit" class="btn btn-primary" title="Remove this @login.LoginProvider login from your account">Remove</button>
                                 </div>
                             </form>
                         }
@@ -44,7 +44,7 @@
             <p>
                 @foreach (var provider in Model.OtherLogins)
                 {
-                    <button type="submit" class="btn btn-default" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
+                    <button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
                 }
             </p>
         </div>
diff --git a/BTCPayServer/Views/Manage/Index.cshtml b/BTCPayServer/Views/Manage/Index.cshtml
index ba0420895..62a46c999 100644
--- a/BTCPayServer/Views/Manage/Index.cshtml
+++ b/BTCPayServer/Views/Manage/Index.cshtml
@@ -35,7 +35,7 @@
                 }
                 <span asp-validation-for="Email" class="text-danger"></span>
             </div>
-            <button type="submit" class="btn btn-default">Save</button>
+            <button type="submit" class="btn btn-primary">Save</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Manage/SetPassword.cshtml b/BTCPayServer/Views/Manage/SetPassword.cshtml
index 56c359935..02f99df15 100644
--- a/BTCPayServer/Views/Manage/SetPassword.cshtml
+++ b/BTCPayServer/Views/Manage/SetPassword.cshtml
@@ -24,7 +24,7 @@
                 <input asp-for="ConfirmPassword" class="form-control" />
                 <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
             </div>
-            <button type="submit" class="btn btn-default">Set password</button>
+            <button type="submit" class="btn btn-primary">Set password</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml b/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml
index 2741ee194..767da9e24 100644
--- a/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml
+++ b/BTCPayServer/Views/Manage/TwoFactorAuthentication.cshtml
@@ -29,19 +29,19 @@
         </div>
     }
 
-    <a asp-action="Disable2faWarning" class="btn btn-default">Disable 2FA</a>
-    <a asp-action="GenerateRecoveryCodes" class="btn btn-default">Reset recovery codes</a>
+    <a asp-action="Disable2faWarning" class="btn btn-primary">Disable 2FA</a>
+    <a asp-action="GenerateRecoveryCodes" class="btn btn-primary">Reset recovery codes</a>
 }
 
 <h5>Authenticator app</h5>
 @if(!Model.HasAuthenticator)
 {
-    <a asp-action="EnableAuthenticator" class="btn btn-default">Add authenticator app</a>
+    <a asp-action="EnableAuthenticator" class="btn btn-primary">Add authenticator app</a>
 }
 else
 {
-    <a asp-action="EnableAuthenticator" class="btn btn-default">Configure authenticator app</a>
-    <a asp-action="ResetAuthenticatorWarning" class="btn btn-default">Reset authenticator key</a>
+    <a asp-action="EnableAuthenticator" class="btn btn-primary">Configure authenticator app</a>
+    <a asp-action="ResetAuthenticatorWarning" class="btn btn-primary">Reset authenticator key</a>
 }
 
 @section Scripts {
diff --git a/BTCPayServer/Views/Server/Emails.cshtml b/BTCPayServer/Views/Server/Emails.cshtml
index 640854070..b7726e638 100644
--- a/BTCPayServer/Views/Server/Emails.cshtml
+++ b/BTCPayServer/Views/Server/Emails.cshtml
@@ -57,7 +57,7 @@
             </div>
 
             <button type="submit" class="btn btn-success" name="command" value="Save">Save</button>
-            <button type="submit" class="btn btn-default" name="command" value="Test">Test</button>
+            <button type="submit" class="btn btn-primary" name="command" value="Test">Test</button>
         </form>
     </div>
 </div>
diff --git a/BTCPayServer/Views/Stores/CreateToken.cshtml b/BTCPayServer/Views/Stores/CreateToken.cshtml
index 8325a990f..8e0807e77 100644
--- a/BTCPayServer/Views/Stores/CreateToken.cshtml
+++ b/BTCPayServer/Views/Stores/CreateToken.cshtml
@@ -49,7 +49,7 @@
             {
                 <input type="hidden" asp-for="StoreId" />}
             <div class="form-group">
-                <input type="submit" value="Request pairing" class="btn btn-default" />
+                <input type="submit" value="Request pairing" class="btn btn-primary" />
             </div>
         </form>
     </div>
diff --git a/BTCPayServer/Views/UserStores/CreateStore.cshtml b/BTCPayServer/Views/UserStores/CreateStore.cshtml
index bf00a50d9..795a6cdf6 100644
--- a/BTCPayServer/Views/UserStores/CreateStore.cshtml
+++ b/BTCPayServer/Views/UserStores/CreateStore.cshtml
@@ -20,7 +20,7 @@
                         <span asp-validation-for="Name" class="text-danger"></span>
                     </div>
                     <div class="form-group">
-                        <input type="submit" value="Create" class="btn btn-default" />
+                        <input type="submit" value="Create" class="btn btn-primary" />
                     </div>
                 </form>
                 <a asp-action="ListStores">Back to List</a>