diff --git a/ionic/components/icon/icon.ts b/ionic/components/icon/icon.ts
index 3e521ce69f..214a9ee45a 100644
--- a/ionic/components/icon/icon.ts
+++ b/ionic/components/icon/icon.ts
@@ -27,7 +27,7 @@ import {Config} from '../../config/config';
  *
  * <!-- always use the same icon, no matter what the mode -->
  * <ion-icon name="ios-clock"></ion-icon>
- * <ion-icon name="twitter-logo"></ion-icon>
+ * <ion-icon name="logo-twitter"></ion-icon>
  * ```
  *
  * @property {string} [name] - Use the appropriate icon for the mode.
@@ -82,7 +82,7 @@ export class Icon {
    * @private
    */
   set name(val) {
-    if (!(/^md-|^ios-|-logo$/.test(val))) {
+    if (!(/^md-|^ios-|^logo-/.test(val))) {
       // this does not have one of the defaults
       // so lets auto add in the mode prefix for them
       val = this.mode + '-' + val;
diff --git a/ionic/components/icon/test/basic/index.ts b/ionic/components/icon/test/basic/index.ts
index a1708bf7f6..13798b4acc 100644
--- a/ionic/components/icon/test/basic/index.ts
+++ b/ionic/components/icon/test/basic/index.ts
@@ -16,7 +16,7 @@ class E2EApp {
       'ios-alert',
       'ios-alert-outline',
       'md-alert',
-      'apple-logo'
+      'logo-apple'
     ];
     this.btnIcon = this.icons[0];
   }
diff --git a/ionic/components/icon/test/basic/main.html b/ionic/components/icon/test/basic/main.html
index a02efe212a..500ec72f9e 100644
--- a/ionic/components/icon/test/basic/main.html
+++ b/ionic/components/icon/test/basic/main.html
@@ -57,16 +57,16 @@
     </ion-item>
 
     <ion-item>
-      <ion-icon name="twitter-logo" item-left></ion-icon>
+      <ion-icon name="logo-twitter" item-left></ion-icon>
       <code>
-        name="twitter-logo"
+        name="logo-twitter"
       </code>
     </ion-item>
 
     <ion-item>
-      <ion-icon ios="apple-logo" md="android-logo" item-left></ion-icon>
+      <ion-icon ios="logo-apple" md="logo-android" item-left></ion-icon>
       <code>
-        ios="apple-logo" md="android-logo"
+        ios="logo-apple" md="logo-android"
       </code>
     </ion-item>
 
diff --git a/ionic/components/item/item.ios.scss b/ionic/components/item/item.ios.scss
index d6365d1227..e82992b062 100644
--- a/ionic/components/item/item.ios.scss
+++ b/ionic/components/item/item.ios.scss
@@ -126,11 +126,6 @@ ion-thumbnail[item-right] {
   min-height: 25px;
 }
 
-.button-icon-only ion-icon,
-.button-icon-only {
-  padding: 0 1px;
-}
-
 ion-avatar {
   min-width: $item-ios-avatar-size;
   min-height: $item-ios-avatar-size;
diff --git a/ionic/components/item/item.md.scss b/ionic/components/item/item.md.scss
index e830bc1803..3d5bb4df28 100644
--- a/ionic/components/item/item.md.scss
+++ b/ionic/components/item/item.md.scss
@@ -102,11 +102,6 @@ ion-icon[item-right] {
   font-size: 1.2rem;
 }
 
-.button-icon-only ion-icon,
-.button-icon-only {
-  padding: 0 1px;
-}
-
 [text-wrap] ion-item-content {
   font-size: $item-md-body-text-font-size;
   line-height: $item-md-body-text-line-height;
diff --git a/ionic/components/menu/test/basic/page1.html b/ionic/components/menu/test/basic/page1.html
index a4d51fd547..725b063c07 100644
--- a/ionic/components/menu/test/basic/page1.html
+++ b/ionic/components/menu/test/basic/page1.html
@@ -37,7 +37,7 @@
   </p>
 
   <p>
-    <button class="e2eContentToggleMenu" menuToggle="rightMenu">Toggle Right Menu</button>
+    <button menuToggle="rightMenu">Toggle Right Menu</button>
   </p>
 
   <ion-card>
diff --git a/ionic/components/segment/test/basic/main.html b/ionic/components/segment/test/basic/main.html
index 8ccdca9188..aee8242f50 100644
--- a/ionic/components/segment/test/basic/main.html
+++ b/ionic/components/segment/test/basic/main.html
@@ -104,7 +104,7 @@
     <ion-segment-button value="free">
       Toolbar
     </ion-segment-button>
-    <ion-segment-button value="top" class="e2eSegmentTopGrossing">
+    <ion-segment-button value="top">
       Danger Segment
     </ion-segment-button>
   </ion-segment>
@@ -118,7 +118,7 @@
     <ion-segment-button value="free">
       Toolbar
     </ion-segment-button>
-    <ion-segment-button value="top" class="e2eSegmentTopGrossing">
+    <ion-segment-button value="top">
       Default Segment
     </ion-segment-button>
   </ion-segment>
diff --git a/ionic/fonts/ionicons-icons.scss b/ionic/fonts/ionicons-icons.scss
index 84e12a26c0..e1756be820 100644
--- a/ionic/fonts/ionicons-icons.scss
+++ b/ionic/fonts/ionicons-icons.scss
@@ -2,27 +2,6 @@
 // Ionicons Icon Font CSS
 // --------------------------
 
-.ion-android-logo:before { content: "\f225"; }
-.ion-angular-logo:before { content: "\f227"; }
-.ion-apple-logo:before { content: "\f229"; }
-.ion-bitcoin-logo:before { content: "\f22b"; }
-.ion-buffer-logo:before { content: "\f22d"; }
-.ion-chrome-logo:before { content: "\f22f"; }
-.ion-codepen-logo:before { content: "\f230"; }
-.ion-css3-logo:before { content: "\f231"; }
-.ion-designernews-logo:before { content: "\f232"; }
-.ion-dribbble-logo:before { content: "\f233"; }
-.ion-dropbox-logo:before { content: "\f234"; }
-.ion-euro-logo:before { content: "\f235"; }
-.ion-facebook-logo:before { content: "\f236"; }
-.ion-foursquare-logo:before { content: "\f237"; }
-.ion-freebsd-devil-logo:before { content: "\f238"; }
-.ion-github-logo:before { content: "\f239"; }
-.ion-google-logo:before { content: "\f23a"; }
-.ion-googleplus-logo:before { content: "\f23b"; }
-.ion-hackernews-logo:before { content: "\f23c"; }
-.ion-html5-logo:before { content: "\f23d"; }
-.ion-instagram-logo:before { content: "\f23e"; }
 .ion-ios-add:before { content: "\f102"; }
 .ion-ios-add-circle:before { content: "\f101"; }
 .ion-ios-add-circle-outline:before { content: "\f100"; }
@@ -609,9 +588,54 @@
 .ion-ios-wine-outline:before { content: "\f26e"; }
 .ion-ios-woman:before { content: "\f271"; }
 .ion-ios-woman-outline:before { content: "\f270"; }
-.ion-javascript-logo:before { content: "\f23f"; }
-.ion-linkedin-logo:before { content: "\f240"; }
-.ion-markdown-logo:before { content: "\f241"; }
+.ion-logo-android:before { content: "\f225"; }
+.ion-logo-angular:before { content: "\f227"; }
+.ion-logo-apple:before { content: "\f229"; }
+.ion-logo-bitcoin:before { content: "\f22b"; }
+.ion-logo-buffer:before { content: "\f22d"; }
+.ion-logo-chrome:before { content: "\f22f"; }
+.ion-logo-codepen:before { content: "\f230"; }
+.ion-logo-css3:before { content: "\f231"; }
+.ion-logo-designernews:before { content: "\f232"; }
+.ion-logo-dribbble:before { content: "\f233"; }
+.ion-logo-dropbox:before { content: "\f234"; }
+.ion-logo-euro:before { content: "\f235"; }
+.ion-logo-facebook:before { content: "\f236"; }
+.ion-logo-foursquare:before { content: "\f237"; }
+.ion-logo-freebsd-devil:before { content: "\f238"; }
+.ion-logo-github:before { content: "\f239"; }
+.ion-logo-google:before { content: "\f23a"; }
+.ion-logo-googleplus:before { content: "\f23b"; }
+.ion-logo-hackernews:before { content: "\f23c"; }
+.ion-logo-html5:before { content: "\f23d"; }
+.ion-logo-instagram:before { content: "\f23e"; }
+.ion-logo-javascript:before { content: "\f23f"; }
+.ion-logo-linkedin:before { content: "\f240"; }
+.ion-logo-markdown:before { content: "\f241"; }
+.ion-logo-nodejs:before { content: "\f242"; }
+.ion-logo-octocat:before { content: "\f243"; }
+.ion-logo-pinterest:before { content: "\f244"; }
+.ion-logo-playstation:before { content: "\f245"; }
+.ion-logo-python:before { content: "\f246"; }
+.ion-logo-reddit:before { content: "\f247"; }
+.ion-logo-rss:before { content: "\f248"; }
+.ion-logo-sass:before { content: "\f249"; }
+.ion-logo-skype:before { content: "\f24a"; }
+.ion-logo-snapchat:before { content: "\f24b"; }
+.ion-logo-steam:before { content: "\f24c"; }
+.ion-logo-tumblr:before { content: "\f24d"; }
+.ion-logo-tux:before { content: "\f2ae"; }
+.ion-logo-twitch:before { content: "\f2af"; }
+.ion-logo-twitter:before { content: "\f2b0"; }
+.ion-logo-usd:before { content: "\f2b1"; }
+.ion-logo-vimeo:before { content: "\f2c4"; }
+.ion-logo-whatsapp:before { content: "\f2c5"; }
+.ion-logo-windows:before { content: "\f32f"; }
+.ion-logo-wordpress:before { content: "\f330"; }
+.ion-logo-xbox:before { content: "\f34c"; }
+.ion-logo-yahoo:before { content: "\f34d"; }
+.ion-logo-yen:before { content: "\f34e"; }
+.ion-logo-youtube:before { content: "\f34f"; }
 .ion-md-add:before { content: "\f273"; }
 .ion-md-add-circle:before { content: "\f272"; }
 .ion-md-alarm:before { content: "\f274"; }
@@ -911,28 +935,4 @@
 .ion-md-water:before { content: "\f3a7"; }
 .ion-md-wifi:before { content: "\f3a8"; }
 .ion-md-wine:before { content: "\f3a9"; }
-.ion-md-woman:before { content: "\f3aa"; }
-.ion-nodejs-logo:before { content: "\f242"; }
-.ion-octocat-logo:before { content: "\f243"; }
-.ion-pinterest-logo:before { content: "\f244"; }
-.ion-playstation-logo:before { content: "\f245"; }
-.ion-python-logo:before { content: "\f246"; }
-.ion-reddit-logo:before { content: "\f247"; }
-.ion-rss-logo:before { content: "\f248"; }
-.ion-sass-logo:before { content: "\f249"; }
-.ion-skype-logo:before { content: "\f24a"; }
-.ion-snapchat-logo:before { content: "\f24b"; }
-.ion-steam-logo:before { content: "\f24c"; }
-.ion-tumblr-logo:before { content: "\f24d"; }
-.ion-tux-logo:before { content: "\f2ae"; }
-.ion-twitch-logo:before { content: "\f2af"; }
-.ion-twitter-logo:before { content: "\f2b0"; }
-.ion-usd-logo:before { content: "\f2b1"; }
-.ion-vimeo-logo:before { content: "\f2c4"; }
-.ion-whatsapp-logo:before { content: "\f2c5"; }
-.ion-windows-logo:before { content: "\f32f"; }
-.ion-wordpress-logo:before { content: "\f330"; }
-.ion-xbox-logo:before { content: "\f34c"; }
-.ion-yahoo-logo:before { content: "\f34d"; }
-.ion-yen-logo:before { content: "\f34e"; }
-.ion-youtube-logo:before { content: "\f34f"; }
\ No newline at end of file
+.ion-md-woman:before { content: "\f3aa"; }
\ No newline at end of file
diff --git a/ionic/fonts/ionicons.scss b/ionic/fonts/ionicons.scss
index b77fcec5e3..db255ee595 100644
--- a/ionic/fonts/ionicons.scss
+++ b/ionic/fonts/ionicons.scss
@@ -10,8 +10,8 @@ $ionicons-version: "3.0.0" !default;
 
 @font-face {
  font-family: "Ionicons";
- src: url("#{$ionicons-font-path}/ionicons.ttf?v=#{$ionicons-version}") format("truetype"),
-      url("#{$ionicons-font-path}/ionicons.woff?v=#{$ionicons-version}") format("woff");
+ src: url("#{$ionicons-font-path}/ionicons.woff?v=#{$ionicons-version}") format("woff"),
+      url("#{$ionicons-font-path}/ionicons.ttf?v=#{$ionicons-version}") format("truetype");
  font-weight: normal;
  font-style: normal;
 }
diff --git a/ionic/fonts/ionicons.ttf b/ionic/fonts/ionicons.ttf
index ba29a415af..60eff2824a 100644
Binary files a/ionic/fonts/ionicons.ttf and b/ionic/fonts/ionicons.ttf differ
diff --git a/ionic/fonts/ionicons.woff b/ionic/fonts/ionicons.woff
index 9533869f47..d4bb6452c3 100644
Binary files a/ionic/fonts/ionicons.woff and b/ionic/fonts/ionicons.woff differ