diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index ae6ede7fd..71fd1dd5f 100644
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -182,12 +182,12 @@ if($need_alert_display == true) {
                 }
               } ?>
               <?php if (!empty($main_buttons)): foreach ($main_buttons as $button): ?>
-                <a href="<?=$button['href'];?>" class="btn btn-primary"><span class="glyphicon glyphicon-plus-sign __iconspacer"></span><?=$button['label'];?></a>
+                <a href="<?=$button['href'];?>" class="btn btn-primary"><i class="fa fa-plus-circle fa-fw"></i> <?= $button['label'] ?></a>
               <?php endforeach; endif; ?>
 
               <?php if (isset($widgetCollection)): ?>
                 <a href="#" id="updatepref" style="display:none" onclick="return updatePref();" class="btn btn-primary"><?=gettext("Save Settings");?></a>
-                <button id="add_widget_btn" type="button" class="btn btn-default" data-toggle="modal" data-target="#modal_widgets"><span class="glyphicon glyphicon-plus-sign __iconspacer"></span><?= gettext('Add widget') ?></button>
+                <button id="add_widget_btn" type="button" class="btn btn-default" data-toggle="modal" data-target="#modal_widgets"><i class="fa fa-plus-circle fa-fw"></i> <?= gettext('Add widget') ?></button>
                 <select class="selectpicker" data-width="120px" id="column_count">
                     <option value="1" <?=$pconfig['column_count'] == "1" ? 'selected="selected"' : "";?>><?=gettext("1 column");?></option>
                     <option value="2" <?=$pconfig['column_count'] == "2" ? 'selected="selected"' : "";?>><?=gettext("2 columns");?></option>
diff --git a/src/www/system_authservers.php b/src/www/system_authservers.php
index 51ab6764f..80948aa00 100644
--- a/src/www/system_authservers.php
+++ b/src/www/system_authservers.php
@@ -320,13 +320,11 @@ legacy_html_escape_form_data($a_server);
 include("head.inc");
 
 $main_buttons = array();
-if (!isset($_GET['act']) || $_GET['act'] != 'new') {
-    $main_buttons[] = array('label'=>gettext('Add server'), 'href'=>'system_authservers.php?act=new');
+if (!isset($_GET['act'])) {
+    $main_buttons[] = array('label' => gettext('Add'), 'href' => 'system_authservers.php?act=new');
 }
 
 ?>
-
-
 <body>
 
 <script>
@@ -856,7 +854,7 @@ else :
                   <th><?=gettext("Server Name");?></th>
                   <th style="width:25%"><?=gettext("Type");?></th>
                   <th style="width:35%"><?=gettext("Host Name");?></th>
-                  <th style="width:10%" class="list"></th>
+                  <th style="width:10%" class="text-nowrap"></th>
                 </tr>
               </thead>
               <tbody>
@@ -867,14 +865,14 @@ else :
                   <td><?= $server['name'] ?></td>
                   <td><?= !empty($authCNFOptions[$server['type']]) ? $authCNFOptions[$server['type']]['description'] : $server['name'] ?></td>
                   <td><?= !empty($server['host']) ? $server['host'] : $config['system']['hostname'] ?></td>
-                  <td>
+                  <td class="text-nowrap">
                     <a href="system_authservers.php?act=edit&amp;id=<?=$i;?>" title="<?= html_safe(gettext('Edit')) ?>" data-toggle="tooltip" class="btn btn-default btn-xs">
-                      <i class="fa fa-pencil text-muted"></i>
+                      <i class="fa fa-pencil fa-fw"></i>
                     </a>
                     <?php if ($i < (count($a_server) - 1)):
 ?>
                     <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 text-muted"></i>
+                      <i class="fa fa-trash fa-fw"></i>
                     </a>
                   </td>
 <?php
diff --git a/src/www/system_groupmanager.php b/src/www/system_groupmanager.php
index 654d64312..212299081 100644
--- a/src/www/system_groupmanager.php
+++ b/src/www/system_groupmanager.php
@@ -158,8 +158,13 @@ legacy_html_escape_form_data($pconfig);
 legacy_html_escape_form_data($a_group);
 
 include("head.inc");
-?>
 
+$main_buttons = array();
+if (!isset($_GET['act'])) {
+    $main_buttons[] = array('label' => gettext('Add'), 'href' => 'system_groupmanager.php?act=new');
+}
+
+?>
 <body>
 <?php include("fbegin.inc"); ?>
 <script>
@@ -402,7 +407,7 @@ $( document ).ready(function() {
               $i++;
               endforeach;?>
                 <tr>
-                  <td colspan="3">
+                  <td colspan="4">
                     <table>
                       <tr>
                         <td></td>
@@ -415,12 +420,6 @@ $( document ).ready(function() {
                       </tr>
                     </table>
                   </td>
-                  <td class="text-nowrap">
-                    <a href="system_groupmanager.php?act=new" class="btn btn-default btn-xs"
-                       title="<?=gettext("add group");?>" data-toggle="tooltip">
-                      <span class="fa fa-plus fa-fw"></span>
-                    </a>
-                  </td>
                 </tr>
               </tbody>
             </table>
diff --git a/src/www/system_usermanager.php b/src/www/system_usermanager.php
index 6656d6834..50797a278 100644
--- a/src/www/system_usermanager.php
+++ b/src/www/system_usermanager.php
@@ -406,6 +406,11 @@ legacy_html_escape_form_data($a_user);
 
 include("head.inc");
 
+$main_buttons = array();
+if (!isset($_GET['act'])) {
+    $main_buttons[] = array('label' => gettext('Add'), 'href' => 'system_usermanager.php?act=new');
+}
+
 ?>
 <script src="/ui/js/jquery.qrcode.js"></script>
 <script src="/ui/js/qrcode.js"></script>
@@ -1041,10 +1046,6 @@ $( document ).ready(function() {
                         </table>
                       </td>
                       <td class="text-nowrap">
-                        <a href="system_usermanager.php?act=new" class="btn btn-default btn-xs"
-                           title="<?=gettext("add user");?>" data-toggle="tooltip">
-                          <span class="fa fa-plus fa-fw"></span>
-                        </a>
 <?php
                         $authcfg_type = auth_get_authserver($config['system']['webgui']['authmode'])['type'];
                         if ($authcfg_type == 'ldap') :?>
