diff --git a/ionic.conf.js b/ionic.conf.js
index 7f56257825..8062afc518 100644
--- a/ionic.conf.js
+++ b/ionic.conf.js
@@ -21,7 +21,8 @@ module.exports = function(config) {
       'vendor/angular/1.2.0rc1/*',
       'ext/angular/src/**/*.js',
       'ext/angular/test/**/*.js',
-      'hacking/**/*.js'
+      'hacking/**/*.js',
+      'test/**/*.js'
     ],
 
 
diff --git a/scss/ionic/_bar.scss b/scss/ionic/_bar.scss
index c319a31053..b708f6eecb 100644
--- a/scss/ionic/_bar.scss
+++ b/scss/ionic/_bar.scss
@@ -44,51 +44,51 @@
   &.bar-primary {
     background-color: $bar-primary-bg;
     border-color: $bar-primary-border-color;
-    color: $gray-light;
+    color: $white;
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
   &.bar-info {
     background-color: $bar-info-bg;
     border-color: $bar-info-border-color;
-    color: $gray-light;
+    color: $white;
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
   &.bar-success {
     background-color: $bar-success-bg;
     border-color: $bar-success-border-color;
-    color: $gray-light;
+    color: $white;
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
   &.bar-warning {
     background-color: $bar-warning-bg;
     border-color: $bar-warning-border-color;
-    color: $gray-light;
+    color: $white;
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
   &.bar-danger {
     background-color: $bar-danger-bg;
     border-color: $bar-danger-border-color;
-    color: $gray-light;
+    color: $white;
 
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
   &.bar-dark {
     background-color: $bar-dark-bg;
     border-color: $bar-dark-border-color;
-    color: $gray-light;
+    color: $white;
 
     .tab-item a {
-      color: $gray-light;
+      color: $white;
     }
   }
 
@@ -170,33 +170,33 @@
 
 .bar-primary {
   .button {
-    @include button-style($button-primary-bg, $button-primary-border, $gray-light);
+    @include button-style($button-primary-bg, $button-primary-border, $white);
   }
 }
 .bar-info {
   .button {
-    @include button-style($button-info-bg, $button-info-border, $gray-light);
+    @include button-style($button-info-bg, $button-info-border, $white);
   }
 }
 .bar-success {
   .button {
-    @include button-style($button-success-bg, $button-success-border, $gray-light);
+    @include button-style($button-success-bg, $button-success-border, $white);
   }
 }
 .bar-warning {
   .button {
-    @include button-style($button-warning-bg, $button-warning-border, $gray-light);
+    @include button-style($button-warning-bg, $button-warning-border, $white);
   }
 }
 .bar-danger {
   .button {
-    @include button-style($button-danger-bg, $buttonDangerBorder, $gray-light);
+    @include button-style($button-danger-bg, $buttonDangerBorder, $white);
   }
 }
 .bar-dark {
   // A default style for buttons
   .button {
-    @include button-style($button-dark-bg, $button-dark-border, $gray-light);
+    @include button-style($button-dark-bg, $button-dark-border, $white);
   }
 }
 
@@ -235,4 +235,4 @@
 
 .has-footer {
   bottom: $bar-height;
-}
\ No newline at end of file
+}
diff --git a/scss/ionic/_button.scss b/scss/ionic/_button.scss
index 711f571847..2b1be777fb 100644
--- a/scss/ionic/_button.scss
+++ b/scss/ionic/_button.scss
@@ -31,22 +31,22 @@
     @include button-style($button-secondary-bg, $button-secondary-border, $gray-dark);
   }
   &.button-primary {
-    @include button-style($button-primary-bg, $button-primary-border, $gray-light);
+    @include button-style($button-primary-bg, $button-primary-border, $white);
   }
   &.button-info {
-    @include button-style($button-info-bg, $button-info-border, $gray-light);
+    @include button-style($button-info-bg, $button-info-border, $white);
   }
   &.button-success {
-    @include button-style($button-success-bg, $button-success-border, $gray-light);
+    @include button-style($button-success-bg, $button-success-border, $white);
   }
   &.button-warning {
-    @include button-style($button-warning-bg, $button-warning-border, $gray-light);
+    @include button-style($button-warning-bg, $button-warning-border, $white);
   }
   &.button-danger {
-    @include button-style($button-danger-bg, $buttonDangerBorder, $gray-light);
+    @include button-style($button-danger-bg, $buttonDangerBorder, $white);
   }
   &.button-dark {
-    @include button-style($button-dark-bg, $button-dark-border, $gray-light);
+    @include button-style($button-dark-bg, $button-dark-border, $white);
   }
 
   &.button-clear {
@@ -54,6 +54,16 @@
     border: none;
     padding: $button-clear-padding;
   }
+
+  &.button-icon {
+    background: none;
+    border: none;
+    &:active, &.active {
+      text-shadow: 0px 0px 10px #fff;
+      box-shadow: none;
+      background: none;
+    }
+  }
 }
 
 a.button {
diff --git a/test/views/bar.js b/test/views/bar.js
new file mode 100644
index 0000000000..f5bc239784
--- /dev/null
+++ b/test/views/bar.js
@@ -0,0 +1,10 @@
+describe('Bar view', function() {
+
+  beforeEach(function() {
+
+  });
+  
+  it('Should initialize', function() {
+
+  });
+});
\ No newline at end of file