diff --git a/ionic/components/action-menu/action-menu.scss b/ionic/components/action-menu/action-menu.scss
index e92b5ebc84..93e9bff4f3 100644
--- a/ionic/components/action-menu/action-menu.scss
+++ b/ionic/components/action-menu/action-menu.scss
@@ -58,7 +58,8 @@ $action-menu-options-border-color:      #d1d3d6 !default;
   z-index: $z-index-action-menu;
   overflow: hidden;
 
-  .button {
+  button,
+  [button] {
     display: block;
     padding: 1px;
     width: 100%;
@@ -80,7 +81,8 @@ $action-menu-options-border-color:      #d1d3d6 !default;
     }
   }
 
-  .button.active, .button.activated {
+  button.activated,
+  [button].activated {
     box-shadow: none;
     border-color: $action-menu-options-border-color;
     color: $action-menu-options-text-color;
@@ -106,10 +108,12 @@ $action-menu-options-border-color:      #d1d3d6 !default;
   background-color: #fff;
   overflow: hidden;
 
-  .button {
+  button,
+  [button] {
     border-width: 1px 0px 0px 0px;
   }
-  .button:first-child:last-child {
+  button:first-child:last-child,
+  [button]:first-child:last-child {
     border-width: 0;
   }
 }
@@ -119,7 +123,8 @@ $action-menu-options-border-color:      #d1d3d6 !default;
 }
 
 .action-menu-cancel {
-  .button {
+  button,
+  [button] {
     font-weight: 500;
   }
 }
diff --git a/ionic/components/action-menu/extensions/material.scss b/ionic/components/action-menu/extensions/material.scss
index 5949b684ce..2fa9b0352e 100644
--- a/ionic/components/action-menu/extensions/material.scss
+++ b/ionic/components/action-menu/extensions/material.scss
@@ -1,5 +1,5 @@
 
-.platform-android {
+.action-menu-md {
 
   .action-menu-backdrop.active {
     background-color: rgba(0,0,0,0.2);
@@ -9,7 +9,8 @@
     margin: 0;
 
     .action-menu-title,
-    .button {
+    button,
+    [button] {
       text-align: left;
       border-color: transparent;
       font-size: 16px;
@@ -22,8 +23,8 @@
       color: #666;
     }
 
-    .button.active,
-    .button.activated {
+    button.activated,
+    [button].activated {
       background: #e8e8e8;
     }
   }
@@ -40,7 +41,8 @@
 
   .action-menu-has-icons {
 
-    .button {
+    button,
+    [button] {
       padding-left: 56px;
     }
 
diff --git a/ionic/components/alert/extensions/ios.scss b/ionic/components/alert/extensions/ios.scss
index a9112976bc..8279f8d47f 100644
--- a/ionic/components/alert/extensions/ios.scss
+++ b/ionic/components/alert/extensions/ios.scss
@@ -35,7 +35,8 @@ $alert-ios-button-font-size:         2rem !default;
   .alert-actions {
     min-height: 44px;
 
-    .button {
+    button,
+    [button] {
       flex: 1;
       border: 0;
       background: transparent;
diff --git a/ionic/components/alert/extensions/material.scss b/ionic/components/alert/extensions/material.scss
index b8142f32a2..e6c81cb3c5 100644
--- a/ionic/components/alert/extensions/material.scss
+++ b/ionic/components/alert/extensions/material.scss
@@ -33,7 +33,8 @@ $alert-material-box-shadow:               0px 27px 24px 0 rgba(0, 0, 0, 0.2) !de
     background: $alert-material-background-color;
     margin: $alert-material-content-margin;
 
-    .button {
+    button,
+    [button] {
       border: 0;
     }
   }
diff --git a/ionic/components/app/test/snapcat/main.html b/ionic/components/app/test/snapcat/main.html
index b04b8dbec9..e29edd46ee 100644
--- a/ionic/components/app/test/snapcat/main.html
+++ b/ionic/components/app/test/snapcat/main.html
@@ -85,7 +85,7 @@
   ion-toolbar {
     letter-spacing: 1px;
   }
-  .platform-ios ion-toolbar .button i {
+  .platform-ios ion-toolbar button i {
     color: #fff !important;
     font-size: 24px !important;
   }
@@ -122,13 +122,13 @@
     font-size: 18px;
   }
 
-  heart-modal .button-icon {
+  heart-modal icon {
     position: absolute;
     top: 13px;
     left: 0px;
   }
 
-  heart-modal .button-icon i {
+  heart-modal icon i {
     font-size: 18px;
     color: #fff;
   }
diff --git a/ionic/components/app/util.scss b/ionic/components/app/util.scss
index 4037c59871..2fa8d0e6ab 100644
--- a/ionic/components/app/util.scss
+++ b/ionic/components/app/util.scss
@@ -63,7 +63,8 @@ $content-padding:    10px !default;
     outline: thin dotted;
   }
 
-  .button:focus {
+  button:focus,
+  [button]:focus {
     outline-offset: -2px;
     outline: 2px solid red;
   }
diff --git a/ionic/components/nav-bar/extensions/ios.scss b/ionic/components/nav-bar/extensions/ios.scss
index 35b0cf5c61..d92198dd30 100644
--- a/ionic/components/nav-bar/extensions/ios.scss
+++ b/ionic/components/nav-bar/extensions/ios.scss
@@ -57,7 +57,8 @@ $navbar-ios-button-background-color:       transparent !default;
     overflow: inherit;
   }
 
-  .button {
+  button,
+  [button] {
     font-size: $navbar-ios-button-font-size;
     color: $navbar-ios-button-text-color;
     border: none;
@@ -68,7 +69,7 @@ $navbar-ios-button-background-color:       transparent !default;
     background: $navbar-ios-button-background-color;
   }
 
-  .button-icon {
+  [icon] {
     font-size: 2.5rem;
   }
 
diff --git a/ionic/components/nav-bar/extensions/material.scss b/ionic/components/nav-bar/extensions/material.scss
index 72b591e4cd..3986ed42e2 100644
--- a/ionic/components/nav-bar/extensions/material.scss
+++ b/ionic/components/nav-bar/extensions/material.scss
@@ -18,7 +18,8 @@ $navbar-material-button-text-color:       #007aff !default;
     font-size: $navbar-material-title-font-size;
   }
 
-  .button {
+  button,
+  [button] {
     font-size: $navbar-material-button-font-size;
     color: $navbar-material-button-text-color;
     border: none;
diff --git a/ionic/components/nav-bar/nav-bar.scss b/ionic/components/nav-bar/nav-bar.scss
index 9ad65d54ff..4aec6bc4fc 100644
--- a/ionic/components/nav-bar/nav-bar.scss
+++ b/ionic/components/nav-bar/nav-bar.scss
@@ -82,7 +82,8 @@ ion-title {
   order: map-get($navbar-order, 'secondary');
 }
 
-.navbar .button {
+.navbar button,
+.navbar [button] {
   background: transparent;
   border: none;
 }
diff --git a/ionic/components/segment/extensions/ios.scss b/ionic/components/segment/extensions/ios.scss
index 37725b009a..88a3ac7afb 100644
--- a/ionic/components/segment/extensions/ios.scss
+++ b/ionic/components/segment/extensions/ios.scss
@@ -2,7 +2,8 @@
 
   .ion-segment {
 
-    > .button {
+    > button,
+    > [button] {
       border-width: 1px;
 
       transition: 100ms all linear;
diff --git a/ionic/components/segment/segment.scss b/ionic/components/segment/segment.scss
index a987424e9c..7b9b2089d9 100644
--- a/ionic/components/segment/segment.scss
+++ b/ionic/components/segment/segment.scss
@@ -5,7 +5,8 @@ ion-segment { display: block; }
   flex: 1;
   width: 100%;
 
-  > .button {
+  > button,
+  > [button] {
 
     flex: 1;
     display: block;
diff --git a/ionic/components/toolbar/extensions/ios.scss b/ionic/components/toolbar/extensions/ios.scss
index 47d20f90dd..dc14015d18 100644
--- a/ionic/components/toolbar/extensions/ios.scss
+++ b/ionic/components/toolbar/extensions/ios.scss
@@ -50,7 +50,8 @@ $toolbar-ios-button-background-color:       transparent !default;
     font-weight: 500;
   }
 
-  .button {
+  button,
+  [button] {
     font-size: $toolbar-ios-button-font-size;
     color: $toolbar-ios-button-text-color;
     border: none;
diff --git a/ionic/components/toolbar/toolbar.scss b/ionic/components/toolbar/toolbar.scss
index 86c975a585..ec00d504c6 100644
--- a/ionic/components/toolbar/toolbar.scss
+++ b/ionic/components/toolbar/toolbar.scss
@@ -50,7 +50,8 @@ ion-toolbar ion-title {
   text-overflow: ellipsis;
 }
 
-.toolbar .button {
+.toolbar button,
+.toolbar [button] {
   background: transparent;
   border: none;
 }