diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index d4c47777cb..7450b43d89 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -4614,8 +4614,15 @@ input[type="range"] {
     padding-bottom: 2px; }
 
 .button-icon {
-  padding: 2px 4px;
+  padding: 0 6px;
+  min-width: initial;
+  background: none;
+  border: none;
   background: none; }
+  .button-icon:active, .button-icon.active {
+    background: none;
+    box-shadow: none;
+    text-shadow: 0px 0px 10px white; }
   .button-icon .icon {
     font-size: 32px; }
 
@@ -4648,14 +4655,6 @@ input[type="range"] {
       color: #fff;
       box-shadow: none; }
 
-.button-icon {
-  border: none;
-  background: none; }
-  .button-icon:active, .button-icon.active {
-    background: none;
-    box-shadow: none;
-    text-shadow: 0px 0px 10px white; }
-
 .padding > .button.button-block:first-child {
   margin-top: 0; }
 
diff --git a/scss/_button.scss b/scss/_button.scss
index a5c769e5e9..6d4b2eaaf0 100644
--- a/scss/_button.scss
+++ b/scss/_button.scss
@@ -126,8 +126,17 @@
 }
 
 .button-icon {
-  padding: 2px 4px;
+  padding: 0 6px;
+  min-width: initial;
   background: none;
+  border: none;
+  background: none;
+
+  &:active, &.active {
+    background: none;
+    box-shadow: none;
+    text-shadow: 0px 0px 10px #fff;
+  }
 
   .icon {
     font-size: $button-large-icon-size;
@@ -155,17 +164,6 @@
   box-shadow: none;
 }
 
-.button-icon {
-  border: none;
-  background: none;
-
-  &:active, &.active {
-    background: none;
-    box-shadow: none;
-    text-shadow: 0px 0px 10px #fff;
-  }
-}
-
 .padding > .button.button-block:first-child {
   margin-top: 0;
 }
diff --git a/test/buttons.html b/test/buttons.html
index e135c7caa8..829fbd39f1 100644
--- a/test/buttons.html
+++ b/test/buttons.html
@@ -191,6 +191,7 @@
         <h3>a.button-icon (Borderless, 32px)</h3>
         <p>
           <a class="button button-icon"><i class="icon ion-home"></i></a>
+          <a class="button button-clear button-dark">.button-clear Next .button-icon</i></a>
         </p>
 
         <hr>