diff --git a/html/css/dark.css b/html/css/dark.css
index da946c67d6..674a91ec13 100644
--- a/html/css/dark.css
+++ b/html/css/dark.css
@@ -1,4 +1,4 @@
-.fa {
+.fa-nav-icons {
     color: #e30613;
 }
 
diff --git a/html/css/light.css b/html/css/light.css
index 343ee9bf59..b51d42c1f7 100644
--- a/html/css/light.css
+++ b/html/css/light.css
@@ -1,4 +1,4 @@
-.fa {
+.fa-nav-icons {
     color: #e30613;
 }
 
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 73b6e9a226..aba93a2d54 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -48,7 +48,7 @@ if (isset($config['site_style']) && $config['site_style'] == 'dark') {
     <div class="collapse navbar-collapse" id="navHeaderCollapse">
       <ul class="nav navbar-nav">
         <li class="dropdown">
-          <a href="<?php echo(generate_url(array('page'=>'overview'))); ?>" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-lightbulb-o fa-fw fa-lg"></i> Overview</a>
+          <a href="<?php echo(generate_url(array('page'=>'overview'))); ?>" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-lightbulb-o fa-fw fa-lg fa-nav-icons"></i> Overview</a>
           <ul class="dropdown-menu">
             <li><a href="<?php echo(generate_url(array('page'=>'overview'))); ?>"><i class="fa fa-lightbulb-o fa-fw fa-lg"></i> Overview</a></li>
           <li class="dropdown-submenu">
@@ -84,7 +84,7 @@ if ($_SESSION['userlevel'] >= '10') {
           </ul>
         </li>
         <li class="dropdown">
-          <a href="devices/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-server fa-fw fa-lg"></i> Devices</a>
+          <a href="devices/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-server fa-fw fa-lg fa-nav-icons"></i> Devices</a>
           <ul class="dropdown-menu">
             <li class="dropdown-submenu">
               <a href="devices/"><i class="fa fa-server fa-fw fa-lg"></i> All Devices</a>
@@ -149,7 +149,7 @@ if ($config['show_services'])
 {
 ?>
         <li class="dropdown">
-          <a href="services/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-cogs fa-fw fa-lg"></i> Services</a>
+          <a href="services/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-cogs fa-fw fa-lg fa-nav-icons"></i> Services</a>
           <ul class="dropdown-menu">
             <li><a href="services/"><i class="fa fa-cogs fa-fw fa-lg"></i> All Services </a></li>
 
@@ -179,7 +179,7 @@ if ($_SESSION['userlevel'] >= '10')
 
     <!-- PORTS -->
         <li class="dropdown">
-          <a href="ports/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-link fa-fw fa-lg"></i> Ports</a>
+          <a href="ports/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-link fa-fw fa-lg fa-nav-icons"></i> Ports</a>
           <ul class="dropdown-menu">
             <li><a href="ports/"><i class="fa fa-link fa-fw fa-lg"></i> All Ports</a></li>
 
@@ -260,7 +260,7 @@ $menu_sensors = $used_sensors;
 ?>
 
         <li class="dropdown">
-          <a href="health/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-heartbeat fa-fw fa-lg"></i> Health</a>
+          <a href="health/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-heartbeat fa-fw fa-lg fa-nav-icons"></i> Health</a>
           <ul class="dropdown-menu">
             <li><a href="health/metric=mempool/"><i class="fa fa-gears fa-fw fa-lg"></i> Memory</a></li>
             <li><a href="health/metric=processor/"><i class="fa fa-desktop fa-fw fa-lg"></i> Processor</a></li>
@@ -320,7 +320,7 @@ if ($_SESSION['userlevel'] >= '5' && ($app_count) > "0")
 {
 ?>
         <li class="dropdown">
-          <a href="apps/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-tasks fa-fw fa-lg"></i> Apps</a>
+          <a href="apps/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-tasks fa-fw fa-lg fa-nav-icons"></i> Apps</a>
           <ul class="dropdown-menu">
 <?php
 
@@ -350,7 +350,7 @@ if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf
 
 ?>
         <li class="dropdown">
-          <a href="routing/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-arrows fa-fw fa-lg"></i> Routing</a>
+          <a href="routing/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-arrows fa-fw fa-lg fa-nav-icons"></i> Routing</a>
           <ul class="dropdown-menu">
 <?php
   $separator = 0;
@@ -414,7 +414,7 @@ if ( dbFetchCell("SELECT 1 from `packages` LIMIT 1") ) {
 ?>
 
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-plug fa-fw fa-lg"></i> Plugins</a>
+          <a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-plug fa-fw fa-lg fa-nav-icons"></i> Plugins</a>
           <ul class="dropdown-menu">
 <?php
 Plugins::call('menu');
@@ -447,7 +447,7 @@ if(is_file("includes/print-menubar-custom.inc.php"))
      </form>
     <ul class="nav navbar-nav navbar-right">
       <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-cog fa-fw fa-lg"></i></a>
+        <a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-cog fa-fw fa-lg fa-nav-icons"></i></a>
         <ul class="dropdown-menu">
           <li role="presentation" class="dropdown-header"> Settings</li>
           <li role="presentation" class="divider"></li>