diff --git a/src/www/firewall_nat.php b/src/www/firewall_nat.php
index 2765d35cd..718659bda 100644
--- a/src/www/firewall_nat.php
+++ b/src/www/firewall_nat.php
@@ -143,7 +143,7 @@ include("head.inc");
 legacy_html_escape_form_data($a_nat);
 
 $main_buttons = array(
-  array('label'=>gettext('Add'), 'href'=>'firewall_nat_edit.php'),
+    array('label' => gettext('Add'), 'href' => 'firewall_nat_edit.php'),
 );
 
 ?>
@@ -419,51 +419,36 @@ $( document ).ready(function() {
 
                       <td>
                         <a type="submit" id="move_<?=$nnats;?>" name="move_<?=$nnats;?>_x" data-toggle="tooltip" title="<?=html_safe(gettext("Move selected rules before this rule"))?>" class="act_move btn btn-default btn-xs">
-                          <i class="fa fa-arrow-left fa-fw text-muted"></i>
+                          <i class="fa fa-arrow-left fa-fw"></i>
                         </a>
-                        <a href="firewall_nat_edit.php?id=<?=$nnats;?>" data-toggle="tooltip" title="<?=html_safe(gettext("Edit rule"))?>" class="btn btn-default btn-xs">
-                          <i class="fa fa-pencil fa-fw text-muted"></i>
+                        <a href="firewall_nat_edit.php?id=<?=$nnats;?>" data-toggle="tooltip" title="<?=html_safe(gettext("Edit"))?>" class="btn btn-default btn-xs">
+                          <i class="fa fa-pencil fa-fw"></i>
                         </a>
-                        <a id="del_<?=$nnats;?>" title="<?=html_safe(gettext("Delete rule"))?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                          <i class="fa fa-trash fa-fw text-muted"></i>
+                        <a id="del_<?=$nnats;?>" title="<?=html_safe(gettext("Delete"))?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs">
+                          <i class="fa fa-trash fa-fw"></i>
                         </a>
-                        <a href="firewall_nat_edit.php?dup=<?=$nnats;?>" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=html_safe(gettext("Clone rule"))?>">
-                          <i class="fa fa-clone fa-fw text-muted"></i>
+                        <a href="firewall_nat_edit.php?dup=<?=$nnats;?>" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=html_safe(gettext("Clone"))?>">
+                          <i class="fa fa-clone fa-fw"></i>
                         </a>
                       </td>
                      </tr>
 <?php $nnats++; endforeach; ?>
+<?php if ($nnats != 0): ?>
                     <tr>
-
-                    <td colspan="8"></td>
-                    <td class="hidden-xs hidden-sm" colspan="4"> </td>
-                    <td>
-<?php               if ($nnats == 0): ?>
-                        <span class="btn btn-default btn-xs">
-                          <i class="fa fa-arrow-left fa-fw text-muted"></i>
-                        </span>
-<?php               else: ?>
+                      <td colspan="8"></td>
+                      <td class="hidden-xs hidden-sm" colspan="4"> </td>
+                      <td>
                         <a type="submit" id="move_<?=$nnats;?>" name="move_<?=$nnats;?>_x" data-toggle="tooltip" title="<?=html_safe(gettext("Move selected rules to end"))?>" class="act_move btn btn-default btn-xs">
-                          <i class="fa fa-arrow-left fa-fw text-muted"></i>
+                          <i class="fa fa-arrow-left fa-fw"></i>
                         </a>
-<?php                   endif; ?>
-<?php                   if (count($a_nat) == 0): ?>
-                      <span class="btn btn-default btn-xs text-muted"  data-toggle="tooltip" title="<?=html_safe(gettext("Delete selected rules"))?>"><i class="fa fa-trash fa-fw text-muted" ></i></span>
-<?php                   else: ?>
-                        <a id="del_x" title="<?=html_safe(gettext("Delete selected rules"))?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                          <i class="fa fa-trash fa-fw text-muted"></i>
-                        </a>
-<?php                   endif; ?>
-                        <a href="firewall_nat_edit.php" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=html_safe(gettext("Add new rule"))?>">
-                          <i class="fa fa-plus fa-fw text-muted"></i>
+                        <a id="del_x" title="<?=html_safe(gettext("Delete selected"))?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
+                          <i class="fa fa-trash fa-fw"></i>
                         </a>
                     </td>
                   </tr>
+<?php endif ?>
                 </tbody>
                   <tfoot>
-                    <tr>
-                      <td colspan="13">&nbsp;</td>
-                    </tr>
                     <tr>
                       <td style="width:16px"><i class="fa fa-play fa-fw text-success"></i></td>
                       <td colspan="12"><?=gettext("Enabled rule"); ?></td>
diff --git a/src/www/firewall_nat_out.php b/src/www/firewall_nat_out.php
index 15fee29ad..64aaa3434 100644
--- a/src/www/firewall_nat_out.php
+++ b/src/www/firewall_nat_out.php
@@ -109,6 +109,11 @@ foreach ($config['interfaces'] as $intf => $intfdata) {
     }
 }
 
+if ($mode != 'disabled' && $mode != 'automatic') {
+    $main_buttons = array(
+        array('label' => gettext('Add'), 'href' => 'firewall_nat_out_edit.php'),
+    );
+}
 
 include("head.inc");
 
@@ -208,7 +213,7 @@ include("head.inc");
               <table class="table table-striped">
                 <thead>
                   <tr>
-                    <th colspan="4"><?=gettext("Mode:"); ?></th>
+                    <th colspan="4"><?=gettext("Mode"); ?></th>
                   </tr>
                 </thead>
                 <tbody>
@@ -275,10 +280,11 @@ include("head.inc");
         </section>
 <?php if ($mode == 'advanced' || $mode == 'hybrid'): ?>
         <section class="col-xs-12">
-          <div class="table-responsive content-box ">
+          <div class="__mb"></div>
+          <div class="table-responsive content-box">
             <table class="table table-striped">
               <thead>
-                <tr><th colspan="12"><?=gettext("Manual rules:"); ?></th></tr>
+                <tr><th colspan="12"><?=gettext("Manual rules"); ?></th></tr>
                 <tr>
                     <th><input type="checkbox" id="selectAll"></th>
                     <th>&nbsp;</th>
@@ -426,17 +432,17 @@ include("head.inc");
                       <?=htmlspecialchars($natent['descr']);?>&nbsp;
                     </td>
                     <td>
-                      <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs">
-                        <span class="glyphicon glyphicon-arrow-left"></span>
+                      <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?= html_safe(gettext('move selected rules before this rule')) ?>" class="act_move btn btn-default btn-xs">
+                        <i class="fa fa-arrow-left fa-fw"></i>
                       </a>
-                      <a href="firewall_nat_out_edit.php?id=<?=$i;?>" data-toggle="tooltip" title="<?=gettext("edit rule");?>" class="btn btn-default btn-xs">
-                        <span class="glyphicon glyphicon-pencil"></span>
+                      <a href="firewall_nat_out_edit.php?id=<?=$i;?>" data-toggle="tooltip" title="<?= html_safe(gettext('Edit')) ?>" class="btn btn-default btn-xs">
+                        <i class="fa fa-pencil fa-fw"></i>
                       </a>
-                      <a id="del_<?=$i;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
-                        <span class="fa fa-trash text-muted"></span>
+                      <a id="del_<?=$i;?>" title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs">
+                        <i class="fa fa-trash fa-fw"></i>
                       </a>
-                      <a href="firewall_nat_out_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=gettext("clone rule");?>">
-                        <span class="fa fa-clone text-muted"></span>
+                      <a href="firewall_nat_out_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?= html_safe(gettext('Clone')) ?>">
+                        <i class="fa fa-clone fa-fw"></i>
                       </a>
                     </td>
                   </tr>
@@ -444,45 +450,22 @@ include("head.inc");
                   $i++;
                 endforeach;
 ?>
-        <tr>
-          <td colspan="6" class="hidden-xs hidden-sm"></td>
-          <td colspan="5"></td>
-          <td>
-
-<?php
-                if ($i == 0):
-?>
-                  <span class="btn btn-default btn-xs"><span class="glyphicon glyphicon-arrow-left"></span></span>
-<?php
-                else:
-?>
-                  <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?=gettext("move selected rules to end");?>" class="act_move btn btn-default btn-xs">
-                    <span class="glyphicon glyphicon-arrow-left"></span>
-                  </a>
-<?php
-                endif;
-?>
-<?php
-                if ($i == 0):
-?>
-                  <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="fa fa-trash text-muted"></span>
-                  </a>
-<?php
-                endif;
-?>
-                  <a href="firewall_nat_out_edit.php" title="<?=gettext("add new rule");?>" alt="add"  class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
+<?php if ($i != 0): ?>
+                <tr>
+                  <td colspan="6" class="hidden-xs hidden-sm"></td>
+                  <td colspan="5"></td>
+                  <td>
+                    <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?=html_safe(gettext('move selected rules to end'))?>" class="act_move btn btn-default btn-xs">
+                      <i class="fa fa-arrow-left fa-fw"></i>
+                    </a>
+                    <a id="del_x" title="<?= html_safe(gettext('Delete selected')) ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs">
+                      <i class="fa fa-trash fa-fw"></i>
+                    </a>
+<?php endif ?>
                   </td>
                 </tr>
               </tbody>
               <tfoot>
-                <tr>
-                  <td colspan="12">&nbsp;</td>
-                </tr>
                 <tr>
                   <td style="width:16px"><span class="fa fa-play text-success"></span></td>
                   <td colspan="11"><?=gettext("Enabled rule"); ?></td>
@@ -512,11 +495,12 @@ include("head.inc");
         $intfv4 = array_merge($intfv4, filter_core_get_default_nat_outbound_networks());
 ?>
         <section class="col-xs-12">
-          <div class="table-responsive content-box ">
+          <div class="__mb"></div>
+          <div class="table-responsive content-box">
             <table class="table table-striped">
               <thead>
                   <tr>
-                    <th colspan="11"><?=gettext("Automatic rules:"); ?></th>
+                    <th colspan="11"><?=gettext("Automatic rules"); ?></th>
                   </tr>
                   <tr>
                     <th>&nbsp;</th>