diff --git a/dist/HA-Firemote.js b/dist/HA-Firemote.js
index 171c6ef..5611fa2 100644
--- a/dist/HA-Firemote.js
+++ b/dist/HA-Firemote.js
@@ -1495,15 +1495,18 @@ class FiremoteCard extends LitElement {
           .XM2 .dpadbutton,
           .XM .dpadbutton {
             background: rgb(28 28 28);
-            border: solid rgb(15 15 15) calc(var(--sz) * 0.03rem);
             outline: none;
             box-sizing: border-box;
           }
 
+          .XM2 .dpadbutton:hover,
+          .XM .dpadbutton:hover {
+            background: rgb(34, 34, 34);
+          }
+
           .XM2 .dpadbutton:active,
           .XM .dpadbutton:active {
             background: rgb(24 24 24);
-            border: solid #000 calc(var(--sz) * 0.15rem);
           }
 
           .chromecast-remote-body.CC1 .dpadbutton,
@@ -1588,6 +1591,14 @@ class FiremoteCard extends LitElement {
           .dpadbuttonShield {
             width: calc(var(--sz) * 4.101rem);
             height: calc(var(--sz) * 4.101rem);
+            outline: none;
+          }
+
+          .dpadbuttonShield:hover {
+            background: rgb(30, 30, 30);
+          }
+          .dpadbuttonShield:active {
+            background: rgb(25, 25, 25);
           }
 
           .centerbuttonShield {
@@ -2234,7 +2245,7 @@ class FiremoteCard extends LitElement {
             box-shadow: 0 calc(var(--sz) * 0.214rem) calc(var(--sz) * 0.214rem) rgb(0 0 0 / 10%);
           }
 
-          .homatics-remote-body.HO2, 
+          .homatics-remote-body.HO2,
           .homatics-remote-body.HO4 {
             background: #252525;
             border-color: #2f2f2f;
@@ -2248,7 +2259,7 @@ class FiremoteCard extends LitElement {
             box-shadow: rgb(0 0 0 / 15%) 0px calc(var(--sz)* 0.063rem) calc(var(--sz)* 0.188rem);
           }
 
-          .HO2 .remote-button, 
+          .HO2 .remote-button,
           .HO4 .remote-button {
             background: #2f2f2f;
             border: solid rgb(15 15 15) calc(var(--sz)* 0.0714rem);
@@ -2260,7 +2271,7 @@ class FiremoteCard extends LitElement {
             border: solid rgb(232 232 232) calc(var(--sz)* 0.0714rem);
           }
 
-          .HO2 .remote-button:active, 
+          .HO2 .remote-button:active,
           .HO4 .remote-button:active {
             border: solid rgb(10 10 10) calc(var(--sz)* 0.0714rem);
           }
@@ -2270,12 +2281,12 @@ class FiremoteCard extends LitElement {
             box-shadow: 0 0 calc(var(--sz)* 0.857rem) calc(var(--sz)* 0.0714rem) rgb(171 253 255 / 15%);
           }
 
-          .HO1 .litbutton > ha-icon, 
+          .HO1 .litbutton > ha-icon,
           .HO3 .litbutton > ha-icon {
             color: #00979b !important;
           }
 
-          .HO2 .litbutton > ha-icon, 
+          .HO2 .litbutton > ha-icon,
           .HO4 .litbutton > ha-icon {
             color: #abfdff !important
           }
@@ -2310,7 +2321,7 @@ class FiremoteCard extends LitElement {
             width: calc(var(--sz)* 2.75rem);
           }
 
-          .remote-body.HO1 .remote-button > ha-icon, 
+          .remote-body.HO1 .remote-button > ha-icon,
           .remote-body.HO3 .remote-button > ha-icon {
             color: rgb(106 106 106);
           }
@@ -2479,7 +2490,7 @@ class FiremoteCard extends LitElement {
           .HO2 .centerbutton,
           .HO4 .centerbutton {
             background: linear-gradient(0deg, rgb(48 48 48) 26%, rgb(39 39 39) 50%, rgb(33 33 33) 75%);
-            border: solid #252525 calc(var(--sz)* 0.25rem); 
+            border: solid #252525 calc(var(--sz)* 0.25rem);
           }
 
           .homatics-remote-body .centerbutton:active {
@@ -2491,7 +2502,7 @@ class FiremoteCard extends LitElement {
           .HO2 .centerbutton:active,
           .HO4 .centerbutton:active {
             filter: brightness(0.8);
-            border: solid #000 calc(var(--sz)* 0.29rem); 
+            border: solid #000 calc(var(--sz)* 0.29rem);
           }
 
           .homatics-remote-body #home-button {
@@ -2539,7 +2550,7 @@ class FiremoteCard extends LitElement {
             fill: rgb(106 106 106);
           }
 
-          .homatics-remote-body.HO2 #voltext > *, 
+          .homatics-remote-body.HO2 #voltext > *,
           .homatics-remote-body.HO4 #voltext > * {
             fill: rgb(245, 245, 245);
           }
@@ -2553,7 +2564,7 @@ class FiremoteCard extends LitElement {
             fill: rgb(106 106 106);
           }
 
-          .homatics-remote-body.HO2 #chtext > *, 
+          .homatics-remote-body.HO2 #chtext > *,
           .homatics-remote-body.HO4 #chtext > * {
             fill: rgb(245, 245, 245);
           }
@@ -2598,17 +2609,17 @@ class FiremoteCard extends LitElement {
             border-top: 0;
           }
 
-          .homatics-remote-body #volume-down-button, 
+          .homatics-remote-body #volume-down-button,
           .homatics-remote-body #channel-down-button {
             box-shadow: rgb(0 0 0 / 15%) 0px calc(var(--sz)* 0.063rem) calc(var(--sz)* 0.1rem);
           }
 
-          .homatics-remote-body #volume-up-button, 
+          .homatics-remote-body #volume-up-button,
           .homatics-remote-body #channel-up-button {
             box-shadow: none;
           }
 
-          .homatics-remote-body #volume-up-button:active, 
+          .homatics-remote-body #volume-up-button:active,
           .homatics-remote-body #channel-up-button:active {
             filter: none;
             background: linear-gradient(0deg, rgba(255, 255, 255, 1) 0%, rgba(240, 240, 240, 1) 95%);
@@ -2616,9 +2627,9 @@ class FiremoteCard extends LitElement {
             border-bottom: 0;
           }
 
-          .homatics-remote-body.HO2 #volume-up-button:active, 
+          .homatics-remote-body.HO2 #volume-up-button:active,
           .homatics-remote-body.HO2 #channel-up-button:active,
-          .homatics-remote-body.HO4 #volume-up-button:active, 
+          .homatics-remote-body.HO4 #volume-up-button:active,
           .homatics-remote-body.HO4 #channel-up-button:active {
             filter: none;
             background: linear-gradient(0deg, rgb(46 46 46) 0%, rgb(38 38 38) 95%);
@@ -2626,7 +2637,7 @@ class FiremoteCard extends LitElement {
             border-bottom: 0;
           }
 
-          .homatics-remote-body #volume-down-button:active, 
+          .homatics-remote-body #volume-down-button:active,
           .homatics-remote-body #channel-down-button:active {
             filter: none;
             background: linear-gradient(0deg, rgba(240, 240, 240, 1) 0%, rgba(255, 255, 255, 1) 95%);
@@ -2635,9 +2646,9 @@ class FiremoteCard extends LitElement {
             border-top: 0;
           }
 
-          .homatics-remote-body.HO2 #volume-down-button:active, 
+          .homatics-remote-body.HO2 #volume-down-button:active,
           .homatics-remote-body.HO2 #channel-down-button:active,
-          .homatics-remote-body.HO4 #volume-down-button:active, 
+          .homatics-remote-body.HO4 #volume-down-button:active,
           .homatics-remote-body.HO4 #channel-down-button:active {
             filter: none;
             background: linear-gradient(180deg, rgb(46 46 46) 0%, rgb(38 38 38) 95%);
@@ -4488,8 +4499,8 @@ class FiremoteCard extends LitElement {
 
 
     function renderHomaticsExtras(remote, style){
-      if (style == 'HO1' || style == 'HO2') { 
-        return 
+      if (style == 'HO1' || style == 'HO2') {
+        return
       };
       return html`
           <button class="remote-button digit-pad-button" id="num1-button" @pointerdown=${remote.buttonDown}>
@@ -4737,10 +4748,10 @@ class FiremoteCard extends LitElement {
 
 
           <button class="remote-button" id="back-button" @pointerdown=${this.buttonDown}>
-            <ha-icon icon="mdi:menu-left"></ha-icon>
+            <ha-icon icon="mdi:menu-left" style="transform: scale(1.5, 0.9);"></ha-icon>
           </button>
           <button class="remote-button${homeStatusClass}" id="home-button" @pointerdown=${this.buttonDown}>
-            <ha-icon icon="mdi:circle"></ha-icon>
+            <ha-icon icon="mdi:circle" style="transform: scale(0.9); margin-left: 1px;"></ha-icon>
           </button>
 
           <button class="remote-button" id="fastforward-button" @pointerdown=${this.buttonDown}>
@@ -5989,7 +6000,7 @@ class FiremoteCard extends LitElement {
             resolve("hold");
           }
         }, holdTime);
-      
+
         // it was a click
         function release(){
           clearTimeout(timer);
@@ -6000,7 +6011,7 @@ class FiremoteCard extends LitElement {
           pressedTarget.removeEventListener('touchmove', handleTouchMove, {passive: true});
           resolve("click");
         }
-  
+
         // a non-event is cancelled here
         function mouseOutHandler() {
           clearTimeout(timer);
@@ -6236,7 +6247,7 @@ class FiremoteCard extends LitElement {
           }
           return;
         }
-        
+
 
 
         // Left Button Click
@@ -8090,7 +8101,7 @@ class FiremoteCardEditor extends LitElement {
 
 
   getMediaPlayerEntityDropdown(optionValue){
-    if(['none'].includes(this._config.device_family)) { 
+    if(['none'].includes(this._config.device_family)) {
       this._config.entity = 'none';
       this.configChanged;
       return;
@@ -8100,7 +8111,7 @@ class FiremoteCardEditor extends LitElement {
     if(this._config.device_family == 'apple-tv') {
       mediaPlayerEntities = this.getMediaPlayerEntitiesByPlatform('apple_tv');
       heading = 'Apple TV Media Player '+ this.translateToUsrLang('Entity');
-      heading = this.hass.config.language == 'he' || this.hass.config.language == 'fr' ? 
+      heading = this.hass.config.language == 'he' || this.hass.config.language == 'fr' ?
         this.translateToUsrLang('Entity') + ' Apple TV Media Player' : 'Apple TV Media Player '+ this.translateToUsrLang('Entity');
     }
     else if(this._config.device_family == 'roku') {
@@ -8110,7 +8121,7 @@ class FiremoteCardEditor extends LitElement {
     }
     else {
       mediaPlayerEntities = this.getMediaPlayerEntitiesByPlatform('androidtv');
-      heading = this.hass.config.language == 'he' || this.hass.config.language == 'fr' ? 
+      heading = this.hass.config.language == 'he' || this.hass.config.language == 'fr' ?
         this.translateToUsrLang('Entity') + ' Android Debug Bridge' : 'Android Debug Bridge '+ this.translateToUsrLang('Entity');
     }
     var blankEntity = '';