diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php
index e564ebd82..ae5d83e3d 100644
--- a/src/www/vpn_openvpn_client.php
+++ b/src/www/vpn_openvpn_client.php
@@ -363,7 +363,7 @@ legacy_html_escape_form_data($pconfig);
 include("head.inc");
 
 $main_buttons = array(
-    array('href'=>'vpn_openvpn_client.php?act=new', 'label'=>gettext("add client")),
+    array('href' => 'vpn_openvpn_client.php?act=new', 'label' => gettext('Add')),
 );
 
 ?>
@@ -684,13 +684,13 @@ $( document ).ready(function() {
 <?php
                   if (!empty($item)): ?>
                       <label class="act-removerow btn btn-default btn-xs">
-                        <span class="fa fa-minus"></span>
+                        <span class="fa fa-minus fa-fw"></span>
                         <span class="sr-only"><?= gettext('Remove') ?></span>
                       </label>
 <?php
                   else: ?>
                       <label class="act-addrow btn btn-default btn-xs">
-                        <span class="fa fa-plus"></span>
+                        <span class="fa fa-plus fa-fw"></span>
                         <span class="sr-only"><?= gettext('Add') ?></span>
                       </label>
 <?php
@@ -1178,7 +1178,7 @@ $( document ).ready(function() {
                 <td><?=gettext("Protocol"); ?></td>
                 <td><?=gettext("Server"); ?></td>
                 <td><?=gettext("Description"); ?></td>
-                <td></td>
+                <td class="text-nowrap"></td>
               </tr>
             </thead>
             <tbody>
@@ -1196,24 +1196,24 @@ $( document ).ready(function() {
                   <input type="checkbox" name="rule[]" value="<?=$i;?>"  />
                   &nbsp;
                   <a href="#" class="act_toggle" data-id="<?=$i;?>" data-toggle="tooltip" title="<?=(empty($client['disable'])) ? gettext("Disable") : gettext("Enable");?>">
-                    <span class="fa fa-play <?=(empty($client['disable'])) ? "text-success" : "text-muted";?>"></span>
+                    <span class="fa fa-play fa-fw <?=(empty($client['disable'])) ? "text-success" : "text-muted";?>"></span>
                   </a>
                 </td>
                 <td><?= htmlspecialchars($client['protocol']) ?></td>
                 <td><?= htmlspecialchars(implode(', ', $server)) ?></td>
                 <td><?= htmlspecialchars($client['description']) ?></td>
-                <td>
+                <td class="text-nowrap">
                     <a data-id="<?=$i;?>" data-toggle="tooltip" title="<?=gettext("move selected before this item");?>" class="act_move btn btn-default btn-xs">
-                      <span class="glyphicon glyphicon-arrow-left"></span>
+                      <span class="fa fa-arrow-left fa-fw"></span>
                     </a>
                     <a href="vpn_openvpn_client.php?act=edit&amp;id=<?=$i;?>" class="btn btn-default btn-xs">
-                      <span class="glyphicon glyphicon-pencil"></span>
+                      <span class="fa fa-pencil fa-fw"></span>
                     </a>
                     <a data-id="<?=$i;?>" title="<?=gettext("delete client"); ?>" class="act_delete btn btn-default btn-xs">
-                      <span class="fa fa-trash text-muted"></span>
+                      <span class="fa fa-trash fa-fw"></span>
                     </a>
                     <a href="vpn_openvpn_client.php?act=new&amp;dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=gettext("clone client");?>">
-                      <span class="fa fa-clone text-muted"></span>
+                      <span class="fa fa-clone fa-fw"></span>
                     </a>
                 </td>
               </tr>
@@ -1222,12 +1222,12 @@ $( document ).ready(function() {
               endforeach;?>
               <tr>
                 <td colspan="4"></td>
-                <td>
+                <td class="text-nowrap">
                   <a data-id="<?=$i;?>" data-toggle="tooltip" title="<?=gettext("move selected items to end");?>" class="act_move btn btn-default btn-xs">
-                    <span class="glyphicon glyphicon-arrow-down"></span>
+                    <span class="fa fa-arrow-down fa-fw"></span>
                   </a>
                   <a data-id="x" title="<?=gettext("delete selected rules"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                    <span class="fa fa-trash text-muted"></span>
+                    <span class="fa fa-trash fa-fw"></span>
                   </a>
                 </td>
               </tr>
diff --git a/src/www/vpn_openvpn_csc.php b/src/www/vpn_openvpn_csc.php
index 7e04e4f8a..66f24d81d 100644
--- a/src/www/vpn_openvpn_csc.php
+++ b/src/www/vpn_openvpn_csc.php
@@ -349,7 +349,7 @@ $( document ).ready(function() {
 <?
 if ($act!="new" && $act!="edit") {
     $main_buttons = array(
-        array('href'=>'vpn_openvpn_csc.php?act=new', 'label'=>gettext("add csc")),
+        array('href' => 'vpn_openvpn_csc.php?act=new', 'label' => gettext('Add')),
     );
 }
 ?>
@@ -689,17 +689,16 @@ if ($act!="new" && $act!="edit") {
                       <td><?=gettext("Common Name"); ?></td>
                       <td><?=gettext("Tunnel Network");?></td>
                       <td><?=gettext("Description"); ?></td>
-                      <td></td>
+                      <td class="text-nowrap"></td>
                     </tr>
 <?php
                     $i = 0;
                     foreach ($a_csc as $csc):?>
                     <tr>
                       <td>
-                        <input type="checkbox" name="rule[]" value="<?=$i;?>"  />
-                        &nbsp;
+                        <input type="checkbox" name="rule[]" value="<?=$i;?>"/>
                         <a href="#" class="act_toggle" data-id="<?=$i;?>" data-toggle="tooltip" title="<?=(empty($csc['disable'])) ? gettext("Disable") : gettext("Enable");?>">
-                          <span class="fa fa-play <?=(empty($csc['disable'])) ? "text-success" : "text-muted";?>"></span>
+                          <span class="fa fa-play fa-fw <?=(empty($csc['disable'])) ? "text-success" : "text-muted";?>"></span>
                         </a>
                       </td>
                       <td>
@@ -711,14 +710,14 @@ if ($act!="new" && $act!="edit") {
                       <td>
                           <?=htmlspecialchars($csc['description']);?>
                       </td>
-                      <td>
+                      <td class="text-nowrap">
                         <a data-id="<?=$i;?>" data-toggle="tooltip" title="<?=gettext("move selected before this item");?>" class="act_move btn btn-default btn-xs">
-                          <span class="glyphicon glyphicon-arrow-left"></span>
+                          <span class="fa fa-arrow-left fa-fw"></span>
                         </a>
-                        <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 data-id="<?=$i;?>" title="<?=gettext("delete csc"); ?>" class="act_delete btn btn-default btn-xs"><span class="fa fa-trash text-muted"></span></a>
+                        <a href="vpn_openvpn_csc.php?act=edit&amp;id=<?=$i;?>" class="btn btn-default btn-xs"><span class="fa fa-pencil fa-fw"></span></a>
+                        <a data-id="<?=$i;?>" title="<?=gettext("delete csc"); ?>" class="act_delete btn btn-default btn-xs"><span class="fa fa-trash fa-fw"></span></a>
                         <a href="vpn_openvpn_csc.php?act=new&dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=gettext("clone rule");?>">
-                          <span class="fa fa-clone text-muted"></span>
+                          <span class="fa fa-clone fa-fw"></span>
                         </a>
                       </td>
                     </tr>
@@ -729,12 +728,12 @@ if ($act!="new" && $act!="edit") {
                       <td colspan="4">
                         <?=gettext("Additional OpenVPN client specific overrides can be added here.");?>
                       </td>
-                      <td>
+                      <td class="text-nowrap">
                         <a data-id="<?=$i;?>" data-toggle="tooltip" title="<?=gettext("move selected items to end");?>" class="act_move btn btn-default btn-xs">
-                          <span class="glyphicon glyphicon-arrow-down"></span>
+                          <span class="fa fa-arrow-down fa-fw"></span>
                         </a>
                         <a data-id="x" title="<?=gettext("delete selected rules"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                          <span class="fa fa-trash text-muted"></span>
+                          <span class="fa fa-trash fa-fw"></span>
                         </a>
                       </td>
                     </tr>
diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index 28bc0f3be..01b4eeac2 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -420,7 +420,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 include("head.inc");
 
 $main_buttons = array(
-    array('href'=>'vpn_openvpn_server.php?act=new', 'label'=>gettext("add server")),
+    array('href' => 'vpn_openvpn_server.php?act=new', 'label' => gettext('Add')),
 );
 
 legacy_html_escape_form_data($pconfig);
@@ -1609,7 +1609,7 @@ endif; ?>
                   <td><?=gettext("Protocol / Port"); ?></td>
                   <td><?=gettext("Tunnel Network"); ?></td>
                   <td><?=gettext("Description"); ?></td>
-                  <td></td>
+                  <td class="text-nowrap"></td>
                 </tr>
                 </thead>
 
@@ -1634,9 +1634,9 @@ endif; ?>
                     <td>
                         <?=htmlspecialchars($server['description']);?>
                     </td>
-                    <td>
-                        <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="fa fa-trash text-muted"></span></a>
+                    <td class="text-nowrap">
+                        <a href="vpn_openvpn_server.php?act=edit&amp;id=<?=$i;?>" title="<?=gettext("edit server"); ?>" class="btn btn-default btn-xs"><i class="fa fa-pencil fa-fw"></i></a>
+                        <a id="del_<?=$i;?>" title="<?=gettext("delete server"); ?>" class="act_delete btn btn-default btn-xs"><i class="fa fa-trash fa-fw"></i></a>
                     </td>
                   </tr>
 <?php
@@ -1645,7 +1645,7 @@ endif; ?>
                   <tr>
                     <td colspan="5">
                       <a href="wizard.php?xml=openvpn" class="btn btn-default">
-                        <i class="fa fa-magic"></i> <?= gettext('Use a wizard to setup a new server') ?>
+                        <i class="fa fa-magic fa-fw"></i> <?= gettext('Use a wizard to setup a new server') ?>
                        </a>
                     </td>
                   </tr>