diff --git a/BTCPayServer/Views/Apps/ListApps.cshtml b/BTCPayServer/Views/Apps/ListApps.cshtml
index 6371c1118..2f6b27e24 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="glyphicon glyphicon-plus"></span> Create a new app</a>
+            <a asp-action="CreateApp" class="btn btn-success" role="button"><span class="fa fa-plus"></span> Create a new app</a>
             <table class="table table-sm table-responsive-md mt-2">
                 <thead>
                     <tr>
diff --git a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
index 58bf383ee..299dacf80 100644
--- a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
@@ -156,7 +156,6 @@
         <div class="payment__details__instruction__open-wallet">
             <a class="payment__details__instruction__open-wallet__btn action-button" v-bind:href="srvModel.invoiceBitcoinUrl">
                 <span>{{$t("Open in wallet")}}</span>
-                <span class="glyphicon glyphicon-new-window"></span>
             </a>
         </div>
     </div>
diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
index 2f889c0f7..656f87e11 100644
--- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
@@ -31,7 +31,7 @@
                         <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">
-                            <span class="glyphicon glyphicon-search"></span> Search
+                            <span class="fa fa-search"></span> Search
                         </button>
                     </form>
                 </div>
@@ -39,7 +39,7 @@
         </div>
 
         <div class="row">
-            <a asp-action="CreateInvoice" class="btn btn-success" role="button"><span class="glyphicon glyphicon-plus"></span> Create a new invoice</a>
+            <a asp-action="CreateInvoice" class="btn btn-success" role="button"><span class="fa fa-plus"></span> Create a new invoice</a>
             <table class="table table-sm table-responsive-md mt-2">
                 <thead>
                     <tr>
diff --git a/BTCPayServer/Views/Manage/Disable2fa.cshtml b/BTCPayServer/Views/Manage/Disable2fa.cshtml
index b06ef1f0e..5c6d4e240 100644
--- a/BTCPayServer/Views/Manage/Disable2fa.cshtml
+++ b/BTCPayServer/Views/Manage/Disable2fa.cshtml
@@ -7,7 +7,7 @@
 
 <div class="alert alert-warning" role="alert">
     <p>
-        <span class="glyphicon glyphicon-warning-sign"></span>
+        <span class="fa fa-warning"></span>
         <strong>This action only disables 2FA.</strong>
     </p>
     <p>
diff --git a/BTCPayServer/Views/Manage/GenerateRecoveryCodes.cshtml b/BTCPayServer/Views/Manage/GenerateRecoveryCodes.cshtml
index 336c93d11..534fef4f7 100644
--- a/BTCPayServer/Views/Manage/GenerateRecoveryCodes.cshtml
+++ b/BTCPayServer/Views/Manage/GenerateRecoveryCodes.cshtml
@@ -7,7 +7,7 @@
 <h4>@ViewData["Title"]</h4>
 <div class="alert alert-warning" role="alert">
     <p>
-        <span class="glyphicon glyphicon-warning-sign"></span>
+        <span class="fa fa-warning"></span>
         <strong>Put these codes in a safe place.</strong>
     </p>
     <p>
diff --git a/BTCPayServer/Views/Manage/Index.cshtml b/BTCPayServer/Views/Manage/Index.cshtml
index feb2326f0..ba0420895 100644
--- a/BTCPayServer/Views/Manage/Index.cshtml
+++ b/BTCPayServer/Views/Manage/Index.cshtml
@@ -25,7 +25,7 @@
                 {
                     <div class="input-group">
                         <input asp-for="Email" class="form-control" />
-                        <span class="input-group-addon" aria-hidden="true"><span class="glyphicon glyphicon-ok text-success"></span></span>
+                        <span class="input-group-addon" aria-hidden="true"><span class="fa fa-check text-success"></span></span>
                     </div>
                 }
                 else
diff --git a/BTCPayServer/Views/Manage/ResetAuthenticator.cshtml b/BTCPayServer/Views/Manage/ResetAuthenticator.cshtml
index 595113d6d..8518a1ca2 100644
--- a/BTCPayServer/Views/Manage/ResetAuthenticator.cshtml
+++ b/BTCPayServer/Views/Manage/ResetAuthenticator.cshtml
@@ -6,7 +6,7 @@
 <h4>@ViewData["Title"]</h4>
 <div class="alert alert-warning" role="alert">
     <p>
-        <span class="glyphicon glyphicon-warning-sign"></span>
+        <span class="fa fa-warning"></span>
         <strong>If you reset your authenticator key your authenticator app will not work until you reconfigure it.</strong>
     </p>
     <p>
diff --git a/BTCPayServer/Views/Stores/ListTokens.cshtml b/BTCPayServer/Views/Stores/ListTokens.cshtml
index a4ff90d31..3f326173a 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="glyphicon glyphicon-plus"></span>Create a new token</a>
+<a asp-action="CreateToken" class="btn btn-success" role="button"><span class="fa fa-plus"></span>Create a new token</a>
 <table class="table table-sm table-responsive-md mt-2">
     <thead>
         <tr>
diff --git a/BTCPayServer/Views/Stores/StoreUsers.cshtml b/BTCPayServer/Views/Stores/StoreUsers.cshtml
index 40472d62e..22ca1bfa3 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="glyphicon glyphicon-plus"></span>Add user</button>
+                <button type="submit" role="button" class="form-control btn btn-success"><span class="fa fa-plus"></span>Add user</button>
             </form>
         </div>
         <div class="form-group">
diff --git a/BTCPayServer/Views/Stores/Wallet.cshtml b/BTCPayServer/Views/Stores/Wallet.cshtml
index d35e1c5ac..fbdf41455 100644
--- a/BTCPayServer/Views/Stores/Wallet.cshtml
+++ b/BTCPayServer/Views/Stores/Wallet.cshtml
@@ -20,13 +20,13 @@
             <li>Make sure you are running the Ledger Bitcoin or Litecoin app with version superior or equal to 1.2.4</li>
             <li>Use a browser supporting the <a href="https://www.yubico.com/support/knowledge-base/categories/articles/browsers-support-u2f/">U2F protocol</a></li>
         </ul>
-        <p id="hw-loading"><span class="glyphicon glyphicon-question-sign" style="color:orange"></span> <span>Detecting hardware wallet...</span></p>
-        <p id="hw-error" style="display:none;"><span class="glyphicon glyphicon-remove-sign" style="color:red;"></span> <span class="hw-label">An error happened</span></p>
-        <p id="hw-success" style="display:none;"><span class="glyphicon glyphicon-ok-sign" style="color:green;"></span> <span class="hw-label">Detecting hardware wallet...</span></p>
+        <p id="hw-loading"><span class="fa fa-question-circle" style="color:orange"></span> <span>Detecting hardware wallet...</span></p>
+        <p id="hw-error" style="display:none;"><span class="fa fa-times-circle" style="color:red;"></span> <span class="hw-label">An error happened</span></p>
+        <p id="hw-success" style="display:none;"><span class="fa fa-check-circle" style="color:green;"></span> <span class="hw-label">Detecting hardware wallet...</span></p>
 
-        <p id="check-loading" style="display:none;"><span class="glyphicon glyphicon-question-sign" style="color:orange"></span> <span class="check-label">Detecting hardware wallet...</span></p>
-        <p id="check-error" style="display:none;"><span class="glyphicon glyphicon-remove-sign" style="color:red;"></span> <span class="check-label">An error happened</span></p>
-        <p id="check-success" style="display:none;"><span class="glyphicon glyphicon-ok-sign" style="color:green;"></span> <span class="check-label">Detecting hardware wallet...</span></p>
+        <p id="check-loading" style="display:none;"><span class="fa fa-question-circle" style="color:orange"></span> <span class="check-label">Detecting hardware wallet...</span></p>
+        <p id="check-error" style="display:none;"><span class="fa fa-times-circle" style="color:red;"></span> <span class="check-label">An error happened</span></p>
+        <p id="check-success" style="display:none;"><span class="fa fa-check-circle" style="color:green;"></span> <span class="check-label">Detecting hardware wallet...</span></p>
     </div>
 </div>
 <div class="row">
diff --git a/BTCPayServer/Views/UserStores/ListStores.cshtml b/BTCPayServer/Views/UserStores/ListStores.cshtml
index 0b569c72b..fbaafe922 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="glyphicon glyphicon-plus"></span> Create a new store</a>
+            <a asp-action="CreateStore" class="btn btn-success" role="button"><span class="fa fa-plus"></span> Create a new store</a>
             <table class="table table-sm table-responsive-md mt-2">
                 <thead>
                     <tr>
diff --git a/BTCPayServer/bundleconfig.json b/BTCPayServer/bundleconfig.json
index 58e94501b..ed1df25a9 100644
--- a/BTCPayServer/bundleconfig.json
+++ b/BTCPayServer/bundleconfig.json
@@ -4,6 +4,7 @@
         "inputFiles": [
             "wwwroot/vendor/bootstrap4/css/bootstrap.css",
             "wwwroot/vendor/magnific-popup/magnific-popup.css",
+            "wwwroot/vendor/font-awesome/css/font-awesome.css",
             "wwwroot/main/**/*.css",
             "wwwroot/vendor/animatecss/animate.css"
         ]