diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
index a038814e7..1359a0033 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
@@ -1115,16 +1115,13 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
     }
 
     private fun updatePlayPauseButton() {
-        if (exoPlayer.isPlaying) {
-            // video is playing
-            binding.playImageView.setImageResource(R.drawable.ic_pause)
-        } else if (exoPlayer.playbackState == Player.STATE_ENDED) {
-            // video has finished
-            binding.playImageView.setImageResource(R.drawable.ic_restart)
-        } else {
-            // player in any other state
-            binding.playImageView.setImageResource(R.drawable.ic_play)
-        }
+        binding.playImageView.setImageResource(
+            when {
+                exoPlayer.isPlaying -> R.drawable.ic_pause
+                exoPlayer.playbackState == Player.STATE_ENDED -> R.drawable.ic_restart
+                else -> R.drawable.ic_play
+            }
+        )
     }
 
     private fun initializeRelatedVideos(relatedStreams: List<StreamItem>?) {
diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
index 568b5ef5d..33a4f2502 100644
--- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
@@ -152,16 +152,12 @@ internal class CustomExoPlayerView(
         }
 
         binding.playPauseBTN.setOnClickListener {
-            if (player?.isPlaying == false) {
-                // start or go on playing
-                if (player?.playbackState == Player.STATE_ENDED) {
-                    // restart video if finished
+            when {
+                player?.isPlaying == false && player?.playbackState == Player.STATE_ENDED -> {
                     player?.seekTo(0)
                 }
-                player?.play()
-            } else {
-                // pause the video
-                player?.pause()
+                player?.isPlaying == false -> player?.play()
+                else -> player?.pause()
             }
         }
 
@@ -198,16 +194,13 @@ internal class CustomExoPlayerView(
     }
 
     private fun updatePlayPauseButton() {
-        if (player?.isPlaying == true) {
-            // video is playing
-            binding.playPauseBTN.setImageResource(R.drawable.ic_pause)
-        } else if (player?.playbackState == Player.STATE_ENDED) {
-            // video has finished
-            binding.playPauseBTN.setImageResource(R.drawable.ic_restart)
-        } else {
-            // player in any other state
-            binding.playPauseBTN.setImageResource(R.drawable.ic_play)
-        }
+        binding.playPauseBTN.setImageResource(
+            when {
+                player?.isPlaying == true -> R.drawable.ic_pause
+                player?.playbackState == Player.STATE_ENDED -> R.drawable.ic_restart
+                else -> R.drawable.ic_play
+            }
+        )
     }
 
     private fun cancelHideControllerTask() {