diff --git a/packages/core/src/components.d.ts b/packages/core/src/components.d.ts
index 13f01bb565..fae3e689dd 100644
--- a/packages/core/src/components.d.ts
+++ b/packages/core/src/components.d.ts
@@ -330,36 +330,6 @@ declare global {
 }
 
 
-import {
-  ButtonEffect as IonButtonEffect
-} from './components/button-effect/button-effect';
-
-declare global {
-  interface HTMLIonButtonEffectElement extends IonButtonEffect, HTMLElement {
-  }
-  var HTMLIonButtonEffectElement: {
-    prototype: HTMLIonButtonEffectElement;
-    new (): HTMLIonButtonEffectElement;
-  };
-  interface HTMLElementTagNameMap {
-    "ion-button-effect": HTMLIonButtonEffectElement;
-  }
-  interface ElementTagNameMap {
-    "ion-button-effect": HTMLIonButtonEffectElement;
-  }
-  namespace JSX {
-    interface IntrinsicElements {
-      "ion-button-effect": JSXElements.IonButtonEffectAttributes;
-    }
-  }
-  namespace JSXElements {
-    export interface IonButtonEffectAttributes extends HTMLAttributes {
-      
-    }
-  }
-}
-
-
 import {
   Button as IonButton
 } from './components/button/button';
@@ -2301,6 +2271,36 @@ declare global {
 }
 
 
+import {
+  RippleEffect as IonRippleEffect
+} from './components/ripple-effect/ripple-effect';
+
+declare global {
+  interface HTMLIonRippleEffectElement extends IonRippleEffect, HTMLElement {
+  }
+  var HTMLIonRippleEffectElement: {
+    prototype: HTMLIonRippleEffectElement;
+    new (): HTMLIonRippleEffectElement;
+  };
+  interface HTMLElementTagNameMap {
+    "ion-ripple-effect": HTMLIonRippleEffectElement;
+  }
+  interface ElementTagNameMap {
+    "ion-ripple-effect": HTMLIonRippleEffectElement;
+  }
+  namespace JSX {
+    interface IntrinsicElements {
+      "ion-ripple-effect": JSXElements.IonRippleEffectAttributes;
+    }
+  }
+  namespace JSXElements {
+    export interface IonRippleEffectAttributes extends HTMLAttributes {
+      
+    }
+  }
+}
+
+
 import {
   RouteLink as IonRouteLink
 } from './components/route-link/route-link';
@@ -2851,6 +2851,7 @@ declare global {
   }
   namespace JSXElements {
     export interface IonTabButtonAttributes extends HTMLAttributes {
+      mode?: 'ios' | 'md';
       selected?: boolean;
       tab?: HTMLIonTabElement;
     }
diff --git a/packages/core/src/components/button/button.md.scss b/packages/core/src/components/button/button.md.scss
index 601a491df7..04bc54f7bb 100644
--- a/packages/core/src/components/button/button.md.scss
+++ b/packages/core/src/components/button/button.md.scss
@@ -42,7 +42,7 @@
   background-color: $button-md-background-color-focused;
 }
 
-.button-md .button-effect {
+.button-md .ripple-effect {
   background-color: $button-md-text-color;
 }
 
@@ -74,7 +74,7 @@
     background-color: $bg-color-focused;
   }
 
-  .button-md-#{$color-name} .button-effect {
+  .button-md-#{$color-name} .ripple-effect {
     background-color: $fg-color;
   }
 }
@@ -143,7 +143,7 @@
   background-color: $button-md-outline-background-color-focused;
 }
 
-.button-outline-md .button-effect {
+.button-outline-md .ripple-effect {
   background-color: $button-md-outline-ripple-background-color;
 }
 
@@ -173,7 +173,7 @@
     background-color: $bg-color-focused;
   }
 
-  .button-outline-md-#{$color-name} .button-effect {
+  .button-outline-md-#{$color-name} .ripple-effect {
     background-color: $fg-color;
   }
 }
@@ -203,7 +203,7 @@
   background-color: $button-md-clear-background-color-hover;
 }
 
-.button-clear-md .button-effect {
+.button-clear-md .ripple-effect {
   background-color: $button-md-clear-ripple-background-color;
 }
 
diff --git a/packages/core/src/components/button/button.tsx b/packages/core/src/components/button/button.tsx
index e8dd691867..61b51c98f6 100644
--- a/packages/core/src/components/button/button.tsx
+++ b/packages/core/src/components/button/button.tsx
@@ -143,7 +143,7 @@ export class Button {
             <slot></slot>
             <slot name='end'></slot>
           </span>
-          <ion-button-effect />
+          { this.mode === 'md' && <ion-ripple-effect /> }
       </TagType>
     );
   }
diff --git a/packages/core/src/components/chip-button/chip-button.tsx b/packages/core/src/components/chip-button/chip-button.tsx
index 945425763b..22b18259cd 100644
--- a/packages/core/src/components/chip-button/chip-button.tsx
+++ b/packages/core/src/components/chip-button/chip-button.tsx
@@ -101,7 +101,7 @@ export class ChipButton {
         <span class='button-inner'>
           <slot></slot>
         </span>
-        <div class='button-effect'></div>
+        { this.mode === 'md' && <ion-ripple-effect /> }
       </TagType>
     );
   }
diff --git a/packages/core/src/components/fab-button/fab-button.md.scss b/packages/core/src/components/fab-button/fab-button.md.scss
index f6ed5477a6..6b928745d0 100755
--- a/packages/core/src/components/fab-button/fab-button.md.scss
+++ b/packages/core/src/components/fab-button/fab-button.md.scss
@@ -51,7 +51,7 @@
 // Material Design FAB Ripple
 // --------------------------------------------------
 
-.fab-button-md .button-effect {
+.fab-button-md .ripple-effect {
   background-color: color-contrast($colors-md, $fab-md-background-color);
 }
 
@@ -78,7 +78,7 @@
     background-color: $bg-color-activated;
   }
 
-  .fab-button-md-#{$color-name} .button-effect {
+  .fab-button-md-#{$color-name} .ripple-effect {
     background-color: $fg-color;
   }
 }
diff --git a/packages/core/src/components/fab-button/fab-button.tsx b/packages/core/src/components/fab-button/fab-button.tsx
index fbf6082d9b..e4806d16b1 100755
--- a/packages/core/src/components/fab-button/fab-button.tsx
+++ b/packages/core/src/components/fab-button/fab-button.tsx
@@ -139,7 +139,7 @@ export class FabButton {
         <span class='button-inner'>
           <slot></slot>
         </span>
-        <div class='button-effect'></div>
+        { this.mode === 'md' && <ion-ripple-effect /> }
       </TagType>
     );
   }
diff --git a/packages/core/src/components/item/item.tsx b/packages/core/src/components/item/item.tsx
index d173551f04..e90c1b8f7a 100644
--- a/packages/core/src/components/item/item.tsx
+++ b/packages/core/src/components/item/item.tsx
@@ -99,7 +99,7 @@ export class Item {
           </div>
           <slot name='end'></slot>
         </div>
-        <div class='button-effect'></div>
+        { this.href && this.mode === 'md' && <ion-ripple-effect /> }
       </TagType>
     );
   }
diff --git a/packages/core/src/components/button-effect/readme.md b/packages/core/src/components/ripple-effect/readme.md
similarity index 100%
rename from packages/core/src/components/button-effect/readme.md
rename to packages/core/src/components/ripple-effect/readme.md
diff --git a/packages/core/src/components/button-effect/button-effect.scss b/packages/core/src/components/ripple-effect/ripple-effect.scss
similarity index 77%
rename from packages/core/src/components/button-effect/button-effect.scss
rename to packages/core/src/components/ripple-effect/ripple-effect.scss
index 0cee2ec155..a007c68c80 100644
--- a/packages/core/src/components/button-effect/button-effect.scss
+++ b/packages/core/src/components/ripple-effect/ripple-effect.scss
@@ -5,10 +5,7 @@
 // Only Material uses the button effect, so by default
 // it's display none, and .md sets to display block.
 
-/// @prop - Background color of the ripple on the button
-$button-effect-ripple-background-color:       #000 !default;
-
-ion-button-effect {
+ion-ripple-effect {
   @include position(0, 0, 0, 0);
 
   position: absolute;
@@ -16,11 +13,11 @@ ion-button-effect {
   contain: strict;
 }
 
-.button-effect {
+.ripple-effect {
   @include border-radius(50%);
   position: absolute;
 
-  background: $button-effect-ripple-background-color;
+  background: #000;
   opacity: 0;
 
   will-change: transform, opacity;
diff --git a/packages/core/src/components/button-effect/button-effect.tsx b/packages/core/src/components/ripple-effect/ripple-effect.tsx
similarity index 82%
rename from packages/core/src/components/button-effect/button-effect.tsx
rename to packages/core/src/components/ripple-effect/ripple-effect.tsx
index eba1227b47..86fd7d5f75 100644
--- a/packages/core/src/components/button-effect/button-effect.tsx
+++ b/packages/core/src/components/ripple-effect/ripple-effect.tsx
@@ -1,18 +1,16 @@
-import { Component, Element, Listen, Prop, State } from '@stencil/core';
+import { Component, Element, Listen, Prop } from '@stencil/core';
 import { now } from '../../utils/helpers';
 import { DomController } from '../../global/dom-controller';
 
 @Component({
-  tag: 'ion-button-effect',
-  styleUrl: 'button-effect.scss'
+  tag: 'ion-ripple-effect',
+  styleUrl: 'ripple-effect.scss'
 })
-export class ButtonEffect {
+export class RippleEffect {
 
   private lastClick = -10000;
   @Element() el: HTMLElement;
 
-  @State() state = 0;
-
   @Prop({context: 'dom'}) dom: DomController;
 
   @Listen('touchstart')
@@ -37,13 +35,13 @@ export class ButtonEffect {
       const rect = this.el.getBoundingClientRect();
       const width = rect.width;
       const height = rect.height;
-      size = Math.sqrt(width * width + height * height) * 2;
+      size = Math.min(Math.sqrt(width * width + height * height) * 2, 600);
       x = pageX - rect.left - (size / 2);
       y = pageY - rect.top - (size / 2);
     });
     this.dom.write(() => {
       const div = document.createElement('div');
-      div.classList.add('button-effect');
+      div.classList.add('ripple-effect');
       const style = div.style;
       const duration = Math.max(800 * Math.sqrt(size / 350) + 0.5, 260);
       style.top = y + 'px';
diff --git a/packages/core/src/components/button-effect/test/basic/index.html b/packages/core/src/components/ripple-effect/test/basic/index.html
similarity index 89%
rename from packages/core/src/components/button-effect/test/basic/index.html
rename to packages/core/src/components/ripple-effect/test/basic/index.html
index 3b8019e46b..1b9988a0a9 100644
--- a/packages/core/src/components/button-effect/test/basic/index.html
+++ b/packages/core/src/components/ripple-effect/test/basic/index.html
@@ -40,19 +40,19 @@
             <ion-button size="large" fill="clear">Large</ion-button>
           </p>
           <div class="my-block">
-            <ion-button-effect></ion-button-effect>
+            <ion-ripple-effect></ion-ripple-effect>
             This is just a div + effect behind
             <ion-button onclick="buttonClicked()">Nested button</ion-button>
           </div>
           <div class="my-block">
             This is just a div + effect on top
             <ion-button onclick="buttonClicked()">Nested button</ion-button>
-            <ion-button-effect></ion-button-effect>
+            <ion-ripple-effect></ion-ripple-effect>
           </div>
 
           <div class="my-block">
-              This is just a div + effect
-            <ion-button-effect></ion-button-effect>
+            This is just a div + effect
+            <ion-ripple-effect></ion-ripple-effect>
           </div>
         </ion-content>
     </ion-page>
diff --git a/packages/core/src/components/tab-button/readme.md b/packages/core/src/components/tab-button/readme.md
index a3e455c10f..7a372de6af 100644
--- a/packages/core/src/components/tab-button/readme.md
+++ b/packages/core/src/components/tab-button/readme.md
@@ -7,6 +7,11 @@
 
 ## Properties
 
+#### mode
+
+any
+
+
 #### selected
 
 boolean
@@ -19,6 +24,11 @@ any
 
 ## Attributes
 
+#### mode
+
+any
+
+
 #### selected
 
 boolean
diff --git a/packages/core/src/components/tab-button/tab-button.tsx b/packages/core/src/components/tab-button/tab-button.tsx
index e16f75ceeb..078bde052a 100644
--- a/packages/core/src/components/tab-button/tab-button.tsx
+++ b/packages/core/src/components/tab-button/tab-button.tsx
@@ -8,6 +8,13 @@ export class TabButton {
 
   @Element() el: HTMLElement;
 
+  /**
+   * @input {string} The mode determines which platform styles to use.
+   * Possible values are: `"ios"` or `"md"`.
+   * For more information, see [Platform Styles](/docs/theming/platform-specific-styles).
+   */
+  @Prop() mode: 'ios' | 'md';
+
   @Prop() selected = false;
   @Prop() tab: HTMLIonTabElement;
 
@@ -67,8 +74,9 @@ export class TabButton {
     if (tab.badge) {
       items.push(<ion-badge class='tab-badge' color={tab.badgeStyle}>{tab.badge}</ion-badge>);
     }
-    items.push(<div class='button-effect'></div>);
-
+    if (this.mode === 'md') {
+      items.push(<ion-ripple-effect />);
+    }
     return items;
   }
 }
diff --git a/packages/core/src/components/toolbar/toolbar.md.scss b/packages/core/src/components/toolbar/toolbar.md.scss
index 4c58856756..537a65c42d 100644
--- a/packages/core/src/components/toolbar/toolbar.md.scss
+++ b/packages/core/src/components/toolbar/toolbar.md.scss
@@ -90,7 +90,7 @@
     .bar-button-clear-md,
     .bar-button-default-md,
     .bar-button-outline-md {
-      .button-effect {
+      .ripple-effect {
         background-color: $color-contrast;
       }
     }
@@ -202,7 +202,7 @@
     background-color: transparent;
   }
 
-  .button-effect {
+  .ripple-effect {
     background-color: $toolbar-md-button-color;
   }
 }
@@ -219,7 +219,7 @@
       background-color: transparent;
     }
 
-    .button-effect {
+    .ripple-effect {
       background-color: $fg-color;
     }
   }
diff --git a/packages/core/src/utils/haptic.ts b/packages/core/src/utils/haptic.ts
index f1bb324c38..2d0690199d 100644
--- a/packages/core/src/utils/haptic.ts
+++ b/packages/core/src/utils/haptic.ts
@@ -1,4 +1,4 @@
-const _engine = (window as any).TapticEngine;
+const engine = (window as any).TapticEngine;
 
 /**
  * Check to see if the Haptic Plugin is available
@@ -6,7 +6,7 @@ const _engine = (window as any).TapticEngine;
  *
  */
 export function hapticAvailable() {
-  return !!_engine;
+  return !!engine;
 }
 
 /**
@@ -14,21 +14,21 @@ export function hapticAvailable() {
  * (not for gestures)
  */
 export function hapticSelection() {
-  _engine && _engine.selection();
+  engine && engine.selection();
 }
 
 /**
  * Tell the haptic engine that a gesture for a selection change is starting.
  */
 export function hapticSelectionStart() {
-  _engine && _engine.gestureSelectionStart();
+  engine && engine.gestureSelectionStart();
 }
 
 /**
  * Tell the haptic engine that a selection changed during a gesture.
  */
 export function hapticSelectionChanged() {
-  _engine && _engine.gestureSelectionChanged();
+  engine && engine.gestureSelectionChanged();
 }
 
 /**
@@ -36,7 +36,7 @@ export function hapticSelectionChanged() {
  * called lest resources are not properly recycled.
  */
 export function hapticSelectionEnd() {
-  _engine && _engine.gestureSelectionEnd();
+  engine && engine.gestureSelectionEnd();
 }
 
 /**
@@ -44,7 +44,7 @@ export function hapticSelectionEnd() {
  * options should be of the type `{ type: 'success' }` (or `warning`/`error`)
  */
 export function hapticNotification(options: { type: string }) {
-  _engine && _engine.notification(options);
+  engine && engine.notification(options);
 }
 
 /**
@@ -52,5 +52,5 @@ export function hapticNotification(options: { type: string }) {
  * options should be of the type `{ style: 'light' }` (or `medium`/`heavy`)
  */
 export function hapticImpact(options: { style: string }) {
-  _engine && _engine.impact(options);
+  engine && engine.impact(options);
 }