diff --git a/src/www/diag_confbak.php b/src/www/diag_confbak.php
index 530775f6b..421e7c689 100644
--- a/src/www/diag_confbak.php
+++ b/src/www/diag_confbak.php
@@ -321,7 +321,7 @@ $( document ).ready(function() {
                              <span class="glyphicon glyphicon-log-in"></span>
                            </a>
                            <a data-id="<?=$version['time'];?>" href="#" class="act_delete btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("Remove this backup");?>" >
-                             <span class="glyphicon glyphicon-remove"></span>
+                             <span class="fa fa-trash text-muted"></span>
                            </a>
                            <a href="diag_confbak.php?getcfg=<?=$version['time'];?>" class="btn btn-default btn-xs" title="<?=gettext("Download this backup");?>">
                            <span class="glyphicon glyphicon-download"></span>
diff --git a/src/www/diag_tables.php b/src/www/diag_tables.php
index 36f0b64a3..ac12b7be8 100644
--- a/src/www/diag_tables.php
+++ b/src/www/diag_tables.php
@@ -182,7 +182,7 @@ $( document ).ready(function() {
                   <td><?=$entry;?></td>
                   <td>
                     <a data-address="<?=$entry;?>" title="<?=gettext("delete this entry"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                      <span class="glyphicon glyphicon-remove"></span>
+                      <span class="fa fa-trash text-muted"></span>
                     </a>
                   </td>
                 </tr>
diff --git a/src/www/firewall_aliases.php b/src/www/firewall_aliases.php
index a6649ce94..f056bc2d8 100644
--- a/src/www/firewall_aliases.php
+++ b/src/www/firewall_aliases.php
@@ -245,7 +245,7 @@ $( document ).ready(function() {
                       </td>
                       <td>
                         <a href="firewall_aliases_edit.php?id=<?=$i;?>" title="<?=gettext("Edit alias"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
-                        <a id="del_<?=$i;?>" title="<?=gettext("delete alias"); ?>" class="act_delete btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+                        <a id="del_<?=$i;?>" title="<?=gettext("delete alias"); ?>" class="act_delete btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
                       </td>
                     </tr>
 <?php
diff --git a/src/www/firewall_nat.php b/src/www/firewall_nat.php
index ea13cb064..241eafa70 100644
--- a/src/www/firewall_nat.php
+++ b/src/www/firewall_nat.php
@@ -370,6 +370,7 @@ $( document ).ready(function() {
                       <td>
                         <?=$natent['descr'];?>
                       </td>
+
                       <td>
                         <a type="submit" id="move_<?=$nnats;?>" name="move_<?=$nnats;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs">
                           <span class="glyphicon glyphicon-arrow-left"></span>
@@ -378,7 +379,7 @@ $( document ).ready(function() {
                           <span class="glyphicon glyphicon-pencil"></span>
                         </a>
                         <a id="del_<?=$nnats;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                          <span class="glyphicon glyphicon-remove"></span>
+                          <span class="fa fa-trash text-muted"></span>
                         </a>
                         <a href="firewall_nat_edit.php?dup=<?=$nnats;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone rule");?>">
                           <span class="fa fa-clone text-muted"></span>
@@ -400,10 +401,10 @@ $( document ).ready(function() {
                         </a>
 <?php                   endif; ?>
 <?php                   if (count($a_nat) == 0): ?>
-                      <span class="btn btn-default btn-xs text-muted"  data-toggle="tooltip" data-placement="left" title="<?=gettext("delete selected rules");?>"><span class="glyphicon glyphicon-remove" ></span></span>
+                      <span class="btn btn-default btn-xs text-muted"  data-toggle="tooltip" data-placement="left" title="<?=gettext("delete selected rules");?>"><span class="fa fa-trash text-muted" ></span></span>
 <?php                   else: ?>
                         <a id="del_x" title="<?=gettext("delete selected rules"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                          <span class="glyphicon glyphicon-remove"></span>
+                          <span class="fa fa-trash text-muted"></span>
                         </a>
 <?php                   endif; ?>
                         <a href="firewall_nat_edit.php" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new rule");?>">
diff --git a/src/www/firewall_nat_1to1.php b/src/www/firewall_nat_1to1.php
index 6c1789a92..b4d646ee3 100644
--- a/src/www/firewall_nat_1to1.php
+++ b/src/www/firewall_nat_1to1.php
@@ -253,7 +253,7 @@ $main_buttons = array(
                         <span class="glyphicon glyphicon-pencil"></span>
                       </a>
                       <a id="del_<?=$i;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                        <span class="glyphicon glyphicon-remove"></span>
+                        <span class="fa fa-trash text-muted"></span>
                       </a>
                       <a href="firewall_nat_1to1_edit.php?dup=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone rule");?>" class="btn btn-default btn-xs">
                         <span class="fa fa-clone text-muted"></span>
@@ -283,12 +283,12 @@ $main_buttons = array(
 <?php               if ($i == 0):
 ?>
                       <span title="<?=gettext("delete selected rules"); ?>" data-toggle="tooltip" class="btn btn-default btn-xs">
-                        <span class="glyphicon glyphicon-remove"></span>
+                        <span class="fa fa-trash text-muted"></span>
                       </span>
 <?php               else:
 ?>
                       <a id="del_x" title="<?=gettext("delete selected rules"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                        <span class="glyphicon glyphicon-remove"></span>
+                        <span class="fa fa-trash text-muted"></span>
                       </a>
 <?php               endif;
 ?>
diff --git a/src/www/firewall_nat_npt.php b/src/www/firewall_nat_npt.php
index 746ac2dcb..6847040fa 100644
--- a/src/www/firewall_nat_npt.php
+++ b/src/www/firewall_nat_npt.php
@@ -239,7 +239,7 @@ $main_buttons = array(
                           <span class="glyphicon glyphicon-pencil"></span>
                         </a>
                         <a id="del_<?=$i;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                          <span class="glyphicon glyphicon-remove"></span>
+                          <span class="fa fa-trash text-muted"></span>
                         </a>
                         <a href="firewall_nat_npt_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone rule");?>">
                           <span class="fa fa-clone text-muted"></span>
@@ -260,10 +260,10 @@ $main_buttons = array(
                         </a>
 <?php                   endif; ?>
 <?php                   if (count($a_npt) == 0): ?>
-                      <span class="btn btn-default btn-xs text-muted"  data-toggle="tooltip" data-placement="left" title="<?=gettext("delete selected rules");?>"><span class="glyphicon glyphicon-remove" ></span></span>
+                      <span class="btn btn-default btn-xs text-muted"  data-toggle="tooltip" data-placement="left" title="<?=gettext("delete selected rules");?>"><span class="fa fa-trash text-muted" ></span></span>
 <?php                   else: ?>
                         <a id="del_x" title="<?=gettext("delete selected rules"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                          <span class="glyphicon glyphicon-remove"></span>
+                          <span class="fa fa-trash text-muted"></span>
                         </a>
 <?php                   endif; ?>
                         <a href="firewall_nat_npt_edit.php?after=-1" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new rule");?>">
diff --git a/src/www/firewall_nat_out.php b/src/www/firewall_nat_out.php
index 9f9ec9193..c74d13590 100644
--- a/src/www/firewall_nat_out.php
+++ b/src/www/firewall_nat_out.php
@@ -417,7 +417,7 @@ include("head.inc");
                         <span class="glyphicon glyphicon-pencil"></span>
                       </a>
                       <a id="del_<?=$i;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                        <span class="glyphicon glyphicon-remove"></span>
+                        <span class="fa fa-trash text-muted"></span>
                       </a>
                       <a href="firewall_nat_out_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone rule");?>">
                         <span class="fa fa-clone text-muted"></span>
@@ -449,12 +449,12 @@ include("head.inc");
 <?php
                 if ($i == 0):
 ?>
-                  <span title="<?=gettext("delete selected rules");?>"  class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></span>
+                  <span title="<?=gettext("delete selected rules");?>"  class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></span>
 <?php
                 else:
 ?>
                   <a id="del_x" title="<?=gettext("delete selected rules"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                    <span class="glyphicon glyphicon-remove"></span>
+                    <span class="fa fa-trash text-muted"></span>
                   </a>
 <?php
                 endif;
diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index f49ea8b7e..538bb610e 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -531,7 +531,7 @@ $( document ).ready(function() {
                         <span class="glyphicon glyphicon-pencil"></span>
                       </a>
                       <a id="del_<?=$i;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                        <span class="glyphicon glyphicon-remove"></span>
+                        <span class="fa fa-trash text-muted"></span>
                       </a>
                       <a href="firewall_rules_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone rule");?>">
                         <span class="fa fa-clone text-muted"></span>
@@ -568,7 +568,7 @@ $( document ).ready(function() {
                         <span class="glyphicon glyphicon-arrow-left"></span>
                       </a>
                       <a id="del_x" title="<?=gettext("delete selected rules"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                        <span class="glyphicon glyphicon-remove"></span>
+                        <span class="fa fa-trash text-muted"></span>
                       </a>
                       <a href="firewall_rules_edit.php?if=<?=$selected_if;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new rule");?>">
                         <span class="glyphicon glyphicon-plus"></span>
diff --git a/src/www/firewall_schedule.php b/src/www/firewall_schedule.php
index 2118e587d..448007ab2 100644
--- a/src/www/firewall_schedule.php
+++ b/src/www/firewall_schedule.php
@@ -236,7 +236,7 @@ $main_buttons = array(
                           <span class="glyphicon glyphicon-pencil"></span>
                         </a>
                         <a id="del_<?=$i;?>" title="<?=gettext("delete schedule"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                          <span class="glyphicon glyphicon-remove"></span>
+                          <span class="fa fa-trash text-muted"></span>
                         </a>
                         <a href="firewall_schedule.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone schedule");?>">
                           <span class="fa fa-clone text-muted"></span>
diff --git a/src/www/firewall_schedule_edit.php b/src/www/firewall_schedule_edit.php
index dcb4bbbd9..3ba5c33cb 100644
--- a/src/www/firewall_schedule_edit.php
+++ b/src/www/firewall_schedule_edit.php
@@ -640,7 +640,7 @@ function insertElements(tempFriendlyTime, starttimehour, starttimemin, stoptimeh
     tr.appendChild(td);
 
     td = d.createElement("td");
-    td.innerHTML = "<a onclick='removeRow(this); return false;' href='#' class=\"btn btn-default btn-xs\"><span class=\"glyphicon glyphicon-remove\"></span></\a>";
+    td.innerHTML = "<a onclick='removeRow(this); return false;' href='#' class=\"btn btn-default btn-xs\"><span class=\"fa fa-trash text-muted\"></span></\a>";
     tr.appendChild(td);
 
     td = d.createElement("td");
@@ -1139,7 +1139,7 @@ function removeRow(el) {
                                     <a onclick='editRow("<?=$tempTime; ?>",this); return false;' href='#' class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span></a>
                                   </td>
                                   <td>
-                                    <a onclick='removeRow(this); return false;' href='#' class="btn btn-default"><span class="glyphicon glyphicon-remove"></span></a>
+                                    <a onclick='removeRow(this); return false;' href='#' class="btn btn-default"><span class="fa fa-trash text-muted"></span></a>
                                   </td>
                                   <td>
                                     <input type='hidden' id='schedule<?=$counter; ?>' name='schedule<?=$counter; ?>' value='<?=$tempID; ?>' />
diff --git a/src/www/firewall_virtual_ip.php b/src/www/firewall_virtual_ip.php
index fbfd03b4e..bdbe04b91 100644
--- a/src/www/firewall_virtual_ip.php
+++ b/src/www/firewall_virtual_ip.php
@@ -313,7 +313,7 @@ $main_buttons = array(
                             <span class="glyphicon glyphicon-pencil"></span>
                           </a>
                           <a id="del_<?=$i;?>" title="<?=gettext("delete virtual IP"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                            <span class="glyphicon glyphicon-remove"></span>
+                            <span class="fa fa-trash text-muted"></span>
                           </a>
                           <a href="firewall_virtual_ip_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone virtual IP");?>">
                             <span class="fa fa-clone text-muted"></span>
diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php
index 2e26dd788..e51e696d9 100644
--- a/src/www/interfaces_assign.php
+++ b/src/www/interfaces_assign.php
@@ -422,7 +422,7 @@ include("head.inc");
 <?php
                         if ($ifname != 'wan'):?>
                           <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-placement="left" data-id="<?=$ifname;?>" class="btn btn-default act_delete" type="submit">
-                            <span class=" glyphicon glyphicon-remove"></span>
+                            <span class="fa fa-trash text-muted"></span>
                           </button>
 <?php
                         endif;?>
diff --git a/src/www/interfaces_bridge.php b/src/www/interfaces_bridge.php
index 9765e7d33..9ad5ce276 100644
--- a/src/www/interfaces_bridge.php
+++ b/src/www/interfaces_bridge.php
@@ -156,7 +156,7 @@ $main_buttons = array(
                             <span class="glyphicon glyphicon-edit"></span>
                           </a>
                           <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-placement="left" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                            <span class=" glyphicon glyphicon-remove"></span>
+                            <span class="fa fa-trash text-muted"></span>
                           </button>
                         </td>
                       </tr>
diff --git a/src/www/interfaces_gif.php b/src/www/interfaces_gif.php
index 93d933681..90a73f599 100644
--- a/src/www/interfaces_gif.php
+++ b/src/www/interfaces_gif.php
@@ -135,7 +135,7 @@ $main_buttons = array(
                           <span class="glyphicon glyphicon-edit"></span>
                         </a>
                         <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-placement="left" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                          <span class=" glyphicon glyphicon-remove"></span>
+                          <span class="fa fa-trash text-muted"></span>
                         </button>
                       </td>
                     </tr>
diff --git a/src/www/interfaces_gre.php b/src/www/interfaces_gre.php
index 1df295694..e9296d419 100644
--- a/src/www/interfaces_gre.php
+++ b/src/www/interfaces_gre.php
@@ -137,7 +137,7 @@ $main_buttons = array(
                           <span class="glyphicon glyphicon-edit"></span>
                         </a>
                          <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-placement="left" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                           <span class=" glyphicon glyphicon-remove"></span>
+                           <span class="fa fa-trash text-muted"></span>
                          </button>
                        </td>
                     </tr>
diff --git a/src/www/interfaces_groups.php b/src/www/interfaces_groups.php
index a8feff63e..0a4a16282 100644
--- a/src/www/interfaces_groups.php
+++ b/src/www/interfaces_groups.php
@@ -135,7 +135,7 @@ $main_buttons = array(
                         <span class="glyphicon glyphicon-edit"></span>
                       </a>
                       <button title="<?=gettext("delete ifgroupentry");?>" data-toggle="tooltip" data-placement="left" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                        <span class=" glyphicon glyphicon-remove"></span>
+                        <span class="fa fa-trash text-muted"></span>
                       </button>
                     </td>
                   </tr>
diff --git a/src/www/interfaces_lagg.php b/src/www/interfaces_lagg.php
index 778f2ff31..251d43154 100644
--- a/src/www/interfaces_lagg.php
+++ b/src/www/interfaces_lagg.php
@@ -145,7 +145,7 @@ $main_buttons = array(
                             <span class="glyphicon glyphicon-edit"></span>
                           </a>
                          <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-placement="left" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                           <span class=" glyphicon glyphicon-remove"></span>
+                           <span class="fa fa-trash text-muted"></span>
                          </button>
                         </td>
                       </tr>
diff --git a/src/www/interfaces_ppps.php b/src/www/interfaces_ppps.php
index fe67cf97c..ebdc3a90e 100644
--- a/src/www/interfaces_ppps.php
+++ b/src/www/interfaces_ppps.php
@@ -143,7 +143,7 @@ $main_buttons = array(
                     <td>
                       <a href="interfaces_ppps_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a>
                       <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-placement="left" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                        <span class=" glyphicon glyphicon-remove"></span>
+                        <span class="fa fa-trash text-muted"></span>
                       </button>
                     </td>
                   </tr>
diff --git a/src/www/interfaces_qinq.php b/src/www/interfaces_qinq.php
index 457c516fc..9249768ad 100644
--- a/src/www/interfaces_qinq.php
+++ b/src/www/interfaces_qinq.php
@@ -154,7 +154,7 @@ $main_buttons = array(
                           <span class="glyphicon glyphicon-edit"></span>
                         </a>
                         <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-placement="left" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                          <span class=" glyphicon glyphicon-remove"></span>
+                          <span class="fa fa-trash text-muted"></span>
                         </button>
                       </td>
                     </tr>
diff --git a/src/www/interfaces_vlan.php b/src/www/interfaces_vlan.php
index 5b84db956..dc388e17b 100644
--- a/src/www/interfaces_vlan.php
+++ b/src/www/interfaces_vlan.php
@@ -137,7 +137,7 @@ $main_buttons = array(
                           <span class="glyphicon glyphicon-edit"></span>
                         </a>
                          <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-placement="left" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                           <span class=" glyphicon glyphicon-remove"></span>
+                           <span class="fa fa-trash text-muted"></span>
                          </button>
                        </td>
                     </tr>
diff --git a/src/www/interfaces_wireless.php b/src/www/interfaces_wireless.php
index 462d2209e..efd3deffb 100644
--- a/src/www/interfaces_wireless.php
+++ b/src/www/interfaces_wireless.php
@@ -134,7 +134,7 @@ $main_buttons = array(
                           <span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span>
                         </a>
                         <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-placement="left" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                          <span class=" glyphicon glyphicon-remove"></span>
+                          <span class="fa fa-trash text-muted"></span>
                         </button>
                       </td>
                     </tr>
diff --git a/src/www/javascript/row_helper.js b/src/www/javascript/row_helper.js
index 9df2aec33..c95765232 100644
--- a/src/www/javascript/row_helper.js
+++ b/src/www/javascript/row_helper.js
@@ -62,7 +62,7 @@ var addRowTo = (function() {
 	td = d.createElement("td");
 	td.rowSpan = "1";
 
-	td.innerHTML = '<a onclick="removeRow(this); return false;" href="#" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>';
+	td.innerHTML = '<a onclick="removeRow(this); return false;" href="#" class="btn btn-default btn-xs"><span class="fa fa-trash"></span></a>';
 	tr.appendChild(td);
 	tbody.appendChild(tr);
 	totalrows++;
diff --git a/src/www/javascript/row_helper_dynamic.js b/src/www/javascript/row_helper_dynamic.js
index 1100752f1..143becc83 100644
--- a/src/www/javascript/row_helper_dynamic.js
+++ b/src/www/javascript/row_helper_dynamic.js
@@ -60,7 +60,7 @@ var addRowTo = (function() {
 	}
 	td = d.createElement("td");
 	td.rowSpan = "1";
-	td.innerHTML = '<a onclick="removeRow(this); return false;" href="#"><span class="glyphicon glyphicon-remove"></span></a>';
+	td.innerHTML = '<a onclick="removeRow(this); return false;" href="#"><span class="fa fa-trash"></span></a>';
 	tr.appendChild(td);
 	tbody.appendChild(tr);
 	if(rowhelper_onAdd != '')
diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php
index 6fafa9f60..4e6c8af6e 100644
--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -818,7 +818,7 @@ include("head.inc");
 											</td>
 											<td>
 												<a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;pool=<?=$i;?>"><button type="button" class="btn btn-xs btn-default"><span class="fa fa-pencil"></span></button></a>
-												<a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=delpool&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this pool?");?>')"><button type="button" class="btn btn-xs btn-default"><span class="fa fa-trash-o"></span></button></a>
+												<a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=delpool&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this pool?");?>')"><button type="button" class="btn btn-xs btn-default"><span class="fa fa-trash text-muted"></span></button></a>
 											</td>
 											</tr>
 											<?php endif; ?>
@@ -1067,7 +1067,7 @@ include("head.inc");
 												<input autocomplete="off" name="value<?php echo $counter; ?>" type="text" class="form-control unknown" id="value<?php echo $counter; ?>" size="40" value="<?=htmlspecialchars($value);?>" />
 											</td>
 											<td>
-												<a onclick="removeRow(this); return false;" href="#" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a></a>
+												<a onclick="removeRow(this); return false;" href="#" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a></a>
 											</td>
 											</tr>
 											<?php $counter++; ?>
@@ -1164,7 +1164,7 @@ include("head.inc");
 										<table border="0" cellspacing="0" cellpadding="1" summary="icons">
 										<tr>
 										<td valign="middle"><a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if);?>&amp;id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a></td>
-										<td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a></td>
+										<td valign="middle"><a href="services_dhcp.php?if=<?=htmlspecialchars($if);?>&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a></td>
 										</tr>
 										</table>
 									</td>
diff --git a/src/www/services_dhcpv6.php b/src/www/services_dhcpv6.php
index b41f03562..438c1cc94 100644
--- a/src/www/services_dhcpv6.php
+++ b/src/www/services_dhcpv6.php
@@ -781,7 +781,7 @@ include("head.inc");
 													<input autocomplete="off" name="value<?php echo $counter; ?>" type="text" class="formfld" id="value<?php echo $counter; ?>" size="55" value="<?=htmlspecialchars($value);?>" />
 												</td>
 												<td>
-													<butto onclick="removeRow(this); return false;" value="<?=gettext("Delete");?>" ><span class="glyphicon glyphicon-remove"></span></button>
+													<butto onclick="removeRow(this); return false;" value="<?=gettext("Delete");?>" ><span class="fa fa-trash"></span></button>
 												</td>
 												</tr>
 												<?php $counter++; ?>
@@ -865,7 +865,7 @@ include("head.inc");
 											<table border="0" cellspacing="0" cellpadding="1" summary="icons">
 											<tr>
 											<td valign="middle"><a href="services_dhcpv6_edit.php?if=<?=$if;?>&amp;id=<?=$i;?>" alt="edit"><span class="glyphicon glyphicon-pencil"></span></a></td>
-											<td valign="middle"><a href="services_dhcpv6.php?if=<?=$if;?>&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')" alt="delete"><span class="glyphicon glyphicon-remove"></span></a></td>
+											<td valign="middle"><a href="services_dhcpv6.php?if=<?=$if;?>&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this mapping?");?>')" alt="delete"><span class="fa fa-trash"></span></a></td>
 											</tr>
 											</table>
 										</td>
diff --git a/src/www/services_dnsmasq.php b/src/www/services_dnsmasq.php
index 57c106337..3e6bb8a2b 100644
--- a/src/www/services_dnsmasq.php
+++ b/src/www/services_dnsmasq.php
@@ -395,7 +395,7 @@ function show_advanced_dns() {
 											<table border="0" cellspacing="0" cellpadding="1" summary="icons">
 												<tr>
 													<td valign="middle"><a href="services_dnsmasq_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a></td>
-													<td><a href="services_dnsmasq.php?type=host&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a></td>
+													<td><a href="services_dnsmasq.php?type=host&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a></td>
 												</tr>
 											</table>
 									</tr>
@@ -468,7 +468,7 @@ function show_advanced_dns() {
 											<?=htmlspecialchars($doment['descr']);?>&nbsp;
 										</td>
 										<td valign="middle" class="list nowrap"> <a href="services_dnsmasq_domainoverride_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
-											&nbsp;<a href="services_dnsmasq.php?act=del&amp;type=doverride&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a></td>
+											&nbsp;<a href="services_dnsmasq.php?act=del&amp;type=doverride&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a></td>
 									</tr>
 									<?php $i++; endforeach; ?>
 									<tr style="display:none"><td></td></tr>
diff --git a/src/www/services_dyndns.php b/src/www/services_dyndns.php
index b9099b3bf..08a068867 100644
--- a/src/www/services_dyndns.php
+++ b/src/www/services_dyndns.php
@@ -172,7 +172,7 @@ $main_buttons = array(
 										  </td>
 										  <td valign="middle" class="list nowrap">
 											<a href="services_dyndns_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
-											&nbsp;<a href="services_dyndns.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+											&nbsp;<a href="services_dyndns.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry?");?>')" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
 										  </td>
 										</tr>
 										<?php $i++; endforeach; ?>
diff --git a/src/www/services_igmpproxy.php b/src/www/services_igmpproxy.php
index abcbaf37b..58fbc44d5 100644
--- a/src/www/services_igmpproxy.php
+++ b/src/www/services_igmpproxy.php
@@ -126,7 +126,7 @@ $main_buttons = array(
 									  </td>
 									  <td valign="middle" class="list nowrap">
 									     <a href="services_igmpproxy_edit.php?id=<?=$i;?>" title="<?=gettext("edit igmpentry"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
-									     <a href="services_igmpproxy.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this igmp entry? All elements that still use it will become invalid (e.g. filter rules)!");?>')" title="<?=gettext("delete igmpentry");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+									     <a href="services_igmpproxy.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this igmp entry? All elements that still use it will become invalid (e.g. filter rules)!");?>')" title="<?=gettext("delete igmpentry");?>" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
 									  </td>
 									</tr>
 										  <?php $i++; endforeach; ?>
diff --git a/src/www/services_router_advertisements.php b/src/www/services_router_advertisements.php
index 7580675b7..4bc96775d 100644
--- a/src/www/services_router_advertisements.php
+++ b/src/www/services_router_advertisements.php
@@ -302,7 +302,7 @@ include("head.inc");
 													</select>
 												</td>
 												<td>
-													<a onclick="removeRow(this); return false;" href="#" alt="" title="<?=gettext("remove this entry"); ?>"><span class="glyphicon glyphicon-remove"></span></a>
+													<a onclick="removeRow(this); return false;" href="#" alt="" title="<?=gettext("remove this entry"); ?>"><span class="fa fa-trash text-muted"></span></a>
 												</td>
 											</tr>
 						<?php
diff --git a/src/www/services_unbound_acls.php b/src/www/services_unbound_acls.php
index e61ea4f98..458b71fb7 100644
--- a/src/www/services_unbound_acls.php
+++ b/src/www/services_unbound_acls.php
@@ -276,7 +276,7 @@ include("head.inc");
 																<input name="description<?=$counter;?>" type="text" class="formfld unknown" id="description<?=$counter;?>" size="40" value="<?=htmlspecialchars($description);?>" />
 															</td>
 															<td>
-																<a onclick="removeRow(this); return false;" href="#" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+																<a onclick="removeRow(this); return false;" href="#" class="btn btn-default btn-xs"><span class="fa fa-trash"></span></a>
 															</td>
 														</tr>
 													<?php $counter++; ?>
@@ -358,7 +358,7 @@ include("head.inc");
 												</td>
 												<td>
 													<a href="services_unbound_acls.php?act=edit&amp;id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
-													<a href="services_unbound_acls.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this access list?"); ?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+													<a href="services_unbound_acls.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this access list?"); ?>')" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
 												</td>
 											</tr>
 										<?php
diff --git a/src/www/services_unbound_host_edit.php b/src/www/services_unbound_host_edit.php
index bbdfad1e9..98d497972 100644
--- a/src/www/services_unbound_host_edit.php
+++ b/src/www/services_unbound_host_edit.php
@@ -353,7 +353,7 @@ include("head.inc");
 															<input name="aliasdescription<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliasdescription<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($description);?>" />
 														</td>
 														<td>
-															<a onclick="removeRow(this); return false;" href="#" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+															<a onclick="removeRow(this); return false;" href="#" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
 														</td>
 													</tr>
 													<?php
diff --git a/src/www/services_unbound_overrides.php b/src/www/services_unbound_overrides.php
index 8233560c8..e785c044c 100644
--- a/src/www/services_unbound_overrides.php
+++ b/src/www/services_unbound_overrides.php
@@ -179,7 +179,7 @@ include_once("head.inc");
 										<table border="0" cellspacing="0" cellpadding="1" summary="icons">
 											<tr>
 												<td valign="middle"><a href="services_unbound_host_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a></td>
-												<td><a href="services_unbound_overrides.php?type=host&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a></td>
+												<td><a href="services_unbound_overrides.php?type=host&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a></td>
 											</tr>
 										</table>
 								</tr>
@@ -241,7 +241,7 @@ include_once("head.inc");
 										<table border="0" cellspacing="0" cellpadding="1" summary="icons">
 											<tr>
 												<td valign="middle"><a href="services_unbound_domainoverride_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a></td>
-												<td valign="middle"><a href="services_unbound_overrides.php?act=del&amp;type=doverride&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a></td>
+												<td valign="middle"><a href="services_unbound_overrides.php?act=del&amp;type=doverride&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a></td>
 											</tr>
 										</table>
 									</td>
diff --git a/src/www/services_wol.php b/src/www/services_wol.php
index 0c470d030..3f7cf6764 100644
--- a/src/www/services_wol.php
+++ b/src/www/services_wol.php
@@ -198,7 +198,7 @@ include("head.inc");
 						                    <table border="0" cellspacing="0" cellpadding="1" summary="icons">
 						                      <tr>
 						                        <td valign="middle"><a href="services_wol_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a></td>
-						                        <td valign="middle"><a href="services_wol.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a></td>
+						                        <td valign="middle"><a href="services_wol.php?act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry?");?>')" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a></td>
 						                      </tr>
 						                    </table>
 						                  </td>
diff --git a/src/www/system_advanced_sysctl.php b/src/www/system_advanced_sysctl.php
index 260dd7c8d..f5ce482ba 100644
--- a/src/www/system_advanced_sysctl.php
+++ b/src/www/system_advanced_sysctl.php
@@ -183,7 +183,7 @@ $( document ).ready(function() {
                         <span data-toggle="tooltip" data-placement="left" title="<?=gettext("Edit Tunable"); ?>" class="glyphicon glyphicon-pencil"></span>
                     </a>
                     <a id="del_<?=$i;?>" data-id="<?=$i;?>" title="<?=gettext("Delete Tunable"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                      <span class="glyphicon glyphicon-remove"></span>
+                      <span class="fa fa-trash text-muted"></span>
                     </a>
                   </td>
                 </tr>
diff --git a/src/www/system_authservers.php b/src/www/system_authservers.php
index e05ca52e3..4028024f8 100644
--- a/src/www/system_authservers.php
+++ b/src/www/system_authservers.php
@@ -700,7 +700,7 @@ $i = 0;
                     </a>
                     &nbsp;
                     <a id="del_<?=$i;?>" title="<?=gettext("delete this server"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                      <span class="glyphicon glyphicon-remove"></span>
+                      <span class="fa fa-trash text-muted"></span>
                     </a>
                   </td>
 <?php
diff --git a/src/www/system_camanager.php b/src/www/system_camanager.php
index e0c8ac842..a6714b379 100644
--- a/src/www/system_camanager.php
+++ b/src/www/system_camanager.php
@@ -778,7 +778,7 @@ $main_buttons = array(
 <?php
                   endif; ?>
                   <a id="del_<?=$i;?>" data-id="<?=$i;?>" title="<?=gettext("delete ca"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                    <span class="glyphicon glyphicon-remove"></span>
+                    <span class="fa fa-trash text-muted"></span>
                   </a>
                 </td>
               </tr>
diff --git a/src/www/system_certmanager.php b/src/www/system_certmanager.php
index 7a811f1bd..b7ec0af31 100644
--- a/src/www/system_certmanager.php
+++ b/src/www/system_certmanager.php
@@ -1294,7 +1294,7 @@ $( document ).ready(function() {
                   if (!cert_in_use($cert['refid'])) :?>
 
                   <a id="del_<?=$i;?>" data-id="<?=$i;?>" title="<?=gettext("delete cert"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                    <span class="glyphicon glyphicon-remove"></span>
+                    <span class="fa fa-trash text-muted"></span>
                   </a>
 <?php
                   endif;
diff --git a/src/www/system_crlmanager.php b/src/www/system_crlmanager.php
index a0816ac16..5743af85f 100644
--- a/src/www/system_crlmanager.php
+++ b/src/www/system_crlmanager.php
@@ -534,7 +534,7 @@ include("head.inc");
                   <td><?=date("D M j G:i:s T Y", $cert["revoke_time"]); ?></td>
                   <td>
                     <a id="del_cert_<?=$thiscrl['refid'];?>" data-id="<?=$thiscrl['refid'];?>" data-certref="<?=$cert['refid'];?>" title="<?=gettext("Delete this certificate from the CRL ");?>" data-toggle="tooltip"  class="act_delete_cert btn btn-default btn-xs">
-                      <span class="glyphicon glyphicon-remove"></span>
+                      <span class="fa fa-trash text-muted"></span>
                     </a>
                   </td>
                 </tr>
@@ -677,7 +677,7 @@ include("head.inc");
 <?php
                   if (!$inuse) :?>
                     <a id="del_<?=$tmpcrl['refid'];?>" data-descr="<?=htmlspecialchars($tmpcrl['descr']);?>" data-id="<?=$tmpcrl['refid'];?>" title="<?=gettext("Delete CRL") . " " . htmlspecialchars($tmpcrl['descr']);?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                      <span class="glyphicon glyphicon-remove"></span>
+                      <span class="fa fa-trash text-muted"></span>
                     </a>
 <?php
                   endif; ?>
diff --git a/src/www/system_gateway_groups.php b/src/www/system_gateway_groups.php
index d966615eb..7f9fe080a 100644
--- a/src/www/system_gateway_groups.php
+++ b/src/www/system_gateway_groups.php
@@ -201,7 +201,7 @@ $( document ).ready(function() {
                         </a>
                         <button type="button" class="btn btn-default btn-xs act-del-group"
                             data-id="<?=$i?>" title="<?=gettext("delete group");?>" data-toggle="tooltip"
-                            data-placement="left" ><span class="glyphicon glyphicon-remove"></span>
+                            data-placement="left" ><span class="fa fa-trash text-muted"></span>
                         </button>
                         <a href="system_gateway_groups_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs"
                             title="clone group" data-toggle="tooltip" data-placement="left">
diff --git a/src/www/system_gateways.php b/src/www/system_gateways.php
index 8fcfb125c..3ff71a8e7 100644
--- a/src/www/system_gateways.php
+++ b/src/www/system_gateways.php
@@ -323,7 +323,7 @@ $( document ).ready(function() {
                       <td>
 <?php
                     if (isset($gateway['inactive'])) :?>
-                        <span class="glyphicon glyphicon-remove text-muted" data-toggle="tooltip" data-placement="left" title="<?=gettext("Gateway is inactive because interface is missing");?>"></span>
+                        <span class="fa fa-trash text-muted" data-toggle="tooltip" data-placement="left" title="<?=gettext("Gateway is inactive because interface is missing");?>"></span>
 <?php
                     elseif (is_numeric($gateway['attribute'])) :?>
                         <a href="#" class="act_toggle" data-id="<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=(!isset($gateway['disabled'])) ? gettext("disable gateway") : gettext("enable gateway");?>">
@@ -360,7 +360,7 @@ $( document ).ready(function() {
                         if (is_numeric($gateway['attribute'])) :?>
                           <button data-id="<?=$i;?>" title="<?=gettext("delete gateway"); ?>" data-toggle="tooltip"
                                   class="act_delete btn btn-default btn-xs">
-                            <span class="glyphicon glyphicon-remove"></span>
+                            <span class="fa fa-trash text-muted"></span>
                           </button>
 <?php
                         endif;?>
@@ -381,7 +381,7 @@ $( document ).ready(function() {
                                       ?>
                           <button type="submit" id="btn_delete" name="del_x" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left"
                                   title="<?=gettext("delete selected items");?>">
-                              <span class="glyphicon glyphicon-remove"></span>
+                              <span class="fa fa-trash text-muted"></span>
                           </button>
 <?php
                       endif;?>
diff --git a/src/www/system_groupmanager.php b/src/www/system_groupmanager.php
index 7dda9a91a..557824dde 100644
--- a/src/www/system_groupmanager.php
+++ b/src/www/system_groupmanager.php
@@ -421,7 +421,7 @@ $( document ).ready(function() {
                       <td><?=$priv_list[$priv]['descr'];?></td>
                       <td>
                           <button type="button" data-privid="<?=$priv;?>" data-privname="<?=$priv_list[$priv]['name']?>" class="btn btn-default btn-xs act-del-priv" title="<?=gettext("delete privilege");?>" data-toggle="tooltip" data-placement="left">
-                            <span class="glyphicon glyphicon-remove"></span>
+                            <span class="fa fa-trash text-muted"></span>
                           </button>
                       </td>
                     </tr>
@@ -497,7 +497,7 @@ $( document ).ready(function() {
                     <button type="button" class="btn btn-default btn-xs act-del-group"
                         data-groupname="<?=$group['name'];?>"
                         data-groupid="<?=$i?>" title="<?=gettext("delete group");?>" data-toggle="tooltip"
-                        data-placement="left" ><span class="glyphicon glyphicon-remove"></span>
+                        data-placement="left" ><span class="fa fa-trash text-muted"></span>
                     </button>
 <?php
                     endif;?>
diff --git a/src/www/system_routes.php b/src/www/system_routes.php
index 47993b0ba..b18ae4990 100644
--- a/src/www/system_routes.php
+++ b/src/www/system_routes.php
@@ -281,7 +281,7 @@ endif; ?>
                       </a>
                       <button type="button" class="btn btn-default btn-xs act-del-route"
                           data-id="<?=$i?>" title="<?=gettext("delete route");?>" data-toggle="tooltip"
-                          data-placement="left" ><span class="glyphicon glyphicon-remove"></span>
+                          data-placement="left" ><span class="fa fa-trash text-muted"></span>
                       </button>
                       <a class="btn btn-default btn-xs" href="system_routes_edit.php?dup=<?=$i;?>"
                           title="<?=gettext("clone route");?>" data-toggle="tooltip" data-placement="left">
@@ -310,12 +310,12 @@ endif; ?>
 <?php
                     if ($i == 0) :?>
                     <span class="btn btn-default btn-xs">
-                        <span class="glyphicon glyphicon-remove text-muted"></span>
+                        <span class="fa fa-trash text-muted"></span>
                     </span>
 
 <?php
                     else :?>
-                    <button id="del_x" title="<?=gettext("delete selected routes");?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left"><span class="glyphicon glyphicon-remove"></span></button>
+                    <button id="del_x" title="<?=gettext("delete selected routes");?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left"><span class="fa fa-trash text-muted"></span></button>
 <?php
                     endif;?>
                     <a href="system_routes_edit.php" class="btn btn-default btn-xs" title="<?=gettext("add route");?>" data-toggle="tooltip" data-placement="left">
diff --git a/src/www/system_usermanager.php b/src/www/system_usermanager.php
index 50e8138a8..d92be26a6 100644
--- a/src/www/system_usermanager.php
+++ b/src/www/system_usermanager.php
@@ -759,7 +759,7 @@ $( document ).ready(function() {
                             if (empty($priv['group'])) :?>
                               <button type="button" data-priv="<?=$priv['id']?>" class="btn btn-default btn-xs act-del-priv"
                                   title="<?=gettext("revoke privilege");?>" data-toggle="tooltip" data-placement="left">
-                                <span class="glyphicon glyphicon-remove"></span>
+                                <span class="fa fa-trash text-muted"></span>
                               </button>
 <?php
                             endif;?>
@@ -815,7 +815,7 @@ $( document ).ready(function() {
                             </a>
                             <button type="submit" data-certid="<?=$i;?>" class="btn btn-default btn-xs act-del-cert"
                                 title="<?=gettext("unlink certificate");?>" data-toggle="tooltip" data-placement="left" >
-                                <span class="glyphicon glyphicon-remove"></span>
+                                <span class="fa fa-trash text-muted"></span>
                             </button>
                           </td>
                         </tr>
@@ -973,7 +973,7 @@ $( document ).ready(function() {
                         <button type="button" class="btn btn-default btn-xs act-del-user"
                             data-username="<?=$userent['name'];?>"
                             data-userid="<?=$i?>" title="<?=gettext("delete user");?>" data-toggle="tooltip"
-                            data-placement="left" ><span class="glyphicon glyphicon-remove"></span>
+                            data-placement="left" ><span class="fa fa-trash text-muted"></span>
                         </button>
 <?php
                         endif;?>
diff --git a/src/www/vpn_ipsec.php b/src/www/vpn_ipsec.php
index 84914a11f..51129d2be 100644
--- a/src/www/vpn_ipsec.php
+++ b/src/www/vpn_ipsec.php
@@ -404,7 +404,7 @@ if (!empty($ph1ent['encryption-algorithm']['keylen'])) {
           type="submit"
           onclick="return confirm('<?=gettext("Do you really want to delete this phase1 and all associated phase2 entries?"); ?>')"
           class="btn btn-default btn-xs">
-          <span class="glyphicon glyphicon-remove"></span>
+          <span class="fa fa-trash text-muted"></span>
       </button>
 <?php                 if (!isset($ph1ent['mobile'])) :
 ?>
@@ -532,7 +532,7 @@ if (!empty($ph2ent['hash-algorithm-option']) && is_array($ph2ent['hash-algorithm
           type="submit"
           onclick="return confirm('<?=gettext("Do you really want to delete this phase2 entry?"); ?>')"
           class="btn btn-default btn-xs">
-          <span class="glyphicon glyphicon-remove"><span>
+          <span class="fa fa-trash text-muted"><span>
         </button>
         <a href="vpn_ipsec_phase2.php?dup=<?=$ph2ent['uniqid']; ?>"
             title="<?=gettext("clone phase 2 entry"); ?>" data-toggle="tooltip" data-placement="left"
@@ -563,7 +563,7 @@ endforeach;
                                 <button name="delp2_x" type="submit" title="<?=gettext("delete selected phase 2 entries");?>" data-toggle="tooltip" data-placement="left"
                                   onclick="return confirm('<?=gettext("Do you really want to delete the selected phase2 entries?");?>')"
                                   class="btn btn-default btn-xs">
-                                  <span class="glyphicon glyphicon-remove"></span>
+                                  <span class="fa fa-trash text-muted"></span>
                                 </button>
 <?php                                 endif;
 ?>
@@ -599,7 +599,7 @@ endforeach;  // $a_phase1 as $ph1ent
                       data-toggle="tooltip" data-placement="left"
                       onclick="return confirm('<?=gettext("Do you really want to delete the selected phase1 entries?");?>')"
                       class="btn btn-default btn-xs">
-                      <span class="glyphicon glyphicon-remove"></span>
+                      <span class="fa fa-trash text-muted"></span>
                     </button>
                       <a href="vpn_ipsec_phase1.php" title="<?=gettext("add new phase 1 entry");?>" data-toggle="tooltip" data-placement="left"
                           alt="add" class="btn btn-default btn-xs">
diff --git a/src/www/vpn_ipsec_keys.php b/src/www/vpn_ipsec_keys.php
index 50d381a53..e772ba43b 100644
--- a/src/www/vpn_ipsec_keys.php
+++ b/src/www/vpn_ipsec_keys.php
@@ -169,7 +169,7 @@ foreach ($config['ipsec']['mobilekey'] as $secretent) :
     <a href="vpn_ipsec_keys_edit.php?id=<?=$i;
 ?>" title="<?=gettext("edit key"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
     <a id="del_<?=$i;
-?>" title="<?=gettext("delete key"); ?>" class="act_delete btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+?>" title="<?=gettext("delete key"); ?>" class="act_delete btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
   </td>
 </tr>
 <?php           $i++;
diff --git a/src/www/vpn_l2tp_users.php b/src/www/vpn_l2tp_users.php
index 33aa56b63..fc6cb5bd8 100644
--- a/src/www/vpn_l2tp_users.php
+++ b/src/www/vpn_l2tp_users.php
@@ -123,7 +123,7 @@ endif; ?>
 
                                         <a href="vpn_l2tp_users.php?act=del&amp;id=<?=$i;
 ?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this user?");
-?>')"title="<?=gettext("delete user"); ?>"><span class="glyphicon glyphicon-remove"></span></a>
+?>')"title="<?=gettext("delete user"); ?>"><span class="fa fa-trash text-muted"></span></a>
 
 					                 </td>
 								</tr>
diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php
index 2ec25dbfe..34e9159c3 100644
--- a/src/www/vpn_openvpn_client.php
+++ b/src/www/vpn_openvpn_client.php
@@ -1079,7 +1079,7 @@ else :
                 <td>
                     <a href="vpn_openvpn_client.php?act=edit&amp;id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
 										<a id="del_<?=$i;
-?>" title="<?=gettext("delete client"); ?>" class="act_delete btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+?>" title="<?=gettext("delete client"); ?>" class="act_delete btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
                 </td>
 				</tr>
 				<?php
diff --git a/src/www/vpn_openvpn_csc.php b/src/www/vpn_openvpn_csc.php
index 4831b1404..4985120ad 100644
--- a/src/www/vpn_openvpn_csc.php
+++ b/src/www/vpn_openvpn_csc.php
@@ -635,7 +635,7 @@ else :
                                     <td valign="middle" class="list nowrap">
 																			<a href="vpn_openvpn_csc.php?act=edit&amp;id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
 																			<a id="del_<?=$i;
-?>" title="<?=gettext("delete csc"); ?>" class="act_delete btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+?>" title="<?=gettext("delete csc"); ?>" class="act_delete btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
                                     </td>
 									</tr>
 									<?php
diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index 7606edd53..40b6e6f97 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -1743,7 +1743,7 @@ else :
                         <a href="vpn_openvpn_server.php?act=edit&amp;id=<?=$i;
 ?>" title="<?=gettext("edit server"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
                         <a id="del_<?=$i;
-?>" title="<?=gettext("delete server"); ?>" class="act_delete btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+?>" title="<?=gettext("delete server"); ?>" class="act_delete btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
                                     </td>
                   </tr>
                     <?php
diff --git a/src/www/vpn_pppoe.php b/src/www/vpn_pppoe.php
index 8c7a0c1b9..cc636c9db 100644
--- a/src/www/vpn_pppoe.php
+++ b/src/www/vpn_pppoe.php
@@ -142,7 +142,7 @@ $main_buttons = array(
 
 											<a href="vpn_pppoe.php?act=del&amp;id=<?=$i;
 ?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry? All elements that still use it will become invalid (e.g. filter rules)!");
-?>')" title="<?=gettext("delete pppoe instance");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+?>')" title="<?=gettext("delete pppoe instance");?>" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
 										  </td>
 										</tr>
                                                 <?php $i++;
diff --git a/src/www/vpn_pppoe_edit.php b/src/www/vpn_pppoe_edit.php
index 96592a892..ccddeb2e8 100644
--- a/src/www/vpn_pppoe_edit.php
+++ b/src/www/vpn_pppoe_edit.php
@@ -622,7 +622,7 @@ function enable_change(enable_over) {
 ?>" size="10" value="<?=htmlspecialchars($ip);?>" />
                                     </td>
                                     <td>
-                                        <a onclick="removeRow(this); return false;" href="#" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a>
+                                        <a onclick="removeRow(this); return false;" href="#" class="btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
                                     </td>
                                 </tr>
 						<?php
diff --git a/src/www/vpn_pptp_users.php b/src/www/vpn_pptp_users.php
index 09c2f922a..3950dae07 100644
--- a/src/www/vpn_pptp_users.php
+++ b/src/www/vpn_pptp_users.php
@@ -117,7 +117,7 @@ endif; ?>
 
                                         <a href="vpn_pptp_users.php?act=del&amp;id=<?=$i;
 ?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this user?");
-?>')"title="<?=gettext("delete user"); ?>"><span class="glyphicon glyphicon-remove"></span></a></td>
+?>')"title="<?=gettext("delete user"); ?>"><span class="fa fa-trash text-muted"></span></a></td>
 										</tr>
                                         <?php $i++;