diff --git a/js/ext/angular/test/viewState.html b/js/ext/angular/test/viewState.html
index e805ab5de8..d83ae8eb5f 100644
--- a/js/ext/angular/test/viewState.html
+++ b/js/ext/angular/test/viewState.html
@@ -21,12 +21,13 @@
       <nav-bar animation="nav-title-slide-ios7" 
                type="bar-positive" 
                back-button-type="button-icon" 
+               back-button-label=" Back"
                back-button-icon="ion-arrow-left-c"></nav-bar>
       <nav-view animation="slide-left-right"></nav-view>
     </div>
 
     <script id="sign-in.html" type="text/ng-template">
-      <view title="'Sign-In'">
+      <view title="'Sign-In'" left-buttons="leftButtons" right-buttons="rightButtons">
         <content has-header="true">
           <div class="list">
             <label class="item item-input">
@@ -312,6 +313,18 @@
         $scope.signIn = function(user) {
           $state.go('tabs.autolist');
         };
+
+        $scope.leftButtons = [{ 
+          type: 'button-icon icon ion-home',
+          content: 'Home',
+          tap: function(e) { }
+        }];
+
+        $scope.rightButtons = [{ 
+          type: 'button-icon icon ion-navicon',
+          tap: function(e) { }
+        }];
+
       })
 
       .controller('ForgotPasswordCtrl', function($ionicViewService, $rootScope, $scope, $state) {
diff --git a/test/headers.html b/test/headers.html
index 92c3697ec0..02b7b9f158 100644
--- a/test/headers.html
+++ b/test/headers.html
@@ -21,13 +21,11 @@
       <header class="bar bar-header">
         <a class="button" href="index.html">Back</a>
         <h1 class="title">Really really really really really really really really long title!</h1>
-        <a class="button"><i class="icon ion-home"></i> Home</a>
+        <a class="button icon ion-home"> Home</a>
       </header>
 
       <div class="bar bar-header-subheader">
-        <a class="button">
-          <i class="icon ion-navicon"></i> Home
-        </a>
+        <a class="button icon ion-navicon"> Home</a>
         <div class="button-bar">
           <a class="button">First</a>
           <a class="button">Second</a>
@@ -39,9 +37,19 @@
       </div>
 
       <header class="bar bar-header bar-positive">
+        <a class="button icon ion-navicon"> Home</a>
+        <div class="button-bar">
+          <a class="button button-calm">First</a>
+          <a class="button">Second</a>
+          <a class="button">Third</a>
+        </div>
         <a class="button">
-          <i class="icon ion-navicon"></i> Home
+          <i class="icon ion-star"></i> Favorites
         </a>
+      </header>
+
+      <header class="bar bar-header bar-positive">
+        <a class="button button-clear icon ion-ios7-arrow-left"> Back</a>
         <div class="button-bar">
           <a class="button button-calm">First</a>
           <a class="button">Second</a>
@@ -53,9 +61,7 @@
       </header>
 
       <div class="bar bar-header bar-calm">
-        <a class="button button-icon">
-          <i class="icon ion-home"></i>
-        </a>
+        <a class="button button-icon icon ion-home"></a>
         <div class="button-bar">
           <a href="#" class="button button-clear">Edit</a>
           <a href="#" class="button button-clear">Teach</a>
@@ -67,9 +73,7 @@
       </div>
 
       <header class="bar bar-dark">
-        <a class="button">
-          <i class="icon ion-home"></i>
-        </a>
+        <a class="button icon ion-home"></a>
         <div class="button-bar">
           <a class="button">First</a>
           <a class="button">Second</a>
@@ -81,9 +85,7 @@
       </header>
 
       <header class="bar bar-positive">
-        <a class="button">
-          <i class="icon ion-home"></i>
-        </a>
+        <a class="button icon ion-home"></a>
         <div class="button-bar">
           <a class="button">First</a>
           <a class="button">Second</a>
@@ -95,9 +97,7 @@
       </header>
 
       <header class="bar bar-calm">
-        <a class="button">
-          <i class="icon ion-home"></i>
-        </a>
+        <a class="button icon ion-home"></a>
         <div class="button-bar">
           <a class="button">First</a>
           <a class="button">Second</a>
@@ -109,9 +109,7 @@
       </header>
 
       <header class="bar bar-assertive">
-        <a class="button">
-          <i class="icon ion-home"></i>
-        </a>
+        <a class="button icon ion-home"></a>
         <div class="button-bar">
           <a class="button">First</a>
           <a class="button">Second</a>
@@ -123,9 +121,7 @@
       </header>
 
       <header class="bar bar-balanced">
-        <a class="button">
-          <i class="icon ion-home"></i>
-        </a>
+        <a class="button icon ion-home"></a>
         <div class="button-bar">
           <a class="button">First</a>
           <a class="button">Second</a>
@@ -137,9 +133,7 @@
       </header>
 
       <header class="bar bar-energized">
-        <a class="button">
-          <i class="icon ion-home"></i>
-        </a>
+        <a class="button icon ion-home"></a>
         <div class="button-bar">
           <a class="button">First</a>
           <a class="button">Second</a>
@@ -151,9 +145,7 @@
       </header>
 
       <header class="bar bar-royal">
-        <a class="button">
-          <i class="icon ion-home"></i>
-        </a>
+        <a class="button icon ion-home"></a>
         <div class="button-bar">
           <a class="button">First</a>
           <a class="button">Second</a>
@@ -165,9 +157,7 @@
       </header>
 
       <header class="bar bar-light">
-        <a class="button">
-          <i class="icon ion-home"></i>
-        </a>
+        <a class="button icon ion-home"></a>
         <div class="button-bar">
           <a class="button">First</a>
           <a class="button">Second</a>
@@ -179,9 +169,7 @@
       </header>
 
       <header class="bar bar-light">
-        <a class="button">
-          <i class="icon ion-arrow-left-c"></i>
-        </a>
+        <a class="button icon ion-arrow-left-c"></a>
         <div class="button-bar">
           <a class="button">First</a>
           <a class="button">Second</a>
@@ -193,9 +181,7 @@
       </header>
 
       <header class="bar bar-assertive">
-        <a class="button button-icon">
-          <i class="icon ion-arrow-left-c"></i>
-        </a>
+        <a class="button button-icon icon ion-arrow-left-c"></a>
         <div class="button-bar">
           <a class="button">First</a>
           <a class="button">Second</a>