diff --git a/src/lib/button/_button-base.scss b/src/lib/button/_button-base.scss
index 33e3cd162b60..52f0d691f2d4 100644
--- a/src/lib/button/_button-base.scss
+++ b/src/lib/button/_button-base.scss
@@ -104,12 +104,16 @@ $md-mini-fab-padding: 8px !default;
 @mixin md-fab($size, $padding) {
   @extend %md-raised-button;
 
+  // Reset the min-width from the button base.
   min-width: 0;
+
   border-radius: $md-fab-border-radius;
   width: $size;
   height: $size;
   padding: 0;
 
+  flex-shrink: 0;
+
   i, md-icon {
     padding: $padding 0;
     line-height: $md-icon-button-line-height;
diff --git a/src/lib/button/button.scss b/src/lib/button/button.scss
index 92f3278ef83f..42edbd920df0 100644
--- a/src/lib/button/button.scss
+++ b/src/lib/button/button.scss
@@ -33,23 +33,26 @@
 }
 
 [md-icon-button] {
-  min-width: 0;
   padding: 0;
 
+  // Reset the min-width from the button base.
+  min-width: 0;
+
   width: $md-icon-button-size;
   height: $md-icon-button-size;
 
-  line-height: $md-icon-button-line-height;
+  flex-shrink: 0;
+
+  line-height: $md-icon-button-size;
   border-radius: $md-icon-button-border-radius;
 
-  .md-button-wrapper > * {
+  i, md-icon {
     line-height: $md-icon-button-line-height;
-    vertical-align: middle;
   }
 }
 
 // The text and icon should be vertical aligned inside a button
-[md-button], [md-raised-button] {
+[md-button], [md-raised-button], [md-icon-button] {
   .md-button-wrapper > * {
     vertical-align: middle;
   }