diff --git a/src/@fuse/components/search-bar/search-bar.component.html b/src/@fuse/components/search-bar/search-bar.component.html
index a79f270f..92330c9b 100644
--- a/src/@fuse/components/search-bar/search-bar.component.html
+++ b/src/@fuse/components/search-bar/search-bar.component.html
@@ -17,7 +17,7 @@
 
         <button mat-icon-button class="fuse-search-bar-collapser" (click)="collapse()"
                 aria-label="Collapse Search Bar">
-            <mat-icon class="s-24">close</mat-icon>
+            <mat-icon class="secondary-text s-24">close</mat-icon>
         </button>
 
     </div>
diff --git a/src/app/layout/components/navbar/navbar.component.html b/src/app/layout/components/navbar/navbar.component.html
index 6532818a..037d9c58 100644
--- a/src/app/layout/components/navbar/navbar.component.html
+++ b/src/app/layout/components/navbar/navbar.component.html
@@ -9,12 +9,12 @@
                 <span class="logo-text">FUSE</span>
             </div>
 
-            <button mat-icon-button class="toggle-button-navbar"
+            <button mat-icon-button class="toggle-sidebar-folded"
                     (click)="toggleSidebarFolded()" fxHide.lt-lg>
                 <mat-icon>menu</mat-icon>
             </button>
 
-            <button mat-icon-button class="toggle-button-navbar"
+            <button mat-icon-button class="toggle-sidebar-opened"
                     (click)="toggleSidebarOpened()" fxHide.gt-md>
                 <mat-icon>arrow_back</mat-icon>
             </button>
diff --git a/src/app/layout/components/navbar/navbar.component.scss b/src/app/layout/components/navbar/navbar.component.scss
index 09837358..8bd2d7ba 100644
--- a/src/app/layout/components/navbar/navbar.component.scss
+++ b/src/app/layout/components/navbar/navbar.component.scss
@@ -1,28 +1,5 @@
 @import "src/@fuse/scss/fuse";
 
-body {
-
-    &.fuse-sidebar-folded {
-
-        .content-wrapper {
-
-            &:last-child {
-                padding-left: 64px !important;
-            }
-
-            &:first-child {
-                padding-right: 64px !important;
-            }
-
-            &:first-child:last-child {
-                padding-left: 0 !important;
-                padding-right: 0 !important;
-            }
-
-        }
-    }
-}
-
 fuse-sidebar {
 
     &.folded:not(.unfolded) {
@@ -89,16 +66,14 @@ navbar {
             flex: 1;
         }
     }
-}
 
-.top-navbar + #wrapper {
+    &.right-navbar {
 
-    & > .left-navbar {
-        display: none !important;
+        .toggle-sidebar-opened {
 
-        @include media-breakpoint-down(md) {
-            display: flex !important;
+            mat-icon {
+                transform: rotate(180deg);
+            }
         }
     }
 }
-
diff --git a/src/app/layout/components/toolbar/toolbar.component.html b/src/app/layout/components/toolbar/toolbar.component.html
index e118746c..8de3436e 100644
--- a/src/app/layout/components/toolbar/toolbar.component.html
+++ b/src/app/layout/components/toolbar/toolbar.component.html
@@ -6,13 +6,12 @@
 
         <div fxFlex="1 0 auto" fxLayout="row" fxLayoutAlign="start center">
 
-            <button mat-icon-button class="toggle-button-navbar"
-                    *ngIf="!noNav"
-                    (click)="toggleSidebarOpen('navbar')" fxHide.gt-md>
-                <mat-icon>menu</mat-icon>
+            <button mat-icon-button class="navbar-toggle-button"
+                    *ngIf="!hiddenNavbar && !rightNavbar" (click)="toggleSidebarOpen('navbar')" fxHide.gt-md>
+                <mat-icon class="secondary-text">menu</mat-icon>
             </button>
 
-            <div class="toolbar-separator" fxHide.gt-md></div>
+            <div class="toolbar-separator" *ngIf="!hiddenNavbar && !rightNavbar" fxHide.gt-md></div>
 
             <div fxLayout="row" fxLayoutAlign="start center" *ngIf="horizontalNav">
                 <div class="logo ml-16">
@@ -97,6 +96,13 @@
                 <mat-icon class="icon">format_list_bulleted</mat-icon>
             </button>
 
+            <div class="toolbar-separator" *ngIf="!hiddenNavbar && rightNavbar" fxHide fxShow.gt-xs></div>
+
+            <button mat-icon-button class="navbar-toggle-button"
+                    *ngIf="!hiddenNavbar && rightNavbar" (click)="toggleSidebarOpen('navbar')" fxHide.gt-md>
+                <mat-icon class="secondary-text">menu</mat-icon>
+            </button>
+
         </div>
 
     </div>
diff --git a/src/app/layout/components/toolbar/toolbar.component.scss b/src/app/layout/components/toolbar/toolbar.component.scss
index ea7692af..3813e171 100644
--- a/src/app/layout/components/toolbar/toolbar.component.scss
+++ b/src/app/layout/components/toolbar/toolbar.component.scss
@@ -45,7 +45,7 @@
         }
     }
 
-    .toggle-button-navbar {
+    .navbar-toggle-button {
         min-width: 56px;
         height: 56px;
     }
diff --git a/src/app/layout/components/toolbar/toolbar.component.ts b/src/app/layout/components/toolbar/toolbar.component.ts
index ac21c3de..3783d894 100644
--- a/src/app/layout/components/toolbar/toolbar.component.ts
+++ b/src/app/layout/components/toolbar/toolbar.component.ts
@@ -18,9 +18,10 @@ import { navigation } from 'app/navigation/navigation';
 
 export class ToolbarComponent implements OnInit, OnDestroy
 {
-    horizontalNav: boolean;
+    horizontalNavbar: boolean;
+    rightNavbar: boolean;
+    hiddenNavbar: boolean;
     languages: any;
-    noNav: boolean;
     navigation: any;
     selectedLanguage: any;
     showLoadingBar: boolean;
@@ -123,8 +124,9 @@ export class ToolbarComponent implements OnInit, OnDestroy
         this._fuseConfigService.config
             .pipe(takeUntil(this._unsubscribeAll))
             .subscribe((settings) => {
-                this.horizontalNav = settings.layout.navbar.position === 'top';
-                this.noNav = settings.layout.navbar.position === 'none';
+                this.horizontalNavbar = settings.layout.navbar.position === 'top';
+                this.rightNavbar = settings.layout.navbar.position === 'right';
+                this.hiddenNavbar = settings.layout.navbar.hidden === true;
             });
 
         // Set the selected language from default languages
diff --git a/src/app/layout/horizontal/layout-1/layout-1.component.html b/src/app/layout/horizontal/layout-1/layout-1.component.html
index f71c2da1..aa7ab758 100644
--- a/src/app/layout/horizontal/layout-1/layout-1.component.html
+++ b/src/app/layout/horizontal/layout-1/layout-1.component.html
@@ -82,8 +82,8 @@
 <!-- TOP NAVBAR -->
 <ng-template #topNavbar>
     <navbar layout="horizontal"
-            class="top-navbar" fxHide fxShow.gt-md
-            [ngClass]="fuseConfig.layout.navbar.background"
+            class="top-navbar" [ngClass]="fuseConfig.layout.navbar.background"
+            fxHide fxShow.gt-md
             *ngIf="!fuseConfig.layout.navbar.hidden">
     </navbar>
 </ng-template>
@@ -93,9 +93,8 @@
 <ng-template #leftNavbar>
     <fuse-sidebar [name]="'navbar'"
                   [folded]="fuseConfig.layout.navbar.folded"
-                  class="left-navbar" [ngClass]="fuseConfig.layout.navbar.background"
                   *ngIf="!fuseConfig.layout.navbar.hidden">
-        <navbar layout="vertical"></navbar>
+        <navbar class="left-navbar" [ngClass]="fuseConfig.layout.navbar.background" layout="vertical"></navbar>
     </fuse-sidebar>
 </ng-template>
 <!-- / LEFT NAVBAR -->
diff --git a/src/app/layout/vertical/layout-1/body-scroll/body-scroll.component.html b/src/app/layout/vertical/layout-1/body-scroll/body-scroll.component.html
index 8981cf8f..6eb66b31 100644
--- a/src/app/layout/vertical/layout-1/body-scroll/body-scroll.component.html
+++ b/src/app/layout/vertical/layout-1/body-scroll/body-scroll.component.html
@@ -96,9 +96,8 @@
     <fuse-sidebar [name]="'navbar'"
                   [folded]="fuseConfig.layout.navbar.folded"
                   [lockedOpen]="'gt-md'"
-                  class="left-navbar" [ngClass]="fuseConfig.layout.navbar.background"
                   *ngIf="!fuseConfig.layout.navbar.hidden">
-        <navbar layout="vertical"></navbar>
+        <navbar class="left-navbar" [ngClass]="fuseConfig.layout.navbar.background" layout="vertical"></navbar>
     </fuse-sidebar>
 </ng-template>
 <!-- / LEFT NAVBAR -->
@@ -108,9 +107,8 @@
     <fuse-sidebar [name]="'navbar'" position="right"
                   [folded]="fuseConfig.layout.navbar.folded"
                   [lockedOpen]="'gt-md'"
-                  class="right-navbar" [ngClass]="fuseConfig.layout.navbar.background"
                   *ngIf="!fuseConfig.layout.navbar.hidden">
-        <navbar layout="vertical"></navbar>
+        <navbar class="right-navbar" [ngClass]="fuseConfig.layout.navbar.background" layout="vertical"></navbar>
     </fuse-sidebar>
 </ng-template>
 <!-- / RIGHT NAVBAR -->
\ No newline at end of file
diff --git a/src/app/layout/vertical/layout-1/content-scroll/content-scroll.component.html b/src/app/layout/vertical/layout-1/content-scroll/content-scroll.component.html
index 086e8d5f..e6b32e29 100644
--- a/src/app/layout/vertical/layout-1/content-scroll/content-scroll.component.html
+++ b/src/app/layout/vertical/layout-1/content-scroll/content-scroll.component.html
@@ -96,9 +96,8 @@
     <fuse-sidebar [name]="'navbar'"
                   [folded]="fuseConfig.layout.navbar.folded"
                   [lockedOpen]="'gt-md'"
-                  class="left-navbar" [ngClass]="fuseConfig.layout.navbar.background"
                   *ngIf="!fuseConfig.layout.navbar.hidden">
-        <navbar layout="vertical"></navbar>
+        <navbar class="left-navbar" [ngClass]="fuseConfig.layout.navbar.background" layout="vertical"></navbar>
     </fuse-sidebar>
 </ng-template>
 <!-- / LEFT NAVBAR -->
@@ -108,9 +107,8 @@
     <fuse-sidebar [name]="'navbar'" position="right"
                   [folded]="fuseConfig.layout.navbar.folded"
                   [lockedOpen]="'gt-md'"
-                  class="right-navbar" [ngClass]="fuseConfig.layout.navbar.background"
                   *ngIf="!fuseConfig.layout.navbar.hidden">
-        <navbar layout="vertical"></navbar>
+        <navbar class="right-navbar" [ngClass]="fuseConfig.layout.navbar.background" layout="vertical"></navbar>
     </fuse-sidebar>
 </ng-template>
 <!-- / RIGHT NAVBAR -->
\ No newline at end of file
diff --git a/src/app/layout/vertical/layout-2/layout-2.component.html b/src/app/layout/vertical/layout-2/layout-2.component.html
index ed0b3969..f6468ccc 100644
--- a/src/app/layout/vertical/layout-2/layout-2.component.html
+++ b/src/app/layout/vertical/layout-2/layout-2.component.html
@@ -82,9 +82,8 @@
     <fuse-sidebar [name]="'navbar'"
                   [folded]="fuseConfig.layout.navbar.folded"
                   [lockedOpen]="'gt-md'"
-                  class="left-navbar" [ngClass]="fuseConfig.layout.navbar.background"
                   *ngIf="!fuseConfig.layout.navbar.hidden">
-        <navbar layout="vertical"></navbar>
+        <navbar class="left-navbar" [ngClass]="fuseConfig.layout.navbar.background" layout="vertical"></navbar>
     </fuse-sidebar>
 </ng-template>
 <!-- / LEFT NAVBAR -->
@@ -94,9 +93,8 @@
     <fuse-sidebar [name]="'navbar'" position="right"
                   [folded]="fuseConfig.layout.navbar.folded"
                   [lockedOpen]="'gt-md'"
-                  class="right-navbar" [ngClass]="fuseConfig.layout.navbar.background"
                   *ngIf="!fuseConfig.layout.navbar.hidden">
-        <navbar layout="vertical"></navbar>
+        <navbar class="right-navbar" [ngClass]="fuseConfig.layout.navbar.background" layout="vertical"></navbar>
     </fuse-sidebar>
 </ng-template>
 <!-- / RIGHT NAVBAR -->
\ No newline at end of file