diff --git a/src/harmony-card.ts b/src/harmony-card.ts
index ebdc61a..42d883d 100644
--- a/src/harmony-card.ts
+++ b/src/harmony-card.ts
@@ -216,12 +216,12 @@ export class HarmonyCard extends LitElement {
         var buttonStyles = Object.assign(styles || {}, { color: buttonConfig.color });
 
         return html`
-            <paper-icon-button 
+            <ha-icon-button 
                 icon="${buttonConfig.icon}" 
                 style="${styleMap(buttonStyles)}"
                 @click="${e => this.deviceCommand(e, buttonConfig.device || device, buttonConfig.command || '')}" 
                 @touchstart="${e => this.preventBubbling(e)}">
-            </paper-icon-button>
+            </ha-icon-button>
         `;
     }
 
@@ -254,8 +254,8 @@ export class HarmonyCard extends LitElement {
 
         return html`
             <div class="volume-controls">
-                <paper-icon-button style="${styleMap(volumeDownStyle)}" icon="${buttonConfig['volume_down'].icon}" @click="${e => this.volumeCommand(e, 'volume_down')}" @touchstart="${e => this.preventBubbling(e)}"></paper-icon-button>
-                <paper-icon-button style="${styleMap(volumeUpStyle)}" icon="${buttonConfig['volume_up'].icon}" @click="${e => this.volumeCommand(e, 'volume_up')}" @touchstart="${e => this.preventBubbling(e)}"></paper-icon-button>
+                <ha-icon-button style="${styleMap(volumeDownStyle)}" icon="${buttonConfig['volume_down'].icon}" @click="${e => this.volumeCommand(e, 'volume_down')}" @touchstart="${e => this.preventBubbling(e)}"></ha-icon-button>
+                <ha-icon-button style="${styleMap(volumeUpStyle)}" icon="${buttonConfig['volume_up'].icon}" @click="${e => this.volumeCommand(e, 'volume_up')}" @touchstart="${e => this.preventBubbling(e)}"></ha-icon-button>
                 <paper-slider           
                     @change=${e => this.volumeCommand(e, 'volume_set', { volume_level: e.target.value / 100 })}
                     @click=${e => e.stopPropagation()}
@@ -267,7 +267,7 @@ export class HarmonyCard extends LitElement {
                     ignore-bar-touch pin>
                 </paper-slider>
                 
-                <paper-icon-button style="${styleMap(volumeMuteStyle)}" icon="${buttonConfig['volume_mute'].icon}" @click="${e => this.volumeCommand(e, 'volume_mute', { is_volume_muted: true })}" @touchstart="${e => this.preventBubbling(e)}"></paper-icon-button>
+                <ha-icon-button style="${styleMap(volumeMuteStyle)}" icon="${buttonConfig['volume_mute'].icon}" @click="${e => this.volumeCommand(e, 'volume_mute', { is_volume_muted: true })}" @touchstart="${e => this.preventBubbling(e)}"></ha-icon-button>
             </div>`;
     }
 
diff --git a/src/sharedStyle.ts b/src/sharedStyle.ts
index 3e8f706..7ed4807 100644
--- a/src/sharedStyle.ts
+++ b/src/sharedStyle.ts
@@ -24,17 +24,17 @@ const sharedStyle = css`
     width: calc(var(--mmp-unit) * .6);
     height: calc(var(--mmp-unit) * .6);
   }
-  paper-icon-button {
+  ha-icon-button {
     width: var(--mmp-unit);
     height: var(--mmp-unit);
     color: var(--mmp-text-color, var(--primary-text-color));
     transition: color .25s;
   }
-  paper-icon-button[color] {
+  ha-icon-button[color] {
     color: var(--mmp-accent-color, var(--accent-color)) !important;
     opacity: 1 !important;
   }
-  paper-icon-button[inactive] {
+  ha-icon-button[inactive] {
     opacity: .5;
   }