diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
index 42b056852c..9c18ba7086 100644
--- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts
+++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts
@@ -301,6 +301,9 @@ export class HaDeviceEntitiesCard extends LitElement {
       height: 40px;
       --mdc-ripple-color: transparent;
     }
+    .card-actions {
+      padding: 4px 16px 4px 4px;
+    }
   `;
 }
 
diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts
index cdc4c18d95..2fb0eaea48 100644
--- a/src/panels/config/devices/ha-config-device-page.ts
+++ b/src/panels/config/devices/ha-config-device-page.ts
@@ -1622,6 +1622,7 @@ export class HaConfigDevicePage extends LitElement {
           display: flex;
           justify-content: space-between;
           align-items: center;
+          padding: 4px 16px 4px 4px;
         }
       `,
     ];
diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts
index 871e5fdca4..81d34941ae 100644
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -28,8 +28,6 @@ import { showDeviceRegistryDetailDialog } from "../devices/device-registry-detai
 import "./entity-registry-settings-editor";
 import type { EntityRegistrySettingsEditor } from "./entity-registry-settings-editor";
 
-const invalidDomainUpdate = false;
-
 @customElement("entity-registry-settings")
 export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -142,10 +140,7 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
         >
           ${this.hass.localize("ui.dialogs.entity_registry.editor.delete")}
         </ha-button>
-        <ha-button
-          @click=${this._updateEntry}
-          .disabled=${invalidDomainUpdate || this._submitting}
-        >
+        <ha-button @click=${this._updateEntry} .loading=${!!this._submitting}>
           ${this.hass.localize("ui.dialogs.entity_registry.editor.update")}
         </ha-button>
       </div>
diff --git a/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts b/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts
index 5b33d1fdb7..b2d70b2a93 100644
--- a/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts
+++ b/src/panels/developer-tools/yaml_configuration/developer-yaml-config.ts
@@ -267,6 +267,7 @@ export class DeveloperYamlConfig extends LitElement {
         .card-actions {
           display: flex;
           justify-content: space-between;
+          padding: 4px;
         }
       `,
     ];
diff --git a/src/panels/media-browser/ha-bar-media-player.ts b/src/panels/media-browser/ha-bar-media-player.ts
index 718616840c..22cc0c0997 100644
--- a/src/panels/media-browser/ha-bar-media-player.ts
+++ b/src/panels/media-browser/ha-bar-media-player.ts
@@ -20,13 +20,13 @@ import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
 import { supportsFeature } from "../../common/entity/supports-feature";
 import { debounce } from "../../common/util/debounce";
-import "../../components/ha-slider";
 import "../../components/ha-button";
 import "../../components/ha-button-menu";
-import "../../components/ha-spinner";
 import "../../components/ha-domain-icon";
 import "../../components/ha-icon-button";
 import "../../components/ha-list-item";
+import "../../components/ha-slider";
+import "../../components/ha-spinner";
 import "../../components/ha-state-icon";
 import "../../components/ha-svg-icon";
 import { UNAVAILABLE } from "../../data/entity";
@@ -322,22 +322,17 @@ export class BarMediaPlayer extends SubscribeMixin(LitElement) {
                     </ha-icon-button>
                   `
                 : html`
-                    <ha-button
-                      slot="trigger"
-                      .label=${this.narrow
-                        ? nothing
-                        : `${
-                            stateObj
-                              ? computeStateName(stateObj)
-                              : this.entityId
-                          }
-                `}
-                    >
-                      <span slot="icon">
+                    <ha-button slot="trigger">
+                      <span slot="start">
                         ${this._renderIcon(isBrowser, stateObj)}
                       </span>
+                      ${this.narrow
+                        ? nothing
+                        : stateObj
+                          ? computeStateName(stateObj)
+                          : this.entityId}
                       <ha-svg-icon
-                        slot="trailingIcon"
+                        slot="end"
                         .path=${mdiChevronDown}
                       ></ha-svg-icon>
                     </ha-button>