diff --git a/ionic/components/aside/test/basic/page2.html b/ionic/components/aside/test/basic/page2.html
index 4e60d298e4..3a27780659 100644
--- a/ionic/components/aside/test/basic/page2.html
+++ b/ionic/components/aside/test/basic/page2.html
@@ -1,11 +1,9 @@
 
 <ion-navbar *navbar>
 
-  <ion-nav-items primary>
-    <button aside-toggle id="e2eHeaderToggleAside">
-      <icon menu></icon>
-    </button>
-  </ion-nav-items>
+  <button aside-toggle id="e2eHeaderToggleAside">
+    <icon menu></icon>
+  </button>
 
   <ion-title>
     Aside
diff --git a/ionic/components/toolbar/modes/material.scss b/ionic/components/toolbar/modes/material.scss
index bd040b66a9..1d590f925b 100644
--- a/ionic/components/toolbar/modes/material.scss
+++ b/ionic/components/toolbar/modes/material.scss
@@ -20,7 +20,7 @@ $toolbar-md-button-font-size:        1.4rem !default;
     font-weight: 500;
   }
 
-  .toolbar-primary-item ion-nav-items button:first-child {
+  .toolbar-primary-item button:first-child {
     margin-left: 0;
   }
 
@@ -33,4 +33,15 @@ $toolbar-md-button-font-size:        1.4rem !default;
     box-shadow: none;
   }
 
+  [aside-toggle],
+  [aside-toggle].activated {
+    margin: -$toolbar-padding 0 -$toolbar-padding -$toolbar-padding;
+    padding-bottom: $toolbar-padding / 2;
+    height: $toolbar-md-height;
+  }
+
+  [aside-toggle] icon {
+    padding: 0 33px 0 20px;
+  }
+
 }
diff --git a/ionic/components/toolbar/toolbar.scss b/ionic/components/toolbar/toolbar.scss
index 287afe1e5d..fe07df8d39 100644
--- a/ionic/components/toolbar/toolbar.scss
+++ b/ionic/components/toolbar/toolbar.scss
@@ -2,6 +2,8 @@
 // Toolbar
 // --------------------------------------------------
 
+$toolbar-padding:        4px !default;
+
 $toolbar-order: (
   backButton: 10,
   aside-toggle: 20,
@@ -15,9 +17,6 @@ $toolbar-order: (
   position: relative;
   z-index: $z-index-toolbar;
 
-  width: 100%;
-  padding: 4px;
-
   display: flex;
   flex-direction: row;
   align-items: center;
@@ -25,6 +24,9 @@ $toolbar-order: (
   order: $flex-order-toolbar-top;
   flex: 0;
 
+  padding: $toolbar-padding;
+  width: 100%;
+
   border: 0;
   border-color: $toolbar-border-color;
   background-color: $toolbar-background-color;