diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
index 5d23cfc049..6f92128b67 100644
--- a/packages/core/package-lock.json
+++ b/packages/core/package-lock.json
@@ -3426,9 +3426,9 @@
       "dev": true
     },
     "ionicons": {
-      "version": "4.0.0-6",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-4.0.0-6.tgz",
-      "integrity": "sha512-GHJNBjHOrASVjJ6ajdt9TDqv5ZAD6GDCLNYWdC9uG35TiQ79ggfr7RbcVb/DrGk9mLXHbpVCaBaGAVJnnLNY3Q==",
+      "version": "4.0.0-7",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-4.0.0-7.tgz",
+      "integrity": "sha512-j7+DdZPdJ8FRUhLi6LAsiTieekpkQ+AbzfHZCVdMl9nUZJt7qXRC0Kqmb/zX7HCYTcgNek/4QLMiuZS+6UANAg==",
       "dev": true
     },
     "is-arrayish": {
diff --git a/packages/core/package.json b/packages/core/package.json
index 5b409019ab..dd40b29bd3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -15,7 +15,7 @@
     "@stencil/utils": "latest",
     "@types/jest": "^21.1.6",
     "chromedriver": "^2.33.2",
-    "ionicons": "^4.0.0-6",
+    "ionicons": "4.0.0-7",
     "jest": "^21.2.1",
     "mocha": "^4.0.1",
     "np": "^2.17.0",
diff --git a/packages/core/src/components/app/app.ios.scss b/packages/core/src/components/app/app.ios.scss
index c9976b1d19..2f29aaf2ed 100644
--- a/packages/core/src/components/app/app.ios.scss
+++ b/packages/core/src/components/app/app.ios.scss
@@ -10,3 +10,5 @@
   font-size: $font-size-ios-base;
   background-color: $background-ios-color;
 }
+
+@import "../icon/icon.ios";
diff --git a/packages/core/src/components/app/app.md.scss b/packages/core/src/components/app/app.md.scss
index c7da618932..497c4c616f 100644
--- a/packages/core/src/components/app/app.md.scss
+++ b/packages/core/src/components/app/app.md.scss
@@ -10,3 +10,5 @@
   font-size: $font-size-md-base;
   background-color: $background-md-color;
 }
+
+@import "../icon/icon.md";
diff --git a/packages/core/src/components/button/button-icon.scss b/packages/core/src/components/button/button-icon.scss
index af75d94945..e2bf8ab3aa 100644
--- a/packages/core/src/components/button/button-icon.scss
+++ b/packages/core/src/components/button/button-icon.scss
@@ -1,29 +1,25 @@
 @import "../../themes/ionic.globals";
-@import "../icon/icon";
 
 
 // Button Icons
 // --------------------------------------------------
 
 .button ion-icon {
+  width: 1.4em;
+  height: 1.4em;
+
   pointer-events: none;
 }
 
-ion-icon[slot="start"] {
-  @include button-icon();
-
-  @include padding-horizontal(null, .3em);
+.button ion-icon[slot="start"] {
+  margin: 0 0.3em 0 -0.3em;
 }
 
-ion-icon[slot="end"] {
-  @include button-icon();
-
-  @include padding-horizontal(.4em, null);
+.button ion-icon[slot="end"] {
+  margin: 0 -0.2em 0 0.3em;
 }
 
-ion-icon[slot="icon-only"] {
-  @include padding(0);
-
-  font-size: 1.8em;
-  line-height: .67;
+.button ion-icon[slot="icon-only"] {
+  width: 1.8em;
+  height: 1.8em;
 }
diff --git a/packages/core/src/components/button/button.ios.scss b/packages/core/src/components/button/button.ios.scss
index b5eef60af6..9015b30de6 100644
--- a/packages/core/src/components/button/button.ios.scss
+++ b/packages/core/src/components/button/button.ios.scss
@@ -1,6 +1,5 @@
 @import "../../themes/ionic.globals.ios";
 @import "./button";
-@import "../icon/icon.ios";
 
 
 // iOS Button
@@ -101,9 +100,6 @@ $button-ios-small-height:                           2.1em !default;
 /// @prop - Font size of the small button
 $button-ios-small-font-size:                        1.3rem !default;
 
-/// @prop - Font size of an icon in the small button
-$button-ios-small-icon-font-size:                   1.3em !default;
-
 
 // iOS Outline Button
 // --------------------------------------------------
@@ -254,10 +250,6 @@ $button-ios-strong-font-weight:                     600 !default;
   font-size: $button-ios-small-font-size;
 }
 
-.button-small-ios ion-icon[slot="icon-only"] {
-  font-size: $button-ios-small-icon-font-size;
-}
-
 // iOS Block Button
 // --------------------------------------------------
 
diff --git a/packages/core/src/components/button/button.md.scss b/packages/core/src/components/button/button.md.scss
index 02e4615b59..4d09b53c59 100644
--- a/packages/core/src/components/button/button.md.scss
+++ b/packages/core/src/components/button/button.md.scss
@@ -1,6 +1,5 @@
 @import "../../themes/ionic.globals.md";
 @import "./button";
-@import "../icon/icon.md";
 
 
 // Material Design Button
@@ -123,9 +122,6 @@ $button-md-small-height:                   2.1em !default;
 /// @prop - Font size of the small button
 $button-md-small-font-size:                1.3rem !default;
 
-/// @prop - Font size of an icon in the small button
-$button-md-small-icon-font-size:           1.4em !default;
-
 
 // Material Design Outline Button
 // --------------------------------------------------
@@ -313,10 +309,6 @@ $button-md-strong-font-weight:                  bold !default;
   font-size: $button-md-small-font-size;
 }
 
-.button-small-md ion-icon[slot="icon-only"] {
-  font-size: $button-md-small-icon-font-size;
-}
-
 // Material Design Block Button
 // --------------------------------------------------
 
diff --git a/packages/core/src/components/button/button.scss b/packages/core/src/components/button/button.scss
index 7789f9efa4..79eb88737b 100644
--- a/packages/core/src/components/button/button.scss
+++ b/packages/core/src/components/button/button.scss
@@ -33,6 +33,7 @@ $button-round-border-radius:      64px !default;
   text-decoration: none;
   text-overflow: ellipsis;
   text-transform: none;
+  line-height: 1;
 
   white-space: nowrap;
   cursor: pointer;
@@ -60,13 +61,9 @@ $button-round-border-radius:      64px !default;
 }
 
 
-[ion-button] {
-  text-decoration: none;
-}
-
 a[disabled],
 button[disabled],
-[ion-button][disabled] {
+.button[disabled] {
   cursor: default;
   opacity: .4;
 
diff --git a/packages/core/src/components/icon/icon.scss b/packages/core/src/components/icon/icon.scss
deleted file mode 100644
index 0c147f13b5..0000000000
--- a/packages/core/src/components/icon/icon.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-
-// Icon
-// --------------------------------------------------
-
-
-ion-icon {
-  display: inline-block;
-
-  font-size: 1.2em;
-}
-
-ion-icon[small],
-ion-icon[small][slot] {
-  min-height: 1.1em;
-
-  font-size: 1.1em;
-}
diff --git a/packages/core/src/components/icon/test/basic/index.html b/packages/core/src/components/icon/test/basic/index.html
index e5ea0f3bae..b26b96b603 100644
--- a/packages/core/src/components/icon/test/basic/index.html
+++ b/packages/core/src/components/icon/test/basic/index.html
@@ -17,63 +17,37 @@
 
       <ion-content text-center class="icon-demo">
         <ion-grid>
-            <ion-row>
+          <ion-row>
 
-            <ion-col><ion-icon name="ionic" color="primary"></ion-icon></ion-col>
-            <ion-col><ion-icon name="logo-angular"></ion-icon></ion-col>
-            <ion-col><ion-icon name="heart" color="danger"></ion-icon></ion-col>
-            <ion-col><ion-icon name="ionitron" color="primary"></ion-icon></ion-col>
+            <ion-col><ion-icon name="logo-ionic" color="primary"></ion-icon></ion-col>
+            <ion-col><ion-icon name="logo-ionitron" color="primary"></ion-icon></ion-col>
+            <ion-col><ion-icon name="heart" color="secondary"></ion-icon></ion-col>
+            <ion-col><ion-icon name="logo-angular" color="danger"></ion-icon></ion-col>
 
-            <ion-col><ion-icon name="happy" color="vibrant"></ion-icon></ion-col>
+            <ion-col><ion-icon name="happy"></ion-icon></ion-col>
             <ion-col><ion-icon name="people"></ion-icon></ion-col>
-            <ion-col><ion-icon name="person"></ion-icon></ion-col>
-            <ion-col><ion-icon name="contact"></ion-icon></ion-col>
-
-            <ion-col><ion-icon name="apps"></ion-icon></ion-col>
             <ion-col><ion-icon name="lock"></ion-icon></ion-col>
-            <ion-col><ion-icon name="key" color="bright"></ion-icon></ion-col>
-            <ion-col><ion-icon name="unlock"></ion-icon></ion-col>
-
-            <ion-col><ion-icon name="map" color="secondary"></ion-icon></ion-col>
-            <ion-col><ion-icon name="navigate"></ion-icon></ion-col>
-            <ion-col><ion-icon name="pin"></ion-icon></ion-col>
-            <ion-col><ion-icon name="locate"></ion-icon></ion-col>
-
-            <ion-col><ion-icon name="mic"></ion-icon></ion-col>
-            <ion-col><ion-icon name="musical-notes" color="vibrant"></ion-icon></ion-col>
-            <ion-col><ion-icon name="volume-up"></ion-icon></ion-col>
-            <ion-col><ion-icon name="microphone"></ion-icon></ion-col>
-
-            <ion-col><ion-icon name="cafe" color="bright"></ion-icon></ion-col>
-            <ion-col><ion-icon name="calculator"></ion-icon></ion-col>
-            <ion-col><ion-icon name="bus"></ion-icon></ion-col>
-            <ion-col><ion-icon name="wine" color="danger"></ion-icon></ion-col>
-
-            <ion-col><ion-icon name="camera"></ion-icon></ion-col>
-            <ion-col><ion-icon name="image" color="secondary"></ion-icon></ion-col>
-            <ion-col><ion-icon name="star" color="bright"></ion-icon></ion-col>
-            <ion-col><ion-icon name="pin"></ion-icon></ion-col>
-
-            <ion-col><ion-icon name="arrow-dropup-circle" color="vibrant"></ion-icon></ion-col>
-            <ion-col><ion-icon name="arrow-back"></ion-icon></ion-col>
-            <ion-col><ion-icon name="arrow-dropdown"></ion-icon></ion-col>
-            <ion-col><ion-icon name="arrow-forward"></ion-icon></ion-col>
-
-            <ion-col><ion-icon name="cloud"></ion-icon></ion-col>
-            <ion-col><ion-icon name="sunny" color="bright"></ion-icon></ion-col>
-            <ion-col><ion-icon name="umbrella"></ion-icon></ion-col>
-            <ion-col><ion-icon name="rainy" color="primary"></ion-icon></ion-col>
+            <ion-col><ion-icon name="key"></ion-icon></ion-col>
 
           </ion-row>
         </ion-grid>
+
+        <p>
+          inline styling
+          <ion-icon name="logo-ionic" style="display:inline-block; width: 1em;"></ion-icon>
+          icon.
+        </p>
+
+        <p>
+          Default
+          <ion-icon name="logo-ionic"></ion-icon>
+          inline.
+        </p>
+
       </ion-content>
     </ion-page>
 
     <style>
-      .icon-demo ion-icon {
-        font-size: 50px;
-      }
-
       .icon-demo ion-row {
         height: 100%;
         flex-wrap: wrap;
diff --git a/packages/core/src/components/toolbar/toolbar-button.scss b/packages/core/src/components/toolbar/toolbar-button.scss
index 51680db1ee..d88cc79044 100644
--- a/packages/core/src/components/toolbar/toolbar-button.scss
+++ b/packages/core/src/components/toolbar/toolbar-button.scss
@@ -61,18 +61,3 @@
 
   align-items: center;
 }
-
-// Button Icons
-// --------------------------------------------------
-
-ion-icon[slot="start"] {
-  @include button-icon();
-
-  @include padding-horizontal(null, .3em);
-}
-
-ion-icon[slot="end"] {
-  @include button-icon();
-
-  @include padding-horizontal(.4em, null);
-}
diff --git a/packages/core/src/themes/ionic.mixins.scss b/packages/core/src/themes/ionic.mixins.scss
index 1a3ee466fe..06fc03d5be 100644
--- a/packages/core/src/themes/ionic.mixins.scss
+++ b/packages/core/src/themes/ionic.mixins.scss
@@ -30,18 +30,6 @@
 }
 
 
-// Button Icons
-// --------------------------------------------------
-
-@mixin button-icon($font-size: 1.4em, $line-height: .67, $pointer-events: none, $margin: 0) {
-  font-size: $font-size;
-  line-height: $line-height;
-
-  pointer-events: $pointer-events;
-  margin: $margin;
-}
-
-
 // Check that the given map values are in ascending order
 // ---------------------------------------------------------------------------------