diff --git a/src/app/main/navbar/navbar.component.html b/src/app/main/navbar/navbar.component.html
index 4567f25f..c3fcfae5 100644
--- a/src/app/main/navbar/navbar.component.html
+++ b/src/app/main/navbar/navbar.component.html
@@ -5,11 +5,11 @@
         <span class="logo-text">FUSE</span>
     </div>
 
-    <button md-button class="toggle-button-navbar mat-icon-button" fuseNavbar="toggleFold" fxHide.xs>
+    <button md-button class="toggle-button-navbar mat-icon-button" fuseNavbar="toggleFold" fxHide.lt-lg>
         <md-icon>menu</md-icon>
     </button>
 
-    <button md-button class="toggle-button-navbar mat-icon-button" fuseNavbar="closeBar" fxHide.gt-xs>
+    <button md-button class="toggle-button-navbar mat-icon-button" fuseNavbar="closeBar" fxHide.gt-md>
         <md-icon>arrow_back</md-icon>
     </button>
 
diff --git a/src/app/main/navbar/navbar.component.scss b/src/app/main/navbar/navbar.component.scss
index 9dc8eae4..7b38a824 100644
--- a/src/app/main/navbar/navbar.component.scss
+++ b/src/app/main/navbar/navbar.component.scss
@@ -72,7 +72,7 @@ fuse-navbar {
         box-shadow: none;
     }
 
-    @include media-breakpoint('lt-md') {
+    @include media-breakpoint('lt-lg') {
         position: absolute;
         top: 0;
         bottom: 0;
diff --git a/src/app/main/navbar/navbar.component.ts b/src/app/main/navbar/navbar.component.ts
index 0f0ab62c..cc2ee634 100644
--- a/src/app/main/navbar/navbar.component.ts
+++ b/src/app/main/navbar/navbar.component.ts
@@ -35,7 +35,7 @@ export class FuseNavbarComponent implements OnInit, OnDestroy
                 .subscribe((mediaStep) => {
                     setTimeout(() => {
 
-                        if ( this.media.isActive('lt-md') )
+                        if ( this.media.isActive('lt-lg') )
                         {
                             this.closeBar();
                             this.deActivateFolded();
@@ -60,7 +60,7 @@ export class FuseNavbarComponent implements OnInit, OnDestroy
             this.initialized = true;
         });
 
-        if ( this.media.isActive('lt-md') )
+        if ( this.media.isActive('lt-lg') )
         {
             this.closeBar();
             this.deActivateFolded();
diff --git a/src/app/main/toolbar/toolbar.component.html b/src/app/main/toolbar/toolbar.component.html
index a1a8d209..3c58c96d 100644
--- a/src/app/main/toolbar/toolbar.component.html
+++ b/src/app/main/toolbar/toolbar.component.html
@@ -4,11 +4,11 @@
 
         <div fxFlex fxLayout="row" fxLayoutAlign="start center">
 
-            <button md-button class="toggle-button-navbar mat-icon-button" fuseNavbar="openBar" fxHide.gt-sm fxFlex="56px">
+            <button md-button class="toggle-button-navbar mat-icon-button" fuseNavbar="openBar" fxHide.gt-md>
                 <md-icon>menu</md-icon>
             </button>
 
-            <div class="toolbar-separator" fxHide.gt-sm></div>
+            <div class="toolbar-separator" fxHide.gt-md></div>
 
             <div class="px-16" fxHide.lt-md>
                 <fuse-shortcuts></fuse-shortcuts>
diff --git a/src/app/main/toolbar/toolbar.component.scss b/src/app/main/toolbar/toolbar.component.scss
index 5826b054..4e4977aa 100644
--- a/src/app/main/toolbar/toolbar.component.scss
+++ b/src/app/main/toolbar/toolbar.component.scss
@@ -21,6 +21,11 @@
         height: 64px;
     }
 
+    .toggle-button-navbar {
+        min-width: 56px;
+        height: 56px;
+    }
+
     .toolbar-separator {
         height: 64px;
         width: 1px;