          }
  
          if (mode === this.Mode_.STANDARD) {
-@@ -511,6 +504,13 @@
+@@ -368,20 +361,16 @@
+ 
+       // Add drawer toggling button to our layout, if we have an openable drawer.
+       if (this.drawer_) {
+-        var drawerButton = this.element_.querySelector('.' +
+-          this.CssClasses_.DRAWER_BTN);
+-        if (!drawerButton) {
+-          drawerButton = document.createElement('div');
+-          drawerButton.setAttribute('aria-expanded', 'false');
+-          drawerButton.setAttribute('role', 'button');
+-          drawerButton.setAttribute('tabindex', '0');
+-          drawerButton.classList.add(this.CssClasses_.DRAWER_BTN);
+-
+-          var drawerButtonIcon = document.createElement('i');
+-          drawerButtonIcon.classList.add(this.CssClasses_.ICON);
+-          drawerButtonIcon.innerHTML = this.Constant_.MENU_ICON;
+-          drawerButton.appendChild(drawerButtonIcon);
+-        }
++        var drawerButton = document.createElement('div');
++        drawerButton.setAttribute('aria-expanded', 'false');
++        drawerButton.setAttribute('role', 'button');
++        drawerButton.setAttribute('tabindex', '0');
++        drawerButton.classList.add(this.CssClasses_.DRAWER_BTN);
++
++        var drawerButtonIcon = document.createElement('i');
++        drawerButtonIcon.classList.add(this.CssClasses_.ICON);
++        drawerButtonIcon.innerHTML = this.Constant_.MENU_ICON;
++        drawerButton.appendChild(drawerButtonIcon);
+ 
+         if (this.drawer_.classList.contains(this.CssClasses_.ON_LARGE_SCREEN)) {
+           //If drawer has ON_LARGE_SCREEN class then add it to the drawer toggle button as well.
+@@ -511,6 +500,13 @@
          }
        }
  

diff --git a/src/layout/_layout.scss b/src/layout/_layout.scss
index de8fc0c..4ca5645 100644
--- a/src/layout/_layout.scss
+++ b/src/layout/_layout.scss
@@ -39,14 +39,9 @@

         .mdl-layout__header-row {
           padding-left: 40px;
         }
@@ -450,20 +450,20 @@
     z-index: 1;
     -webkit-overflow-scrolling: touch;
