diff --git a/src/components/icon/icon.scss b/src/components/icon/icon.scss
index 73cb07a364d..b0efd1361ad 100644
--- a/src/components/icon/icon.scss
+++ b/src/components/icon/icon.scss
@@ -1,15 +1,21 @@
+$icon-size: 2.8rem;
+
 md-icon {
   margin: auto;
   background-repeat: no-repeat no-repeat;
   display: inline-block;
   vertical-align: middle;
-  fill: currentcolor;
-  height: 3 * $baseline-grid;
-  width: 3 * $baseline-grid;
+  fill: currentColor;
+  height: $icon-size;
+  width: $icon-size;
 
   svg {
     pointer-events: none;
   }
+
+  &[md-font-icon] {
+    line-height: 1;
+  }
 }
 
 //