diff --git a/inc/header.inc.php b/inc/header.inc.php
index 32dbcf43..e8d28894 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -130,7 +130,7 @@ require(HESK_PATH . 'nuMods_settings.inc.php');
 
 <?php
 include(HESK_PATH . 'header.txt');
-$display = 'display: none';
+$display = 'style="display: none"';
 if ($nuMods_settings['show_icons']) {
     $display = '';
 }
@@ -149,17 +149,17 @@ if ($nuMods_settings['show_icons']) {
 	    </div>
 	    <div class="navbar-collapse collapse">
         <ul class="nav navbar-nav">
-          <li><a href="<?php echo HESK_PATH; ?>"><i class="fa fa-home" style="<?php echo $display; ?>"></i>&nbsp;<?php echo $hesklang['main_page']; ?></a></li>
+          <li><a href="<?php echo HESK_PATH; ?>"><i class="fa fa-home" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['main_page']; ?></a></li>
           <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ticket" style="<?php echo $display; ?>"></i>&nbsp;<?php echo $hesklang['ticket'] ?><b class="caret"></b></a>
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ticket" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['ticket'] ?><b class="caret"></b></a>
             <ul class="dropdown-menu">
-              <li><a href="<?php echo HESK_PATH; ?>index.php?a=add"><i class="fa fa-plus-circle" style="<?php echo $display; ?>"></i>&nbsp;<?php echo $hesklang['sub_ticket'] ?></a></li>
-              <li><a href="<?php echo HESK_PATH; ?>ticket.php"><i class="fa fa-search" style="<?php echo $display; ?>"></i>&nbsp;<?php echo $hesklang['view_ticket_nav'] ?></a></li>
+              <li><a href="<?php echo HESK_PATH; ?>index.php?a=add"><i class="fa fa-plus-circle" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['sub_ticket'] ?></a></li>
+              <li><a href="<?php echo HESK_PATH; ?>ticket.php"><i class="fa fa-search" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['view_ticket_nav'] ?></a></li>
             </ul>
           </li>
           <?php if ($hesk_settings['kb_enable'])
            { ?>
-	      <li><a href="<?php echo HESK_PATH; ?>knowledgebase.php"><i class="fa fa-book" style="<?php echo $display; ?>"></i>&nbsp;<?php echo $hesklang['kb_text'] ?></a></li> <?php       } ?>
+	      <li><a href="<?php echo HESK_PATH; ?>knowledgebase.php"><i class="fa fa-book" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['kb_text'] ?></a></li> <?php       } ?>
           <?php include ('custom/header-custom.inc.php'); ?>
         </ul>
       </div><!-- /.navbar-collapse -->
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 6015b7e5..002d1ad5 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -131,7 +131,7 @@ require(HESK_PATH . 'nuMods_settings.inc.php');
 
 <?php
 include(HESK_PATH . 'header.txt');
-$display = 'display: none';
+$display = 'style="display: none"';
 if ($nuMods_settings['show_icons']) {
     $display = '';
 }
diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php
index bff8f9d7..b6a9d544 100644
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@@ -51,17 +51,17 @@ $num_mail = hesk_checkNewMail();
 	    </div>
 	    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
         <ul class="nav navbar-nav">
-          <li><a href="admin_main.php"><?php echo $hesklang['main_page']; ?></a></li>
-          <?php if (hesk_checkPermission('can_man_users',0)){echo '<li><a href="manage_users.php">'.$hesklang['menu_users'].'</a></li>';} 
-                if (hesk_checkPermission('can_man_cat',0))  {echo '<li><a href="manage_categories.php">'.$hesklang['menu_cat'].'</a></li>';}
-                if (hesk_checkPermission('can_man_canned',0)) {echo '<li><a href="manage_canned.php">'.$hesklang['menu_can'].'</a></li>';}
-                if (hesk_checkPermission('can_man_kb',0)) {echo '<li><a href="manage_knowledgebase.php">'.$hesklang['menu_kb'].'</a></li>';}
-                    else {echo '<li><a href="knowledgebase_private.php">'.$hesklang['menu_kb'].'</a></li>';} 
-                if (hesk_checkPermission('can_run_reports',0)) {echo '<li><a href="reports.php">'.$hesklang['reports'].'</a></li>';}
-                    elseif (hesk_checkPermission('can_export',0)) {echo '<li><a href="export.php">'.$hesklang['reports'].'</a></li>';}
-                if (hesk_checkPermission('can_man_settings',0)) {echo '<li><a href="admin_settings.php">'.$hesklang['settings'].'</a></li>';} ?>
-          <li><a href="profile.php"><?php echo $hesklang['menu_profile']; ?></a></li>
-          <li><a href="mail.php"><?php echo $hesklang['menu_msg']; ?>
+          <li><a href="admin_main.php"><i class="fa fa-home" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['main_page']; ?></a></li>
+          <?php if (hesk_checkPermission('can_man_users',0)){echo '<li><a href="manage_users.php"><i class="fa fa-users" '.$display.'></i>&nbsp;'.$hesklang['menu_users'].'</a></li>';} 
+                if (hesk_checkPermission('can_man_cat',0))  {echo '<li><a href="manage_categories.php"><i class="fa fa-pie-chart" '.$display.'></i>&nbsp;'.$hesklang['menu_cat'].'</a></li>';}
+                if (hesk_checkPermission('can_man_canned',0)) {echo '<li><a href="manage_canned.php"><i class="fa fa-file-text-o" '.$display.'></i>&nbsp;'.$hesklang['menu_can'].'</a></li>';}
+                if (hesk_checkPermission('can_man_kb',0)) {echo '<li><a href="manage_knowledgebase.php"><i class="fa fa-book" '.$display.'></i>&nbsp;'.$hesklang['menu_kb'].'</a></li>';}
+                    else {echo '<li><a href="knowledgebase_private.php"><i class="fa fa-book" '.$display.'></i>&nbsp;'.$hesklang['menu_kb'].'</a></li>';} 
+                if (hesk_checkPermission('can_run_reports',0)) {echo '<li><a href="reports.php"><i class="fa fa-line-chart" '.$display.'></i>&nbsp;'.$hesklang['reports'].'</a></li>';}
+                    elseif (hesk_checkPermission('can_export',0)) {echo '<li><a href="export.php"><i class="fa fa-line-chart" '.$display.'></i>&nbsp;'.$hesklang['reports'].'</a></li>';}
+                if (hesk_checkPermission('can_man_settings',0)) {echo '<li><a href="admin_settings.php"><i class="fa fa-cog" '.$display.'></i>&nbsp;'.$hesklang['settings'].'</a></li>';} ?>
+          <li><a href="profile.php"><i class="fa fa-user" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['menu_profile']; ?></a></li>
+          <li><a href="mail.php"><i class="fa fa-envelope-o" <?php echo $display; ?>></i>&nbsp;<?php echo $hesklang['menu_msg']; ?>
               <?php if ($num_mail != 0)
                 {
                     echo '<span class="badge">';
@@ -70,8 +70,10 @@ $num_mail = hesk_checkNewMail();
                     echo '</span>';
                 } ?>
               </a></li>
-          <?php include('custom/show_admin_nav-custom.inc.php'); ?>
-          <li><a href="index.php?a=logout&amp;token=<?php echo hesk_token_echo(); ?>"><?php echo $hesklang['logout']; ?></a></li>
+          <?php include('custom/show_admin_nav-custom.inc.php'); 
+          $display = ($display == '') ? 'style="font-size: 14px"' : $display;
+          ?>
+          <li><a href="index.php?a=logout&amp;token=<?php echo hesk_token_echo(); ?>"><span class="octicon octicon-sign-out" <?php echo $display; ?>></span>&nbsp;<?php echo $hesklang['logout']; ?></a></li>
         </ul>
       </div><!-- /.navbar-collapse -->
     </nav>