diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlayerSongQueueAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlayerSongQueueAdapter.java
index 9a35fd92..1f7f12f6 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlayerSongQueueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlayerSongQueueAdapter.java
@@ -112,7 +112,7 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
         } else {
             holder.item.ratingIndicatorImageView.setVisibility(View.GONE);
         }
-        holder.item.playPauseButton.setOnClickListener(v -> {
+        holder.itemView.setOnClickListener(v -> {
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
                     MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
@@ -138,23 +138,19 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
     }
 
     private void bindPlaybackState(@NonNull PlayerSongQueueAdapter.ViewHolder holder, @NonNull Child song) {
-        boolean isCurrent = currentPlayingId != null && currentPlayingId.equals(song.getId()) && isPlaying;
+        boolean isCurrent = currentPlayingId != null && currentPlayingId.equals(song.getId());
 
         if (isCurrent) {
-            holder.item.playPauseButton.setVisibility(View.VISIBLE);
-            holder.item.playPauseButton.setChecked(true);
+            holder.item.playPauseIcon.setVisibility(View.VISIBLE);
+            if (isPlaying) {
+                holder.item.playPauseIcon.setImageResource(R.drawable.ic_pause);
+            } else {
+                holder.item.playPauseIcon.setImageResource(R.drawable.ic_play);
+            }
             holder.item.coverArtOverlay.setVisibility(View.VISIBLE);
         } else {
-            boolean sameIdPaused = currentPlayingId != null && currentPlayingId.equals(song.getId()) && !isPlaying;
-            if (sameIdPaused) {
-                holder.item.playPauseButton.setVisibility(View.VISIBLE);
-                holder.item.playPauseButton.setChecked(false);
-                holder.item.coverArtOverlay.setVisibility(View.VISIBLE);
-            } else {
-                holder.item.playPauseButton.setVisibility(View.GONE);
-                holder.item.playPauseButton.setChecked(false);
-                holder.item.coverArtOverlay.setVisibility(View.INVISIBLE);
-            }
+            holder.item.playPauseIcon.setVisibility(View.GONE);
+            holder.item.coverArtOverlay.setVisibility(View.INVISIBLE);
         }
     }
 
diff --git a/app/src/main/res/layout/item_player_queue_song.xml b/app/src/main/res/layout/item_player_queue_song.xml
index e5f5cdb3..baf28acc 100644
--- a/app/src/main/res/layout/item_player_queue_song.xml
+++ b/app/src/main/res/layout/item_player_queue_song.xml
@@ -31,18 +31,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ToggleButton
-        android:id="@+id/play_pause_button"
+    <ImageView
+        android:id="@+id/play_pause_icon"
         android:layout_width="28dp"
         android:layout_height="28dp"
-        android:layout_marginStart="14dp"
-        android:visibility="gone"
-        android:background="@drawable/button_play_pause_selector"
-        android:checked="false"
-        android:foreground="?android:attr/selectableItemBackgroundBorderless"
-        android:text=""
-        android:textOff=""
-        android:textOn=""
+        android:layout_gravity="center"
+        android:layout_margin="14dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />