diff --git a/src/components/button/_button-base.scss b/src/components/button/_button-base.scss
index d15636afb44..cc989e29e72 100644
--- a/src/components/button/_button-base.scss
+++ b/src/components/button/_button-base.scss
@@ -51,7 +51,7 @@ $md-mini-fab-padding: 8px !default;
   font-size: $md-body-font-size-base;
   font-family: $md-font-family;
   font-weight: 500;
-  color: md-color($md-foreground, text);
+  color: currentColor;
 
   // Sizing.
   margin: $md-button-margin;
@@ -69,7 +69,7 @@ $md-mini-fab-padding: 8px !default;
 %md-raised-button {
   @extend %md-button-base;
 
-  @include md-elevation(1);
+  @include md-elevation(2);
   @include md-button-theme('color', default-contrast);
   @include md-button-theme('background-color');
 
@@ -82,7 +82,7 @@ $md-mini-fab-padding: 8px !default;
               md-elevation-transition-property-value();
 
   &:active {
-    @include md-elevation(2);
+    @include md-elevation(8);
   }
 
   &.md-button-focus {
@@ -102,9 +102,14 @@ $md-mini-fab-padding: 8px !default;
   min-width: 0;
   border-radius: $md-fab-border-radius;
   background-color: md-color($md-accent);
+  color: md-color($md-accent, default-contrast);
   width: $size;
   height: $size;
-  padding: $padding;
+  padding: 0;
+
+  i {
+    padding: $padding 0;
+  }
 
   &.md-button-focus {
     background-color: md-color($md-accent, 600);
diff --git a/src/demo-app/button/button-demo.scss b/src/demo-app/button/button-demo.scss
index 8e826dc48cc..9cb6349e0ef 100644
--- a/src/demo-app/button/button-demo.scss
+++ b/src/demo-app/button/button-demo.scss
@@ -6,6 +6,8 @@
   }
 
   section {
+    display: flex;
+    align-items: center;
     background-color: #f7f7f7;
     margin: 8px;
   }
diff --git a/src/demo-app/demo-app.scss b/src/demo-app/demo-app.scss
index 5b1850a9ada..bf3e1f9263a 100644
--- a/src/demo-app/demo-app.scss
+++ b/src/demo-app/demo-app.scss
@@ -34,10 +34,6 @@
       justify-content: space-between;
       width: 100%;
     }
-
-    button {
-      color: white;
-    }
   }
 
   h1 {