diff --git a/src/cards/climate-card/controls/climate-hvac-modes-control.ts b/src/cards/climate-card/controls/climate-hvac-modes-control.ts
index c88e7973a..3d065a81f 100644
--- a/src/cards/climate-card/controls/climate-hvac-modes-control.ts
+++ b/src/cards/climate-card/controls/climate-hvac-modes-control.ts
@@ -60,11 +60,12 @@ export class ClimateHvacModesControl extends LitElement {
         return html`
             <mushroom-button
                 style=${styleMap(iconStyle)}
-                .icon=${getHvacModeIcon(mode)}
                 .mode=${mode}
                 .disabled=${!isAvailable(this.entity)}
                 @click=${this.callService}
-            ></mushroom-button>
+            >
+                <ha-icon .icon=${getHvacModeIcon(mode)}></ha-icon>
+            </mushroom-button>
         `;
     }
 }
diff --git a/src/cards/cover-card/controls/cover-buttons-control.ts b/src/cards/cover-card/controls/cover-buttons-control.ts
index ff2480c54..11faf7cc0 100644
--- a/src/cards/cover-card/controls/cover-buttons-control.ts
+++ b/src/cards/cover-card/controls/cover-buttons-control.ts
@@ -75,7 +75,6 @@ export class CoverButtonsControl extends LitElement {
                 ${supportsFeature(this.entity, COVER_SUPPORT_STOP)
                     ? html`
                           <mushroom-button
-                              icon="mdi:stop"
                               .disabled=${!isAvailable(this.entity)}
                               @click=${this._onStopTap}
                           >
diff --git a/src/cards/cover-card/cover-card.ts b/src/cards/cover-card/cover-card.ts
index 7c26bfc96..d647d1bb4 100644
--- a/src/cards/cover-card/cover-card.ts
+++ b/src/cards/cover-card/cover-card.ts
@@ -230,10 +230,7 @@ export class CoverCard extends MushroomBaseCard implements LovelaceCard {
         if (!this._nextControl || this._nextControl == this._activeControl) return nothing;
 
         return html`
-            <mushroom-button
-                .icon=${CONTROLS_ICONS[this._nextControl]}
-                @click=${this._onNextControlTap}
-            >
+            <mushroom-button @click=${this._onNextControlTap}>
                 <ha-icon .icon=${CONTROLS_ICONS[this._nextControl]}></ha-icon>
             </mushroom-button>
         `;
diff --git a/src/cards/media-player-card/controls/media-player-volume-control.ts b/src/cards/media-player-card/controls/media-player-volume-control.ts
index 91841dd28..9a047baaa 100644
--- a/src/cards/media-player-card/controls/media-player-volume-control.ts
+++ b/src/cards/media-player-card/controls/media-player-volume-control.ts
@@ -123,7 +123,6 @@ export class MediaPlayerVolumeControls extends LitElement {
                     ? html`
                           <mushroom-button
                               .action=${"volume_up"}
-                              icon="mdi:volume-plus"
                               .disabled=${!isAvailable(this.entity) || isOff(this.entity)}
                               @click=${this.handleClick}
                           >