diff --git a/src/AppTopBar.vue b/src/AppTopBar.vue
index 8a4875368..508e58e2a 100644
--- a/src/AppTopBar.vue
+++ b/src/AppTopBar.vue
@@ -14,15 +14,15 @@
                     <ul v-if="themesMenuVisible">
                         <li class="topbar-submenu-header">THEMING</li>
                         <li><router-link to="/theming" @click.native="hideThemesMenu()"><i class="pi pi-fw pi-file"/><span>Guide</span></router-link></li>
-                        <li><a href="https://www.primefaces.org/designer/primevue"><i class="pi pi-fw pi-cog" /><span>Designer</span></a></li>
-                        <li><router-link to="/icons" @click.native="hideThemesMenu()"><i class="pi pi-fw pi-search"/><span>Icons</span></router-link></li>
-                        <li class="topbar-submenu-header">PREMIUM TEMPLATES</li>
+                        <li><a href="https://www.primefaces.org/designer/primevue"><i class="pi pi-fw pi-palette" /><span>Designer</span></a></li>
+                        <li><router-link to="/icons" @click.native="hideThemesMenu()"><i class="pi pi-fw pi-info-circle"/><span>Icons</span></router-link></li>
+                        <li class="topbar-submenu-header">PREMIUM ADMIN TEMPLATES</li>
                         <li><a href="https://www.primefaces.org/sapphire-vue"><img src="./assets/images/layouts/themeswitcher-sapphire.png" alt="Sapphire" /><span>Sapphire</span><span class="theme-badge material">material</span></a></li>
                         <li><a href="https://www.primefaces.org/avalon-vue"><img src="./assets/images/layouts/themeswitcher-avalon.png" alt="Avalon" /><span>Avalon</span><span class="theme-badge bootstrap">bootstrap</span></a></li>
                         <li><a href="https://www.primefaces.org/babylon-vue"><img src="./assets/images/layouts/themeswitcher-babylon.png" alt="Babylon" /><span>Babylon</span></a></li>
-                        <li class="topbar-submenu-header">FREE TEMPLATES</li>
+                        <li class="topbar-submenu-header">FREE ADMIN TEMPLATE</li>
                         <li><a href="https://www.primefaces.org/sigma-vue"><img src="./assets/images/layouts/themeswitcher-sigma.png" alt="Sigma" /><span>Sigma</span></a></li>
-                        <li class="topbar-submenu-header">FREE THEMES</li>
+                        <li class="topbar-submenu-header">FREE COMPONENT THEMES</li>
                         <li><a href="#" @click="changeTheme($event, 'nova-light', false)"><img src="./assets/images/layouts/themeswitcher-nova-light.png" alt="Nova Light" /><span>Nova Light</span></a></li>
                         <li><a @click="changeTheme($event, 'nova-dark', false)"><img src="./assets/images/layouts/themeswitcher-nova-dark.png" alt="Nova Dark" /><span>Nova Dark</span></a></li>
                         <li><a @click="changeTheme($event, 'nova-colored', false)"><img src="./assets/images/layouts/themeswitcher-nova-colored.png" alt="Nova Colored" /><span>Nova Colored</span></a></li>
diff --git a/src/assets/styles/app.scss b/src/assets/styles/app.scss
index 82a8d7885..1db55fdfd 100644
--- a/src/assets/styles/app.scss
+++ b/src/assets/styles/app.scss
@@ -64,6 +64,7 @@ body {
     font-weight: normal;
     color: #484848;
     -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
     font-size: 14px;
 }
 
@@ -181,8 +182,11 @@ body {
                             padding: 6px 12px;
                             font-weight: bold;
                             text-align: left;
-                            color: #ffffff;
-                            background-color: #34485e;
+                            margin-top: 18px;
+
+                            &:first-child {
+                                margin-top: 6px;
+                            }
                         }
                     }
 
@@ -335,22 +339,6 @@ body {
             }
         }
     }
-
-    .nano {
-        > .nano-content {
-            .layout-menu {
-                padding-bottom: 120px;
-            }
-        }
-
-        > .nano-pane {
-            background-color: transparent;
-
-            .nano-slider {
-                background-color: #aaaaaa;
-            }
-        }
-    }
 }
 
 .layout-mask {
@@ -409,14 +397,9 @@ body {
 
                 a {
                     border-radius: 3px;
-                    background-color: #2f4860;
-                    color: #ffffff;
+                    background-color: #ffffff;
                     padding: 2px 4px;
-                    @include transition(background-color .2s);
-
-                    &:hover {
-                        background-color: #536e8b;
-                    }
+                    color: #484848;
                 }
             }
         }
@@ -524,7 +507,7 @@ body {
             
             .btn-viewsource {
                 background-color: #444;
-                padding: .5em;
+                padding: .5em 1em;
                 border-radius: 2px;
                 color: #fff;
                 font-weight: 700;
@@ -535,12 +518,6 @@ body {
                 &:hover {
                     background-color: #595959;
                 }
-
-                i {
-                    margin-right: .25em;
-                    background-color: transparent;
-                    font-family: 'FontAwesome';
-                }
             }
 
             i:not([class~="pi"]) {
@@ -550,6 +527,7 @@ body {
                 font-style: normal;
                 font-size: 14px;
                 padding: 2px;
+                letter-spacing: .5px;
             }
 
             /* Demo Tabs Source */
@@ -596,15 +574,15 @@ body {
                         &.p-highlight:hover a {
                             border: 0 none;
                             background: #f5f7f8;
-                            color: #42b983;
-                            border-bottom: 1px solid #42b983;
+                            color: #3294e0;
+                            border-bottom: 1px solid #3294e0;
                         }
 
                         &:not(.p-highlight):not(.p-disabled):hover a {
                             color: #34495e;
                             background-color: transparent;
                             border: 0 none;
-                            border-bottom: 1px solid #42b983;
+                            border-bottom: 1px solid #3294e0;
                         }
                     }
                 }