diff --git a/src/components/button/button.scss b/src/components/button/button.scss
index cc8cf9ce0f..8b72084499 100644
--- a/src/components/button/button.scss
+++ b/src/components/button/button.scss
@@ -17,6 +17,7 @@ $button-round-border-radius:      64px !default;
 .button {
   @include text-align(center);
   @include appearance(none);
+  border: 0;
 
   position: relative;
   z-index: 0;
diff --git a/src/components/button/button.ts b/src/components/button/button.ts
index 05b0d0f224..5b3d17d5ba 100644
--- a/src/components/button/button.ts
+++ b/src/components/button/button.ts
@@ -72,76 +72,80 @@ type CssClassObject = { [className: string]: boolean };
 export class Button {
 
   /**
-   * @input {boolean} If true, activates the large button size.
+   * @Prop {boolean} If true, activates the large button size.
    * Type: size
    */
   @Prop() large: boolean = false;
 
   /**
-   * @input {boolean} If true, activates the small button size.
+   * @Prop {boolean} If true, activates the small button size.
    * Type: size
    */
   @Prop() small: boolean = false;
 
   /**
-   * @input {boolean} If true, activates the default button size. Normally the default, useful for buttons in an item.
+   * @Prop {boolean} If true, activates the default button size. Normally the default, useful for buttons in an item.
    * Type: size
    */
   @Prop() default: boolean = false;
 
-  @Prop() disabled: boolean = false;
   /**
-   * @input {boolean} If true, activates a transparent button style with a border.
+   * @Prop {boolean} If true, sets the button into a disabled state.
+   */
+  @Prop() disabled: boolean = false;
+
+  /**
+   * @Prop {boolean} If true, activates a transparent button style with a border.
    * Type: style
    */
   @Prop() outline: boolean = false;
 
   /**
-   * @input {boolean} If true, activates a transparent button style without a border.
+   * @Prop {boolean} If true, activates a transparent button style without a border.
    * Type: style
    */
   @Prop() clear: boolean = false;
 
   /**
-   * @input {boolean} If true, activates a solid button style. Normally the default, useful for buttons in a toolbar.
+   * @Prop {boolean} If true, activates a solid button style. Normally the default, useful for buttons in a toolbar.
    * Type: style
    */
   @Prop() solid: boolean = false;
 
   /**
-   * @input {boolean} If true, activates a button with rounded corners.
+   * @Prop {boolean} If true, activates a button with rounded corners.
    * Type: shape
    */
   @Prop() round: boolean = false;
 
   /**
-   * @input {boolean} If true, activates a button style that fills the available width.
+   * @Prop {boolean} If true, activates a button style that fills the available width.
    * Type: display
    */
   @Prop() block: boolean = false;
 
   /**
-   * @input {boolean} If true, activates a button style that fills the available width without
+   * @Prop {boolean} If true, activates a button style that fills the available width without
    * a left and right border.
    * Type: display
    */
   @Prop() full: boolean = false;
 
   /**
-   * @input {boolean} If true, activates a button with a heavier font weight.
+   * @Prop {boolean} If true, activates a button with a heavier font weight.
    * Type: decorator
    */
   @Prop() strong: boolean = false;
 
   /**
-   * @input {string} The mode determines which platform styles to use.
+   * @Prop {string} The mode determines which platform styles to use.
    * Possible values are: `"ios"`, `"md"`, or `"wp"`.
    * For more information, see [Platform Styles](/docs/theming/platform-specific-styles).
    */
   @Prop() mode: 'ios' | 'md' | 'wp';
 
   /**
-   * @input {string} The color to use from your Sass `$colors` map.
+   * @Prop {string} The color to use from your Sass `$colors` map.
    * Default options are: `"primary"`, `"secondary"`, `"danger"`, `"light"`, and `"dark"`.
    * For more information, see [Theming your App](/docs/theming/theming-your-app).
    */
@@ -194,19 +198,32 @@ export class Button {
     return `${className}-${mode}-${color}`;
   }
 
+  getStyleClassList(role: string): string[] {
+    if (!this.color) {
+      return [];
+    }
+
+    var classList = [].concat(
+      this.outline ? this.getColorClassList(this.color, role, 'outline', this.mode) : [],
+      this.clear ? this.getColorClassList(this.color, role, 'clear', this.mode) : [],
+      this.solid ? this.getColorClassList(this.color, role, 'solid', this.mode) : []
+    );
+
+    if (classList.length === 0) {
+      classList = [this.getColorClassList(this.color, role, 'default', this.mode)];
+    }
+
+    return classList;
+  }
+
   render() {
     var role = 'button';
+
     var size =
       (this.large ? 'large' : null) ||
       (this.small ? 'small' : null) ||
       (this.default ? 'default' : null);
 
-    var style =
-      (this.outline ? 'outline' : null) ||
-      (this.clear ? 'clear' : null) ||
-      (this.solid ? 'solid' : null) ||
-      'default';
-
     var shape = (this.round ? 'round' : null);
 
     var display =
@@ -216,21 +233,19 @@ export class Button {
     var decorator = (this.strong ? 'strong' : null);
 
     var buttonClasses: CssClassObject = []
-     .concat(
+      .concat(
         this.getElementClassList(role, this.mode),
         this.getClassList(role, shape, this.mode),
         this.getClassList(role, display, this.mode),
         this.getClassList(role, size, this.mode),
         this.getClassList(role, decorator, this.mode),
-        this.getColorClassList(this.color, role, style, this.mode)
+        this.getStyleClassList(role)
       )
       .reduce((prevValue, cssClass) => {
         prevValue[cssClass] = true;
         return prevValue;
       }, {});
 
-    console.log(this.disabled);
-
     return h(this,
       h('button', {
         class: buttonClasses,
diff --git a/src/components/button/test/basic/pages/page-one/page-one.html b/src/components/button/test/basic/pages/page-one/page-one.html
index d9b0aad26c..20a90cad6d 100644
--- a/src/components/button/test/basic/pages/page-one/page-one.html
+++ b/src/components/button/test/basic/pages/page-one/page-one.html
@@ -8,7 +8,6 @@
 
 
 <ion-content padding style="text-align:center" no-bounce>
-<!--
   <p>
     <ion-button (click)="test($event)">Default</ion-button>
     <ion-button (click)="test($event)" class="activated">Default.activated</ion-button>
@@ -38,15 +37,12 @@
     <ion-button color="dark">Dark</ion-button>
     <ion-button color="dark" class="activated">Dark.activated</ion-button>
   </p>
--->
   <p>
     <ion-button disabled large clear>Button Disabled</ion-button>
     <ion-button color="secondary" disabled>Secondary Disabled</ion-button>
   </p>
-<!--
   <p>
     <ion-button [color]="btnColor" (click)="chgColor()">Change Color</ion-button>
     <ion-button outline [color]="btnColor" (click)="chgColor()">Change Color</ion-button>
   </p>
--->
 </ion-content>
diff --git a/src/components/button/test/block/pages/page-one/page-one.html b/src/components/button/test/block/pages/page-one/page-one.html
index 772dce908b..a71758ba22 100644
--- a/src/components/button/test/block/pages/page-one/page-one.html
+++ b/src/components/button/test/block/pages/page-one/page-one.html
@@ -10,32 +10,26 @@
 <ion-content padding style="text-align:center">
 
   <p>
-    <a ion-button block href="#">a[ion-button][block]</a>
     <ion-button block>button[ion-button][block]</ion-button>
   </p>
 
   <p>
-    <a ion-button block href="#" icon-left><ion-icon name="help-circle"></ion-icon> a[ion-button][block] icon</a>
     <ion-button block icon-left><ion-icon name="help-circle"></ion-icon> button[ion-button][block] icon</ion-button>
   </p>
 
   <p>
-    <a ion-button block outline color="secondary" href="#">a[ion-button][block][outline][secondary]</a>
     <ion-button block outline color="secondary">button[ion-button][block][outline][secondary]</ion-button>
   </p>
 
   <p>
-    <a ion-button block clear color="dark" href="#">a[ion-button][block][clear][dark]</a>
     <ion-button block clear color="dark">button[ion-button][clear][block][dark]</ion-button>
   </p>
 
   <p>
-    <a ion-button block round href="#">a[ion-button][block][round]</a>
     <ion-button block round>button[ion-button][block][round]</ion-button>
   </p>
 
   <p>
-    <a ion-button block round outline href="#">a[ion-button][block][round][outline]</a>
     <ion-button block round outline>button[ion-button][block][round][outline]</ion-button>
   </p>