diff --git a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml
index f4919f687..e263a353d 100644
--- a/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml
+++ b/BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml
@@ -38,11 +38,11 @@
                         <td class="text-center">
                             @if (item.Enabled)
                             {
-                                <span class="fa fa-check"></span>
+                                <span class="text-success fa fa-check"></span>
                             }
                             else
                             {
-                                <span class="fa fa-times"></span>
+                                <span class="text-danger fa fa-times"></span>
                             }
                         </td>
                         <td class="text-right">
diff --git a/BTCPayServer/Views/Server/DynamicDnsServices.cshtml b/BTCPayServer/Views/Server/DynamicDnsServices.cshtml
index 4469cc72a..e25757e6a 100644
--- a/BTCPayServer/Views/Server/DynamicDnsServices.cshtml
+++ b/BTCPayServer/Views/Server/DynamicDnsServices.cshtml
@@ -39,11 +39,11 @@
                         <td style="text-align:center;">
                                 @if(service.Settings.Enabled)
                                 {
-                                    <span class="fa fa-check"></span>
+                                    <span class="text-success fa fa-check"></span>
                                 }
                                 else
                                 {
-                                    <span class="fa fa-times"></span>
+                                    <span class="text-danger fa fa-times"></span>
                                 }
                         </td>
                         <td  style="text-align:right"><a asp-action="DynamicDnsService" asp-route-hostname="@service.Settings.Hostname">Edit</a> <span> - </span> <a asp-action="DeleteDynamicDnsService" asp-route-hostname="@service.Settings.Hostname">Remove</a></td>
diff --git a/BTCPayServer/Views/Stores/Rates.cshtml b/BTCPayServer/Views/Stores/Rates.cshtml
index 6cef515e9..88694c1ff 100644
--- a/BTCPayServer/Views/Stores/Rates.cshtml
+++ b/BTCPayServer/Views/Stores/Rates.cshtml
@@ -69,11 +69,11 @@
                                 <tr>
                                     @if (result.Error)
                                     {
-                                        <th class="small"><span class="fa fa-times" style="color:red;"></span> @result.CurrencyPair</th>
+                                        <th class="small"><span class="text-danger fa fa-times"></span> @result.CurrencyPair</th>
                                     }
                                     else
                                     {
-                                        <th class="small"><span class="fa fa-check" style="color:green;"></span> @result.CurrencyPair</th>
+                                        <th class="small"><span class="text-success fa fa-check"></span> @result.CurrencyPair</th>
                                     }
                                     <td class="small">@result.Rule</td>
                                 </tr>
diff --git a/BTCPayServer/Views/Stores/UpdateStore.cshtml b/BTCPayServer/Views/Stores/UpdateStore.cshtml
index a3e96f3a3..43ed9d581 100644
--- a/BTCPayServer/Views/Stores/UpdateStore.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateStore.cshtml
@@ -130,11 +130,11 @@
                             <td style="text-align:center;">
                                 @if(scheme.Enabled)
                                 {
-                                    <span class="fa fa-check"></span>
+                                    <span class="text-success fa fa-check"></span>
                                 }
                                 else
                                 {
-                                    <span class="fa fa-times"></span>
+                                    <span class="text-danger fa fa-times"></span>
                                 }
                             </td>
                             <td style="text-align:right">
@@ -181,11 +181,11 @@
                             <td style="text-align:center;">
                                 @if(scheme.Enabled)
                                 {
-                                    <span class="fa fa-check"></span>
+                                    <span class="text-success fa fa-check"></span>
                                 }
                                 else
                                 {
-                                    <span class="fa fa-times"></span>
+                                    <span class="text-danger fa fa-times"></span>
                                 }
                             </td>
                             <td style="text-align:right"><a asp-action="AddLightningNode" asp-route-cryptoCode="@scheme.CryptoCode" asp-route-storeId="@this.Context.GetRouteValue("storeId")" id="@($"Modify-Lightning{scheme.CryptoCode}")">Modify</a></td>
@@ -221,11 +221,11 @@
                         <td  class="text-center">
                             @if (scheme.Enabled)
                             {
-                                <span class="fa fa-check"></span>
+                                <span class="text-success fa fa-check"></span>
                             }
                             else
                             {
-                                <span class="fa fa-times"></span>
+                                <span class="text-danger fa fa-times"></span>
                             }
                         </td>
                         <td class="text-right"><a asp-action="@scheme.Action" id='Modify-@scheme.Provider' asp-route-storeId="@this.Context.GetRouteValue("storeId")">Modify</a></td>
diff --git a/BTCPayServer/Views/Wallets/WalletRescan.cshtml b/BTCPayServer/Views/Wallets/WalletRescan.cshtml
index e3fa3c07b..60fa6f5d3 100644
--- a/BTCPayServer/Views/Wallets/WalletRescan.cshtml
+++ b/BTCPayServer/Views/Wallets/WalletRescan.cshtml
@@ -13,27 +13,27 @@
             <p>This feature is disabled</p>
             @if (Model.IsFullySync)
             {
-                <p><span class="fa fa-check-circle" style="color:green;"></span> <span>The full node is synched</span></p>
+                <p><span class="text-success fa fa-check-circle"></span> <span>The full node is synched</span></p>
             }
             else
             {
-                <p><span class="fa fa-times-circle" style="color:red;"></span> <span>The full node is not synched</span></p>
+                <p><span class="text-danger fa fa-times-circle"></span> <span>The full node is not synched</span></p>
             }
             @if (Model.IsServerAdmin)
             {
-                <p><span class="fa fa-check-circle" style="color:green;"></span> <span>You are server administrator</span></p>
+                <p><span class="text-success fa fa-check-circle"></span> <span>You are server administrator</span></p>
             }
             else
             {
-                <p><span class="fa fa-times-circle" style="color:red;"></span> <span>You are not server administrator</span></p>
+                <p><span class="text-danger fa fa-times-circle"></span> <span>You are not server administrator</span></p>
             }
             @if (Model.IsSupportedByCurrency)
             {
-                <p><span class="fa fa-check-circle" style="color:green;"></span> <span>This full node support rescan of the UTXO set</span></p>
+                <p><span class="text-success fa fa-check-circle"></span> <span>This full node support rescan of the UTXO set</span></p>
             }
             else
             {
-                <p><span class="fa fa-times-circle" style="color:red;"></span> <span>This full node do not support rescan of the UTXO set</span></p>
+                <p><span class="text-danger fa fa-times-circle"></span> <span>This full node do not support rescan of the UTXO set</span></p>
             }
         </div>
     </div>