diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php
index 312d18d9e..f50d6affc 100644
--- a/src/www/interfaces_assign.php
+++ b/src/www/interfaces_assign.php
@@ -419,8 +419,8 @@ include("head.inc");
                         <td>
 <?php
                           if (empty($iface['lock'])): ?>
-                          <button title="<?= html_safe(gettext('Delete interface')) ?>" data-toggle="tooltip" data-id="<?=$ifname;?>" class="btn btn-default act_delete" type="submit">
-                            <span class="fa fa-trash"></span>
+                          <button title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip" data-id="<?=$ifname;?>" class="btn btn-default act_delete" type="submit">
+                            <i class="fa fa-trash fa-fw"></i>
                           </button>
 <?php
                           endif ?>
@@ -441,8 +441,8 @@ include("head.inc");
                           </select>
                         </td>
                         <td>
-                          <button name="add_x" type="submit" value="<?=$portname;?>" class="btn btn-primary" title="<?=gettext("add selected interface");?>" data-toggle="tooltip">
-                            <span class="glyphicon glyphicon-plus"></span>
+                          <button name="add_x" type="submit" value="<?=$portname;?>" class="btn btn-primary" title="<?= html_safe(gettext('Add')) ?>" data-toggle="tooltip">
+                            <i class="fa fa-plus fa-fw"></i>
                           </button>
                         </td>
                       </tr>
@@ -451,7 +451,7 @@ include("head.inc");
                       <tr>
                         <td colspan="2"></td>
                         <td>
-                          <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
+                          <button name="Submit" type="submit" class="btn btn-primary" value="yes"><?= gettext('Save') ?></button>
                         </td>
                       </tr>
                     </tbody>
diff --git a/src/www/interfaces_bridge.php b/src/www/interfaces_bridge.php
index 8896fa9cf..d72a4daab 100644
--- a/src/www/interfaces_bridge.php
+++ b/src/www/interfaces_bridge.php
@@ -120,7 +120,7 @@ $main_buttons = array(
                         <th><?=gettext("Interface");?></th>
                         <th><?=gettext("Members");?></th>
                         <th><?=gettext("Description");?></th>
-                        <th>&nbsp;</th>
+                        <th class="text-nowrap"></th>
                       </tr>
                     </thead>
                     <tbody>
@@ -145,12 +145,12 @@ $main_buttons = array(
                         }?>
                         </td>
                         <td><?=$bridge['descr'];?></td>
-                        <td>
-                          <a href="interfaces_bridge_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?=gettext("edit bridge");?>">
-                            <span class="glyphicon glyphicon-edit"></span>
+                        <td class="text-nowrap">
+                          <a href="interfaces_bridge_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>">
+                            <i class="fa fa-pencil fa-fw"></i>
                           </a>
-                          <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                            <span class="fa fa-trash text-muted"></span>
+                          <button title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
+                            <i class="fa fa-trash fa-fw"></i>
                           </button>
                         </td>
                       </tr>
diff --git a/src/www/interfaces_gif.php b/src/www/interfaces_gif.php
index d3a826f8c..a51aea4b6 100644
--- a/src/www/interfaces_gif.php
+++ b/src/www/interfaces_gif.php
@@ -114,7 +114,7 @@ $main_buttons = array(
                       <th><?=gettext("Interface");?></th>
                       <th><?=gettext("Tunnel to...");?></th>
                       <th><?=gettext("Description");?></th>
-                      <th>&nbsp;</th>
+                      <th class="text-nowrap"></th>
                     </tr>
                   </thead>
                   <tbody>
@@ -125,12 +125,12 @@ $main_buttons = array(
                       <td><?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gif['if']));?></td>
                       <td><?=$gif['remote-addr'];?></td>
                       <td><?=$gif['descr'];?></td>
-                      <td>
-                        <a href="interfaces_gif_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?=gettext("edit interface");?>">
-                          <span class="glyphicon glyphicon-edit"></span>
+                      <td class="text-nowrap">
+                        <a href="interfaces_gif_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>">
+                          <i class="fa fa-pencil fa-fw"></i>
                         </a>
-                        <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                          <span class="fa fa-trash text-muted"></span>
+                        <button title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
+                          <i class="fa fa-trash fa-fw"></i>
                         </button>
                       </td>
                     </tr>
diff --git a/src/www/interfaces_gre.php b/src/www/interfaces_gre.php
index 30937ada9..9a3eaca2b 100644
--- a/src/www/interfaces_gre.php
+++ b/src/www/interfaces_gre.php
@@ -127,11 +127,11 @@ $main_buttons = array(
                       <td><?=$gre['remote-addr'];?></td>
                       <td><?=$gre['descr'];?></td>
                       <td>
-                        <a href="interfaces_gre_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?=gettext("edit interface");?>">
-                          <span class="glyphicon glyphicon-edit"></span>
+                        <a href="interfaces_gre_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>">
+                          <i class="fa fa-pencil fa-fw"></i>
                         </a>
-                         <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                           <span class="fa fa-trash text-muted"></span>
+                         <button title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
+                           <i class="fa fa-trash fa-fw"></i>
                          </button>
                        </td>
                     </tr>
diff --git a/src/www/interfaces_groups.php b/src/www/interfaces_groups.php
index ade64dd7a..9315f31e9 100644
--- a/src/www/interfaces_groups.php
+++ b/src/www/interfaces_groups.php
@@ -53,13 +53,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     }
 }
 
-include("head.inc");
 legacy_html_escape_form_data($a_ifgroups);
-$main_buttons = array(
-  array('href' => 'interfaces_groups_edit.php', 'label' => gettext('Add a new group')),
-);
-?>
 
+include("head.inc");
+
+$main_buttons = array(
+    array('href' => 'interfaces_groups_edit.php', 'label' => gettext('Add')),
+);
+
+?>
 <body>
   <script>
   $( document ).ready(function() {
@@ -104,7 +106,7 @@ $main_buttons = array(
                     <th><?=gettext("Name");?></th>
                     <th><?=gettext("Members");?></th>
                     <th><?=gettext("Description");?></th>
-                    <th>&nbsp;</th>
+                    <th class="text-nowrap"></th>
                   </tr>
                 </thead>
                 <tbody>
@@ -125,12 +127,12 @@ $main_buttons = array(
                     endforeach;?>
                     </td>
                     <td><?=$ifgroupentry['descr'];?></td>
-                    <td>
-                      <a href="interfaces_groups_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?=gettext("Edit this group");?>">
-                        <span class="glyphicon glyphicon-edit"></span>
+                    <td class="text-nowrap">
+                      <a href="interfaces_groups_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>">
+                        <i class="fa fa-pencil fa-fw"></i>
                       </a>
-                      <button title="<?=gettext("Remove this group");?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                        <span class="fa fa-trash text-muted"></span>
+                      <button title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
+                        <i class="fa fa-trash fa-fw"></i>
                       </button>
                     </td>
                   </tr>
diff --git a/src/www/interfaces_lagg.php b/src/www/interfaces_lagg.php
index 14016066e..4c2aeb25a 100644
--- a/src/www/interfaces_lagg.php
+++ b/src/www/interfaces_lagg.php
@@ -124,7 +124,7 @@ $main_buttons = array(
                         <th><?=gettext("Members");?></th>
                         <th><?=gettext("Protocol");?></th>
                         <th><?=gettext("Description");?></th>
-                        <th>&nbsp;</th>
+                        <th class="text-nowrap"></th>
                       </tr>
                     </thead>
                     <tbody>
@@ -136,12 +136,12 @@ $main_buttons = array(
                         <td><?=$lagg['members'];?></td>
                         <td><?=strtoupper($lagg['proto']);?></td>
                         <td><?=$lagg['descr'];?></td>
-                        <td>
-                          <a href="interfaces_lagg_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?=gettext("edit interface");?>">
-                            <span class="glyphicon glyphicon-edit"></span>
+                        <td class="text-nowrap">
+                          <a href="interfaces_lagg_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>">
+                            <i class="fa fa-pencil fa-fw"></i>
                           </a>
-                         <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                           <span class="fa fa-trash text-muted"></span>
+                         <button title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
+                           <i class="fa fa-trash fa-fw"></i>
                          </button>
                         </td>
                       </tr>
diff --git a/src/www/interfaces_ppps.php b/src/www/interfaces_ppps.php
index 7b0920337..53a76c4a8 100644
--- a/src/www/interfaces_ppps.php
+++ b/src/www/interfaces_ppps.php
@@ -114,7 +114,7 @@ $main_buttons = array(
                       <th><?=gettext("Interface");?></th>
                       <th><?=gettext("Interface(s)/Port(s)");?></th>
                       <th><?=gettext("Description");?></th>
-                      <th></th>
+                      <th class="text-nowrap"></th>
                     </tr>
                   </thead>
                   <tbody>
@@ -134,10 +134,12 @@ $main_buttons = array(
                       <?=htmlspecialchars(implode(",", $portlist));?>
                     </td>
                     <td><?=$ppp['descr'];?></td>
-                    <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-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                        <span class="fa fa-trash text-muted"></span>
+                    <td class="text-nowrap">
+                      <a href="interfaces_ppps_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>">
+                        <i class="fa fa-pencil fa-fw"></i>
+                      </a>
+                      <button title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
+                        <i class="fa fa-trash fa-fw"></i>
                       </button>
                     </td>
                   </tr>
diff --git a/src/www/interfaces_vlan.php b/src/www/interfaces_vlan.php
index 1640f6fd0..2c9e90b4b 100644
--- a/src/www/interfaces_vlan.php
+++ b/src/www/interfaces_vlan.php
@@ -121,7 +121,7 @@ $main_buttons = array(
                       <th><?=gettext("Tag");?></th>
                       <th><?=gettext("PCP");?></th>
                       <th><?=gettext("Description");?></th>
-                      <th>&nbsp;</th>
+                      <th class="text-nowrap"></th>
                     </tr>
                   </thead>
                   <tbody>
@@ -133,12 +133,12 @@ $main_buttons = array(
                       <td><?=$vlan['tag'];?></td>
                       <td><?= isset($vlan['pcp']) ? $vlan['pcp'] : 0 ?></td>
                       <td><?=$vlan['descr'];?></td>
-                      <td>
-                        <a href="interfaces_vlan_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?=gettext("edit interface");?>">
-                          <span class="glyphicon glyphicon-edit"></span>
+                      <td class="text-nowrap">
+                        <a href="interfaces_vlan_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>">
+                          <i class="fa fa-pencil fa-fw"></i>
                         </a>
-                         <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                           <span class="fa fa-trash text-muted"></span>
+                         <button title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
+                           <i class="fa fa-trash fa-fw"></i>
                          </button>
                        </td>
                     </tr>
diff --git a/src/www/interfaces_wireless.php b/src/www/interfaces_wireless.php
index 34caa5fc6..0fe3b18ac 100644
--- a/src/www/interfaces_wireless.php
+++ b/src/www/interfaces_wireless.php
@@ -113,7 +113,7 @@ $main_buttons = array(
                       <th><?=gettext("Interface");?></th>
                       <th><?=gettext("Mode");?></th>
                       <th><?=gettext("Description");?></th>
-                      <th></th>
+                      <th class="text-nowrap"></th>
                     </tr>
                   </thead>
                   <tbody>
@@ -124,12 +124,12 @@ $main_buttons = array(
                       <td><?=$clone['cloneif'];?></td>
                       <td><?=$wlan_modes[$clone['mode']];?></td>
                       <td><?=$clone['descr'];?></td>
-                      <td>
-                        <a href="interfaces_wireless_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default">
-                          <span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span>
+                      <td class="text-nowrap">
+                        <a href="interfaces_wireless_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>">
+                          <i class="fa fa-pencil fa-fw"></i>
                         </a>
-                        <button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
-                          <span class="fa fa-trash text-muted"></span>
+                        <button title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
+                          <i class="fa fa-trash fa-fw"></i>
                         </button>
                       </td>
                     </tr>