diff --git a/src/components/PlayerCard.vue b/src/components/PlayerCard.vue
index 5d58a473a..f144a4db6 100644
--- a/src/components/PlayerCard.vue
+++ b/src/components/PlayerCard.vue
@@ -92,9 +92,8 @@
           style="font-size: 0.78rem; white-space: nowrap; line-height: 1.3"
         >
           <!-- player powered off -->
-          <div v-if="player.powered == false">
-            {{ $t("off") }}
-          </div>
+          <div v-if="player.powered == false"></div>
+
           <!-- artist + album -->
           <div
             v-else-if="
@@ -104,18 +103,16 @@
             {{ player.current_media.artist }} •
             {{ player.current_media.album }}
           </div>
+
           <!-- artist only -->
           <div v-else-if="player.current_media?.artist">
             {{ player.current_media.artist }}
           </div>
+
           <!-- album only -->
           <div v-else-if="player.current_media?.album">
             {{ player.current_media.album }}
           </div>
-          <!-- queue empty message -->
-          <div v-else-if="playerQueue?.items == 0">
-            {{ $t("queue_empty") }}
-          </div>
         </div>
       </template>
 
@@ -124,7 +121,9 @@
         <!-- power button -->
         <Button
           v-if="
-            player.power_control != PLAYER_CONTROL_NONE && allowPowerControl
+            player.power_control != PLAYER_CONTROL_NONE &&
+            allowPowerControl &&
+            !player.powered
           "
           variant="ghost-icon"
           size="icon"
@@ -465,10 +464,19 @@ watch(
   margin-left: 5px;
 }
 
+.player-command-btn.group-expand-btn {
+  margin-right: 3px;
+}
+
 .group-badge :deep(.v-badge__badge) {
-  font-size: 10px;
-  height: 14px;
-  min-width: 14px;
+  font-size: 13px;
+  height: 16px;
+  min-width: 16px;
   padding: 0 4px 0 4px;
+  background-color: #20272a !important;
+}
+
+.panel-item-selected .group-badge :deep(.v-badge__badge) {
+  background-color: #1c4a5e !important;
 }
 </style>
diff --git a/src/layouts/default/PlayerSelect.vue b/src/layouts/default/PlayerSelect.vue
index 265a9ec93..8e7551469 100644
--- a/src/layouts/default/PlayerSelect.vue
+++ b/src/layouts/default/PlayerSelect.vue
@@ -434,6 +434,26 @@ const selectDefaultPlayer = function () {
   background: transparent !important;
 }
 
+/* Decrease space above search bar */
+.player-content :deep(.v-expansion-panel .v-expansion-panel-title) {
+  padding-bottom: 0;
+}
+
+/* Prevent panel title from growing when opening */
+.player-content :deep(.v-expansion-panel--active > .v-expansion-panel-title) {
+  min-height: 48px;
+}
+
+/* Disable focus and hover color changes */
+.player-content
+  :deep(
+    .v-expansion-panel-title:focus-visible > .v-expansion-panel-title__overlay
+  ),
+.player-content
+  :deep(.v-expansion-panel-title:hover > .v-expansion-panel-title__overlay) {
+  opacity: 0;
+}
+
 .expansion :deep(.v-expansion-panel-title) {
   padding: 10px 16px;
 }