diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dab535261..893b0b7bea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Breaking Changes
 
-#### CSS Refactor
+##### CSS Refactor
 
 * Attributes are now used by Ionic to add the correct CSS classes to elements
 * Drastically reduced the depth of CSS selectors
@@ -19,7 +19,9 @@
     * ie: Gray navbars in iOS, blue navbars in MD. Identical HTML/JS
 
 
-####  `<ion-nav-items>` renamed to `<ion-buttons>`
+#####  `<ion-nav-items>` renamed to `<ion-buttons>`
 
 * `primary` attribute `<ion-nav-items primary>` now `<ion-buttons start>`
 * `secondary` attribute `<ion-nav-items secondary>` now `<ion-buttons end>`
+
+##### <a menu-toggle> should now be <button menu-toggle>
diff --git a/demos/list/basic-list.html b/demos/list/basic-list.html
index ba143f812b..857f63fc19 100644
--- a/demos/list/basic-list.html
+++ b/demos/list/basic-list.html
@@ -1,9 +1,9 @@
 
 <ion-navbar *navbar class="show-navbar">
 
-  <a menu-toggle="leftMenu">
+  <button menu-toggle="leftMenu">
     <icon menu></icon>
-  </a>
+  </button>
 
   <ion-title>
     Basic List
diff --git a/demos/list/inset-list.html b/demos/list/inset-list.html
index 0aaf03e24d..dc56d52d6c 100644
--- a/demos/list/inset-list.html
+++ b/demos/list/inset-list.html
@@ -1,9 +1,9 @@
 
 <ion-navbar *navbar class="show-navbar">
 
-  <a menu-toggle="leftMenu">
+  <button menu-toggle="leftMenu">
     <icon menu></icon>
-  </a>
+  </button>
 
   <ion-title>
     Inset List
diff --git a/demos/list/list-headers.html b/demos/list/list-headers.html
index f0ca3edbd7..8d460c6be4 100644
--- a/demos/list/list-headers.html
+++ b/demos/list/list-headers.html
@@ -1,9 +1,9 @@
 
 <ion-navbar *navbar class="show-navbar">
 
-  <a menu-toggle="leftMenu">
+  <button menu-toggle="leftMenu">
     <icon menu></icon>
-  </a>
+  </button>
 
   <ion-title>
     List Headers
diff --git a/demos/list/no-lines-list.html b/demos/list/no-lines-list.html
index 734b743271..088124fac6 100644
--- a/demos/list/no-lines-list.html
+++ b/demos/list/no-lines-list.html
@@ -1,9 +1,9 @@
 
 <ion-navbar *navbar class="show-navbar">
 
-  <a menu-toggle="leftMenu">
+  <button menu-toggle="leftMenu">
     <icon menu></icon>
-  </a>
+  </button>
 
   <ion-title>
     No-lines List
diff --git a/demos/list/sliding-items.html b/demos/list/sliding-items.html
index 5158570b9a..8b7234cf80 100644
--- a/demos/list/sliding-items.html
+++ b/demos/list/sliding-items.html
@@ -1,9 +1,9 @@
 
 <ion-navbar *navbar class="show-navbar">
 
-  <a menu-toggle="leftMenu">
+  <button menu-toggle="leftMenu">
     <icon menu></icon>
-  </a>
+  </button>
 
   <ion-title>
     Sliding Items
diff --git a/ionic/components/menu/menu-toggle.ts b/ionic/components/menu/menu-toggle.ts
index 6f1fdb3e35..2bdfdfe4a6 100644
--- a/ionic/components/menu/menu-toggle.ts
+++ b/ionic/components/menu/menu-toggle.ts
@@ -34,6 +34,11 @@ export class MenuToggle extends Ion {
     this.app = app;
     this.viewCtrl = viewCtrl;
     this.withinNavbar = !!navbar;
+
+    // Deprecation warning
+    if (this.withinNavbar && elementRef.nativeElement.tagName === 'A') {
+      console.warn('Menu toggles within a navbar should use <button menu-toggle> instead of <a toggle>')
+    }
   }
 
   /**
diff --git a/ionic/components/menu/test/multiple/page1.html b/ionic/components/menu/test/multiple/page1.html
index a8e989f07c..d6cb252a13 100644
--- a/ionic/components/menu/test/multiple/page1.html
+++ b/ionic/components/menu/test/multiple/page1.html
@@ -1,8 +1,8 @@
 
 <ion-navbar *navbar>
-  <a [menu-toggle]="activeMenu">
+  <button [menu-toggle]="activeMenu">
     <icon menu></icon>
-  </a>
+  </button>
   <ion-title>
     Multiple Menus
   </ion-title>
diff --git a/ionic/components/navbar/navbar.ts b/ionic/components/navbar/navbar.ts
index 7145a01aa0..833c3fdfae 100644
--- a/ionic/components/navbar/navbar.ts
+++ b/ionic/components/navbar/navbar.ts
@@ -65,7 +65,7 @@ class ToolbarBackground {
   selector: 'ion-navbar',
   template:
     '<div class="toolbar-background"></div>' +
-    '<button class="back-button" [hidden]="hideBackButton">' +
+    '<button class="back-button bar-button bar-button-default" [hidden]="hideBackButton">' +
       '<icon class="back-button-icon" [name]="bbIcon"></icon>' +
       '<span class="back-button-text">' +
         '<span class="back-default">{{bbText}}</span>' +
diff --git a/ionic/components/text-input/label.ts b/ionic/components/text-input/label.ts
index 4ab39bfae4..507f69e3d7 100644
--- a/ionic/components/text-input/label.ts
+++ b/ionic/components/text-input/label.ts
@@ -79,6 +79,9 @@ export class Label {
     }
   }
 
+  /**
+   * @private
+   */
   addClass(className) {
     this.renderer.setElementClass(this.elementRef, className, true);
   }
diff --git a/ionic/components/toolbar/modes/ios.scss b/ionic/components/toolbar/modes/ios.scss
index 417c3e39af..b1ec74b9fa 100644
--- a/ionic/components/toolbar/modes/ios.scss
+++ b/ionic/components/toolbar/modes/ios.scss
@@ -85,8 +85,9 @@ ion-title {
       background-color: $color-value;
       border-color: darken($color-value, 10%);
     }
-
-    .toolbar-title {
+    
+    .toolbar-title,
+    .bar-button-default {
       color: inverse($color-value);
     }
   }
diff --git a/ionic/components/toolbar/toolbar.ts b/ionic/components/toolbar/toolbar.ts
index 21290614e4..f6cd4f608b 100644
--- a/ionic/components/toolbar/toolbar.ts
+++ b/ionic/components/toolbar/toolbar.ts
@@ -149,7 +149,7 @@ export class ToolbarTitle extends Ion {
  * @private
  */
 @Directive({
-  selector: 'ion-buttons,[menu-toggle]'
+  selector: 'ion-buttons,[menu-toggle],ion-nav-items'
 })
 export class ToolbarItem {
   constructor(
@@ -160,6 +160,23 @@ export class ToolbarItem {
     toolbar && toolbar.addItemRef(elementRef);
     navbar && navbar.addItemRef(elementRef);
     this.inToolbar = !!(toolbar || navbar);
+
+    // Deprecation warning
+    if (elementRef.nativeElement.tagName === 'ION-NAV-ITEMS') {
+
+      if (elementRef.nativeElement.hasAttribute('primary')) {
+        console.warn('<ion-nav-items primary> has been renamed to <ion-buttons start>, please update your HTML');
+        elementRef.nativeElement.setAttribute('start', '');
+
+      } else if (elementRef.nativeElement.hasAttribute('secondary')) {
+        console.warn('<ion-nav-items secondary> has been renamed to <ion-buttons end>, please update your HTML');
+        elementRef.nativeElement.setAttribute('end', '');
+
+      } else {
+        console.warn('<ion-nav-items> has been renamed to <ion-buttons>, please update your HTML');
+      }
+    }
+
   }
 
   @ContentChildren(Button)