diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index 42cc89da0..51897c5cf 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -9,25 +9,26 @@
 */
 $pages = array(
     array(
-        'label'      => _('Calendar'),
+        'label'      => "<i class='icon-calendar icon-white'></i>"._('Calendar'),
         'module'     => 'default',
         'controller' => 'Schedule',
         'action'     => 'index',
         'resource'   =>    'schedule'
     ),
     array(
-        'label' => _('Radio Page'),
+        'label' => "<i class='icon-globe icon-white'></i>"._('Radio Page'),
         'uri' => '/',
         'resource' => '',
         'pages' => array(
         )
     ),
     array(
-        'label' => _("Settings"),
+        'label' => "<i class='icon-cog icon-white'></i>"._("Settings"),
         'resource' => 'preference',
         'action' => 'index',
         'module' => 'default',
         'controller' => 'preference',
+        'title' => 'Settings',
         'pages' => array(
             array(
                 'label'      => _('General'),
@@ -56,11 +57,12 @@ $pages = array(
         )
     ),
     array(
-        'label' => _("Analytics"),
+        'label' =>  "<i class='icon-signal icon-white'></i>"._("Analytics"),
         'module'     => 'default',
         'controller' => 'listenerstat',
         'action'     => 'index',
         'resource'   => 'listenerstat',
+        'title' => 'Analytics',
         'pages' => array(
             array(
                 'label'      => _('Listener Stats'),
@@ -86,10 +88,11 @@ $pages = array(
         )
     ),
     array(
-        'label'      => _('Widgets'),
+        'label'      =>  "<i class='icon-wrench icon-white'></i>"._('Widgets'),
         'module'     => 'default',
         'controller' => 'embeddablewidgets',
         'action'     => 'player',
+        'title' => 'Widgets',
         'pages' => array(
             array(
                 'label'      => _('Player'),
@@ -106,10 +109,11 @@ $pages = array(
         )
     ),
     array(
-        'label'      => _('Help'),
+        'label'      =>  "<i class='icon-question-sign icon-white'></i>"._('Help'),
         'controller' => 'dashboard',
         'action'     => 'help',
         'resource'    =>    'dashboard',
+        'title' => 'Help',
         'pages'      => array(
             array(
                 'label'      => _('Getting Started'),
@@ -146,10 +150,11 @@ $pages = array(
         )
     ),
     array(
-        'label' => _('Billing'),
+        'label' =>  "<i class='icon-user icon-white'></i>"._('Billing'),
         'controller' => 'billing',
         'action' => 'client',
         'resource' => 'billing',
+        'title' => 'Billing',
         'pages' => array(
             array(
                 'label' => _('Account Details'),
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index 87cd1d8fe..1624c18ef 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -74,15 +74,15 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
         </a>
     </div>
     <div class="media_type_selector" selection_id="1">
-        <a href="/showbuilder#"><?php echo _("Dashboard") ?></a></div>
+        <a href="/showbuilder#"><i class='icon-home icon-white'></i><?php echo _("Dashboard") ?></a></div>
     <div class="media_type_selector dashboard_sub_nav" selection_id="1">
-        <a href="/showbuilder#files"><?php echo _("Files") ?></a></div>
+        <a href="/showbuilder#files"><i class='icon-file icon-white'></i><?php echo _("Files") ?></a></div>
     <div class="media_type_selector dashboard_sub_nav" selection_id="2">
-        <a href="/showbuilder#playlists"><?php echo _("Playlists") ?></a></div>
+        <a href="/showbuilder#playlists"><i class='icon-list icon-white'></i><?php echo _("Playlists") ?></a></div>
     <div class="media_type_selector dashboard_sub_nav" selection_id="3">
-        <a href="/showbuilder#smart-blocks"><?php echo _("Smart Blocks") ?></a></div>
+        <a href="/showbuilder#smart-blocks"><i class='icon-time icon-white'></i><?php echo _("Smart Blocks") ?></a></div>
     <div class="media_type_selector dashboard_sub_nav" selection_id="4">
-        <a href="/showbuilder#webstreams"><?php echo _("Webstreams") ?></a></div>
+        <a href="/showbuilder#webstreams"><i class='icon-random icon-white'></i><?php echo _("Webstreams") ?></a></div>
     <hr style="margin-left: 5px; margin-right: 5px">
     <div id="nav">
         <?php echo $this->navigation()->menu(); ?>
diff --git a/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml b/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
index 2b999330f..e5691bb85 100644
--- a/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
+++ b/airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
@@ -98,15 +98,15 @@
         </a>
     </div>
     <div class="media_type_selector" selection_id="1">
-        <a href="/showbuilder"><?php echo _("Dashboard") ?></a></div>
+        <a href="/showbuilder#"><i class='icon-home icon-white'></i><?php echo _("Dashboard") ?></a></div>
     <div class="media_type_selector dashboard_sub_nav" selection_id="1">
-        <a href="/showbuilder#files"><?php echo _("Files") ?></a></div>
+        <a href="/showbuilder#files"><i class='icon-file icon-white'></i><?php echo _("Files") ?></a></div>
     <div class="media_type_selector dashboard_sub_nav" selection_id="2">
-        <a href="/showbuilder#playlists"><?php echo _("Playlists") ?></a></div>
+        <a href="/showbuilder#playlists"><i class='icon-list icon-white'></i><?php echo _("Playlists") ?></a></div>
     <div class="media_type_selector dashboard_sub_nav" selection_id="3">
-        <a href="/showbuilder#smart-blocks"><?php echo _("Smart Blocks") ?></a></div>
+        <a href="/showbuilder#smart-blocks"><i class='icon-time icon-white'></i><?php echo _("Smart Blocks") ?></a></div>
     <div class="media_type_selector dashboard_sub_nav" selection_id="4">
-        <a href="/showbuilder#webstreams"><?php echo _("Webstreams") ?></a></div>
+        <a href="/showbuilder#webstreams"><i class='icon-random icon-white'></i><?php echo _("Webstreams") ?></a></div>
     <hr style="margin-left: 5px; margin-right: 5px">
     <div id="nav">
         <?php echo $this->navigation()->menu(); ?>
@@ -124,7 +124,7 @@
         echo $this->layout()->parent_page; ?></h3>
         <hr>
         <?php
-        $page = $this->navigation()->findOneBy('label', $this->layout()->parent_page);
+        $page = $this->navigation()->findOneBy('title', $this->layout()->parent_page);
         echo $this->navigation()->menu()->renderMenu($page);
         ?>
     </div>
diff --git a/airtime_mvc/public/css/add-show.css b/airtime_mvc/public/css/add-show.css
index b71198245..0749ce534 100644
--- a/airtime_mvc/public/css/add-show.css
+++ b/airtime_mvc/public/css/add-show.css
@@ -158,10 +158,6 @@ label.wrapp-label input[type="checkbox"] {
     cursor: pointer;
 }
 
-/* Hack for calendar page icons */
-.icon-white {
-    margin-right: 4px;
-}
 /*
 .add-button {
     border: 1px solid #5b5b5b;
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 3d4b27baa..b41009cb6 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -3467,7 +3467,7 @@ button.btn-icon-text > i.icon-white {
     -moz-box-sizing: border-box;
     box-sizing: border-box;
 
-    width: 130px;
+    width: 150px;
 
     flex: 1 auto;
     padding: 0;
@@ -3545,7 +3545,7 @@ button.btn-icon-text > i.icon-white {
     position: absolute;
 
     top: 102px;
-    left: 130px;
+    left: 150px;
     right: 0;
     bottom: 0;
     padding: 10px 10px 40px;
@@ -3575,7 +3575,7 @@ button.btn-icon-text > i.icon-white {
 .usability_hint {
     position: fixed;
     top: 102px;
-    left: 130px;
+    left: 150px;
 
     width: 100%;
     flex: 0 100%;
@@ -3589,7 +3589,7 @@ button.btn-icon-text > i.icon-white {
     background-color: #ff611f;
     color: white;
     font-size: 14px;
-    text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.2);
+    text-shadow: 0px 0px 1px rgba(0, 0, 0, 0.1);
 
     z-index: 99; /* Need to be above elements like the shows in the calendar! */
     /*margin: 5px 10px;*/
@@ -3662,3 +3662,13 @@ hr {
     height: 1px;
     background: rgba(255,255,255,0.2);
 }
+
+.icon-white {
+    margin-right: 4px;
+}
+
+.nav-ui-icon-formatter {
+    width:16px !important;
+    display:inline;
+    margin-right:4px
+}