diff --git a/app/src/main/java/org/jellyfin/mobile/player/ui/PlayerFragment.kt b/app/src/main/java/org/jellyfin/mobile/player/ui/PlayerFragment.kt
index 36aeeb743..33c47b3de 100644
--- a/app/src/main/java/org/jellyfin/mobile/player/ui/PlayerFragment.kt
+++ b/app/src/main/java/org/jellyfin/mobile/player/ui/PlayerFragment.kt
@@ -16,8 +16,8 @@ import android.view.ViewGroup
 import android.view.WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
 import android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
 import android.widget.ImageButton
-import android.widget.TextView
 import androidx.annotation.RequiresApi
+import androidx.appcompat.widget.Toolbar
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
@@ -57,7 +57,7 @@ class PlayerFragment : Fragment() {
     private var _playerControlsBinding: ExoPlayerControlViewBinding? = null
     private val playerControlsBinding: ExoPlayerControlViewBinding get() = _playerControlsBinding!!
     private val playerControlsView: View get() = playerControlsBinding.root
-    private val titleTextView: TextView get() = playerControlsBinding.trackTitle
+    private val toolbar: Toolbar get() = playerControlsBinding.toolbar
     private val fullscreenSwitcher: ImageButton get() = playerControlsBinding.fullscreenSwitcher
     private var playerMenus: PlayerMenus? = null
 
@@ -110,7 +110,7 @@ class PlayerFragment : Fragment() {
             }
 
             // Update title and player menus
-            titleTextView.text = jellyfinMediaSource.name
+            toolbar.title = jellyfinMediaSource.name
             playerMenus?.onQueueItemChanged(queueItem)
         }
 
@@ -158,6 +158,9 @@ class PlayerFragment : Fragment() {
             insets
         }
 
+        // Handle toolbar back button
+        toolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() }
+
         // Create playback menus
         playerMenus = PlayerMenus(this, playerBinding, playerControlsBinding)
 
diff --git a/app/src/main/res/layout/exo_player_control_view.xml b/app/src/main/res/layout/exo_player_control_view.xml
index c5bee0620..30814d62b 100644
--- a/app/src/main/res/layout/exo_player_control_view.xml
+++ b/app/src/main/res/layout/exo_player_control_view.xml
@@ -7,20 +7,17 @@
     android:layout_height="match_parent"
     android:background="@color/playback_controls_background">
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/track_title"
-        android:layout_width="match_parent"
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:padding="@dimen/exo_player_controls_display_padding"
-        android:paddingTop="16dp"
-        android:textColor="?android:textColorPrimary"
-        android:textSize="@dimen/exo_title_text_size"
-        android:textStyle="bold"
+        android:theme="@style/ThemeOverlay.App.BackButton"
+        app:contentInsetStartWithNavigation="0dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Star Wars: A New Hope" />
+        app:navigationIcon="?attr/homeAsUpIndicator"
+        tools:title="Star Wars: A New Hope" />
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/previous_button"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bc1a0f077..a709fc34e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,4 +12,9 @@
 
     <!-- Settings theme -->
     <style name="AppTheme.Settings" />
+
+    <!-- Theme Overlays -->
+    <style name="ThemeOverlay.App.BackButton" parent="">
+        <item name="colorControlNormal">?android:textColorPrimary</item>
+    </style>
 </resources>