diff --git a/BTCPayServer/Views/Apps/ListApps.cshtml b/BTCPayServer/Views/Apps/ListApps.cshtml
index cc9eb8ebf..6371c1118 100644
--- a/BTCPayServer/Views/Apps/ListApps.cshtml
+++ b/BTCPayServer/Views/Apps/ListApps.cshtml
@@ -22,8 +22,8 @@
 
         <div class="row">
             <a asp-action="CreateApp" class="btn btn-success" role="button"><span class="glyphicon glyphicon-plus"></span> Create a new app</a>
-            <table class="table">
-                <thead class="thead-inverse">
+            <table class="table table-sm table-responsive-md mt-2">
+                <thead>
                     <tr>
                         <th>Store</th>
                         <th>Name</th>
@@ -32,11 +32,11 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach(var app in Model.Apps)
+                    @foreach (var app in Model.Apps)
                     {
                         <tr>
                             <td>
-                                @if(app.IsOwner)
+                                @if (app.IsOwner)
                                 {
                                     <span><a asp-action="UpdateStore" asp-controller="Stores" asp-route-storeId="@app.StoreId">@app.StoreName</a></span>
                                 }
@@ -48,7 +48,7 @@
                             <td>@app.AppName</td>
                             <td>@app.AppType</td>
                             <td style="text-align:right">
-                                @if(app.IsOwner)
+                                @if (app.IsOwner)
                                 {
                                     <a asp-action="@app.UpdateAction" asp-controller="Apps" asp-route-appId="@app.Id">Settings</a><span> - </span>
                                 }
diff --git a/BTCPayServer/Views/Invoice/Invoice.cshtml b/BTCPayServer/Views/Invoice/Invoice.cshtml
index e95defe5f..feb6d5d71 100644
--- a/BTCPayServer/Views/Invoice/Invoice.cshtml
+++ b/BTCPayServer/Views/Invoice/Invoice.cshtml
@@ -35,7 +35,7 @@
         <div class="row">
             <div class="col-md-6">
                 <h3>Information</h3>
-                <table class="table">
+                <table class="table table-sm">
                     <tr>
                         <th>Store</th>
                         <td><a href="@Model.StoreLink">@Model.StoreName</a></td>
@@ -93,7 +93,7 @@
 
             <div class="col-md-6">
                 <h3>Buyer information</h3>
-                <table class="table">
+                <table class="table table-sm">
                     <tr>
                         <th>Name
                         <th>
@@ -134,7 +134,7 @@
                 </table>
 
                 <h3>Product information</h3>
-                <table class="table">
+                <table class="table table-sm">
                     <tr>
                         <th>Item code</th>
                         <td>@Model.ProductInformation.ItemCode</td>
@@ -153,7 +153,7 @@
         <div class="row">
             <div class="col-md-12">
                 <h3>Paid summary</h3>
-                <table class="table">
+                <table class="table table-sm">
                     <thead class="thead-inverse">
                         <tr>
                             <th style="white-space:nowrap;">Payment method</th>
@@ -181,7 +181,7 @@
         <div class="row">
             <div class="col-md-12">
                 <h3>Payments</h3>
-                <table class="table">
+                <table class="table table-sm">
                     <thead class="thead-inverse">
                         <tr>
                             <th style="white-space:nowrap;">Payment method</th>
@@ -208,7 +208,7 @@
         <div class="row">
             <div class="col-md-12">
                 <h3>Addresses</h3>
-                <table class="table">
+                <table class="table table-sm">
                     <thead class="thead-inverse">
                         <tr>
                             <th style="white-space:nowrap;">Payment method</th>
@@ -232,7 +232,7 @@
         <div class="row">
             <div class="col-md-12">
                 <h3>Events</h3>
-                <table class="table">
+                <table class="table table-sm">
                     <thead class="thead-inverse">
                         <tr>
                             <th>Date</th>
diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
index 96707d2a5..2f889c0f7 100644
--- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
@@ -40,8 +40,8 @@
 
         <div class="row">
             <a asp-action="CreateInvoice" class="btn btn-success" role="button"><span class="glyphicon glyphicon-plus"></span> Create a new invoice</a>
-            <table class="table">
-                <thead class="thead-inverse">
+            <table class="table table-sm table-responsive-md mt-2">
+                <thead>
                     <tr>
                         <th>Date</th>
                         <th>OrderId</th>
diff --git a/BTCPayServer/Views/Manage/ExternalLogins.cshtml b/BTCPayServer/Views/Manage/ExternalLogins.cshtml
index b6aad3af8..9f54d8c5e 100644
--- a/BTCPayServer/Views/Manage/ExternalLogins.cshtml
+++ b/BTCPayServer/Views/Manage/ExternalLogins.cshtml
@@ -5,17 +5,17 @@
 }
 
 @Html.Partial("_StatusMessage", Model.StatusMessage)
-@if(Model.CurrentLogins?.Count > 0)
+@if (Model.CurrentLogins?.Count > 0)
 {
     <h4>Registered Logins</h4>
-    <table class="table">
+    <table class="table table-sm table-responsive-md mt-2">
         <tbody>
-            @foreach(var login in Model.CurrentLogins)
+            @foreach (var login in Model.CurrentLogins)
             {
                 <tr>
                     <td>@login.LoginProvider</td>
                     <td>
-                        @if(Model.ShowRemoveButton)
+                        @if (Model.ShowRemoveButton)
                         {
                             <form asp-action="RemoveLogin" method="post">
                                 <div>
@@ -35,14 +35,14 @@
         </tbody>
     </table>
 }
-@if(Model.OtherLogins?.Count > 0)
+@if (Model.OtherLogins?.Count > 0)
 {
     <h4>Add another service to log in.</h4>
     <hr />
     <form asp-action="LinkLogin" method="post" class="form-horizontal">
         <div id="socialLoginList">
             <p>
-                @foreach(var provider in Model.OtherLogins)
+                @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>
                 }
diff --git a/BTCPayServer/Views/Server/ListUsers.cshtml b/BTCPayServer/Views/Server/ListUsers.cshtml
index 44694ffe5..2fa761832 100644
--- a/BTCPayServer/Views/Server/ListUsers.cshtml
+++ b/BTCPayServer/Views/Server/ListUsers.cshtml
@@ -9,8 +9,8 @@
 @Html.Partial("_StatusMessage", Model.StatusMessage)
 
 
-<table class="table">
-    <thead class="thead-inverse">
+<table class="table table-sm table-responsive-md mt-2">
+    <thead>
         <tr>
             <th>Name</th>
             <th>Email</th>
@@ -18,7 +18,7 @@
         </tr>
     </thead>
     <tbody>
-        @foreach(var user in Model.Users)
+        @foreach (var user in Model.Users)
         {
             <tr>
                 <td>@user.Name</td>
diff --git a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
index 2c637b1dd..b6995a461 100644
--- a/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
+++ b/BTCPayServer/Views/Stores/AddDerivationScheme.cshtml
@@ -16,7 +16,7 @@
 <div class="row">
     <div class="col-md-8">
         <form method="post">
-            @if(!Model.Confirmation)
+            @if (!Model.Confirmation)
             {
                 <div class="form-group">
                     <h5>Derivation Scheme</h5>
@@ -33,7 +33,7 @@
                     <div id="ledger-info" class="form-text text-muted" style="display: none;">
                         <span>A ledger wallet is detected, which account do you want to use?</span>
                         <ul>
-                            @for(int i = 0; i < 4; i++)
+                            @for (int i = 0; i < 4; i++)
                             {
                                 <li><a class="ledger-info-recommended" data-ledgeraccount="@i" href="#">Account @i (49'/<span class="ledger-info-cointype">0</span>'/@i')</a></li>
                             }
@@ -42,8 +42,8 @@
                 </div>
                 <div class="form-group">
                     <span>BTCPay format memo</span>
-                    <table class="table">
-                        <thead class="thead-inverse">
+                    <table class="table table-sm table-responsive-md mt-2">
+                        <thead>
                             <tr>
                                 <th>Address type</th>
                                 <th>Example</th>
@@ -88,15 +88,15 @@
                 <input type="hidden" asp-for="Confirmation" />
                 <input type="hidden" asp-for="DerivationScheme" />
                 <div class="form-group">
-                    <table class="table">
-                        <thead class="thead-inverse">
+                    <table class="table table-sm table-responsive-md mt-2">
+                        <thead>
                             <tr>
                                 <th>Key path</th>
                                 <th>Address</th>
                             </tr>
                         </thead>
                         <tbody>
-                            @foreach(var sample in Model.AddressSamples)
+                            @foreach (var sample in Model.AddressSamples)
                             {
                                 <tr>
                                     <td>@sample.KeyPath</td>
diff --git a/BTCPayServer/Views/Stores/ListTokens.cshtml b/BTCPayServer/Views/Stores/ListTokens.cshtml
index 7b8839529..a4ff90d31 100644
--- a/BTCPayServer/Views/Stores/ListTokens.cshtml
+++ b/BTCPayServer/Views/Stores/ListTokens.cshtml
@@ -9,8 +9,8 @@
 <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="glyphicon glyphicon-plus"></span>Create a new token</a>
-<table class="table">
-    <thead class="thead-inverse">
+<table class="table table-sm table-responsive-md mt-2">
+    <thead>
         <tr>
             <th>Label</th>
             <th>SIN</th>
@@ -19,7 +19,7 @@
         </tr>
     </thead>
     <tbody>
-        @foreach(var token in Model.Tokens)
+        @foreach (var token in Model.Tokens)
         {
             <tr>
                 <td>@token.Label</td>
diff --git a/BTCPayServer/Views/Stores/RequestPairing.cshtml b/BTCPayServer/Views/Stores/RequestPairing.cshtml
index 9ed87d0ae..e72b40d00 100644
--- a/BTCPayServer/Views/Stores/RequestPairing.cshtml
+++ b/BTCPayServer/Views/Stores/RequestPairing.cshtml
@@ -15,7 +15,7 @@
         <div class="row">
             <div class="col-md-4"></div>
             <div class="col-md-4">
-                <table class="table">
+                <table class="table table-sm table-responsive-md mt-2">
                     <tr>
                         <th>Label</th>
                         <td style="text-align:right;">@Model.Label</td>
diff --git a/BTCPayServer/Views/Stores/StoreUsers.cshtml b/BTCPayServer/Views/Stores/StoreUsers.cshtml
index 828edc7af..40472d62e 100644
--- a/BTCPayServer/Views/Stores/StoreUsers.cshtml
+++ b/BTCPayServer/Views/Stores/StoreUsers.cshtml
@@ -17,8 +17,10 @@
     <div class="col-md-8">
         <div class="form-group">
             <h5>Users</h5>
-            <span>Add access to your store to other users (Guest will not be able to see and modify the store settings)<br />
-            Note that the user must have a registered account on this BTCPay Server.</span>
+            <span>
+                Add access to your store to other users (Guest will not be able to see and modify the store settings)<br />
+                Note that the user must have a registered account on this BTCPay Server.
+            </span>
         </div>
         <div class="form-inline">
             <form method="post">
@@ -31,8 +33,8 @@
             </form>
         </div>
         <div class="form-group">
-            <table class="table">
-                <thead class="thead-inverse">
+            <table class="table table-sm table-responsive-md mt-2">
+                <thead>
                     <tr>
                         <th>Email</th>
                         <th>Role</th>
@@ -40,7 +42,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach(var user in Model.Users)
+                    @foreach (var user in Model.Users)
                     {
                         <tr>
                             <td>@user.Email</td>
diff --git a/BTCPayServer/Views/Stores/UpdateStore.cshtml b/BTCPayServer/Views/Stores/UpdateStore.cshtml
index 2a18fa082..182a1ff1c 100644
--- a/BTCPayServer/Views/Stores/UpdateStore.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateStore.cshtml
@@ -72,8 +72,8 @@
             </div>
 
             <div class="form-group">
-                <table class="table">
-                    <thead class="thead-inverse">
+                <table class="table table-sm table-responsive-md mt-2">
+                    <thead>
                         <tr>
                             <th>Crypto</th>
                             <th>Derivation Scheme</th>
@@ -81,13 +81,13 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach(var scheme in Model.DerivationSchemes)
+                        @foreach (var scheme in Model.DerivationSchemes)
                         {
                             <tr>
                                 <td>@scheme.Crypto</td>
                                 <td style="max-width:300px;overflow:hidden;">@scheme.Value</td>
                                 <td style="text-align:right">
-                                    @if(!string.IsNullOrWhiteSpace(scheme.Value))
+                                    @if (!string.IsNullOrWhiteSpace(scheme.Value))
                                     {
                                         <a asp-action="Wallet" asp-route-cryptoCode="@scheme.Crypto">Wallet</a><span> - </span>
                                     }
@@ -108,8 +108,8 @@
                     </p>
                 </div>
                 <div class="form-group">
-                    <table class="table">
-                        <thead class="thead-inverse">
+                    <table class="table table-sm table-responsive-md mt-2">
+                        <thead>
                             <tr>
                                 <th>Crypto</th>
                                 <th>Address</th>
@@ -117,7 +117,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            @foreach(var scheme in Model.LightningNodes)
+                            @foreach (var scheme in Model.LightningNodes)
                             {
                                 <tr>
                                     <td>@scheme.CryptoCode</td>
diff --git a/BTCPayServer/Views/UserStores/ListStores.cshtml b/BTCPayServer/Views/UserStores/ListStores.cshtml
index 7759f7f23..0b569c72b 100644
--- a/BTCPayServer/Views/UserStores/ListStores.cshtml
+++ b/BTCPayServer/Views/UserStores/ListStores.cshtml
@@ -22,8 +22,8 @@
 
         <div class="row">
             <a asp-action="CreateStore" class="btn btn-success" role="button"><span class="glyphicon glyphicon-plus"></span> Create a new store</a>
-            <table class="table">
-                <thead class="thead-inverse">
+            <table class="table table-sm table-responsive-md mt-2">
+                <thead>
                     <tr>
                         <th>Name</th>
                         <th>Website</th>
@@ -32,28 +32,28 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach(var store in Model.Stores)
+                    @foreach (var store in Model.Stores)
                     {
                         <tr>
                             <td>@store.Name</td>
                             <td>
-                                @if(!string.IsNullOrEmpty(store.WebSite))
+                                @if (!string.IsNullOrEmpty(store.WebSite))
                                 {
                                     <a href="@store.WebSite">@store.WebSite</a>
                                 }
                             </td>
                             <td>
-                                @for(int i = 0; i < store.Balances.Length; i++)
+                                @for (int i = 0; i < store.Balances.Length; i++)
                                 {
                                     <span>@store.Balances[i]</span>
-                                    if(i != store.Balances.Length - 1)
+                                    if (i != store.Balances.Length - 1)
                                     {
                                         <br />
                                     }
                                 }
                             </td>
                             <td style="text-align:right">
-                                @if(store.IsOwner)
+                                @if (store.IsOwner)
                                 {
                                     <a asp-action="UpdateStore" asp-controller="Stores" asp-route-storeId="@store.Id">Settings</a><span> - </span>
                                 }