diff --git a/screenshots/demo_page__index.screenshot.png b/screenshots/demo_page__index.screenshot.png
index 8d255a9f617b..576ca4a5d386 100644
Binary files a/screenshots/demo_page__index.screenshot.png and b/screenshots/demo_page__index.screenshot.png differ
diff --git a/screenshots/initial state.screenshot.png b/screenshots/initial state.screenshot.png
index 8d255a9f617b..576ca4a5d386 100644
Binary files a/screenshots/initial state.screenshot.png and b/screenshots/initial state.screenshot.png differ
diff --git a/src/components/button/_button-base.scss b/src/components/button/_button-base.scss
index 8c15c0f211bf..5178184e6840 100644
--- a/src/components/button/_button-base.scss
+++ b/src/components/button/_button-base.scss
@@ -13,11 +13,6 @@ $md-button-margin: 0 !default;
 $md-button-line-height: 36px !default;
 $md-button-border-radius: 3px !default;
 
-// Icon Button standards
-$md-icon-button-size: 40px !default;
-$md-icon-button-border-radius: 50px !default;
-$md-icon-button-line-height: 24px !default;
-
 // Fab standards
 $md-fab-border-radius: 50% !default;
 $md-fab-size: 56px !default;
@@ -26,6 +21,12 @@ $md-fab-padding: 16px !default;
 $md-mini-fab-size: 40px !default;
 $md-mini-fab-padding: 8px !default;
 
+// Icon Button standards
+$md-icon-button-size: 40px !default;
+$md-icon-button-border-radius: 50%;
+$md-icon-button-line-height: 24px !default;
+
+
 // Applies base styles to all button types.
 %md-button-base {
   @include md-button-theme('color');