diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsPlayerScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsPlayerScreen.kt
index a0d397b60c..f91001cd4c 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsPlayerScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsPlayerScreen.kt
@@ -313,6 +313,7 @@ object SettingsPlayerScreen : SearchableSettings {
         val enablePip = playerPreferences.enablePip()
         val pipEpisodeToasts = playerPreferences.pipEpisodeToasts()
         val pipOnExit = playerPreferences.pipOnExit()
+        val pipReplaceWithPrevious = playerPreferences.pipReplaceWithPrevious()
 
         val isPipEnabled by enablePip.collectAsState()
 
@@ -333,6 +334,11 @@ object SettingsPlayerScreen : SearchableSettings {
                     title = stringResource(MR.strings.pref_pip_on_exit),
                     enabled = isPipEnabled,
                 ),
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = pipReplaceWithPrevious,
+                    title = stringResource(MR.strings.pref_pip_replace_with_previous),
+                    enabled = isPipEnabled,
+                ),
             ),
         )
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
index 06d761e00b..4777afe20a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
@@ -1,6 +1,7 @@
 package eu.kanade.tachiyomi
 
 import android.content.Context
+import android.os.Build
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import eu.kanade.domain.base.BasePreferences
@@ -16,6 +17,7 @@ import eu.kanade.tachiyomi.data.track.TrackerManager
 import eu.kanade.tachiyomi.network.NetworkPreferences
 import eu.kanade.tachiyomi.network.PREF_DOH_CLOUDFLARE
 import eu.kanade.tachiyomi.ui.player.settings.PlayerPreferences
+import eu.kanade.tachiyomi.ui.player.viewer.HwDecState
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.util.system.DeviceUtil
@@ -566,6 +568,10 @@ object Migrations {
                     filterPredicate = { it.key in prefsToReplace },
                     newKey = { Preference.appStateKey(it) },
                 )
+
+                if (Build.MODEL == "Subsystem for Android(TM)") {
+                    playerPreferences.hwDec().set(HwDecState.SW.mpvValue)
+                }
             }
             return true
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
index 6d9b370524..6070241d2a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
@@ -65,12 +65,13 @@ import eu.kanade.tachiyomi.ui.player.settings.sheets.subtitle.SubtitleSettingsSh
 import eu.kanade.tachiyomi.ui.player.settings.sheets.subtitle.toHexString
 import eu.kanade.tachiyomi.ui.player.viewer.ACTION_MEDIA_CONTROL
 import eu.kanade.tachiyomi.ui.player.viewer.AspectState
-import eu.kanade.tachiyomi.ui.player.viewer.CONTROL_TYPE_NEXT
-import eu.kanade.tachiyomi.ui.player.viewer.CONTROL_TYPE_PAUSE
-import eu.kanade.tachiyomi.ui.player.viewer.CONTROL_TYPE_PLAY
-import eu.kanade.tachiyomi.ui.player.viewer.CONTROL_TYPE_PREVIOUS
 import eu.kanade.tachiyomi.ui.player.viewer.EXTRA_CONTROL_TYPE
 import eu.kanade.tachiyomi.ui.player.viewer.GestureHandler
+import eu.kanade.tachiyomi.ui.player.viewer.PIP_NEXT
+import eu.kanade.tachiyomi.ui.player.viewer.PIP_PAUSE
+import eu.kanade.tachiyomi.ui.player.viewer.PIP_PLAY
+import eu.kanade.tachiyomi.ui.player.viewer.PIP_PREVIOUS
+import eu.kanade.tachiyomi.ui.player.viewer.PIP_SKIP
 import eu.kanade.tachiyomi.ui.player.viewer.PictureInPictureHandler
 import eu.kanade.tachiyomi.ui.player.viewer.PipState
 import eu.kanade.tachiyomi.ui.player.viewer.SeekState
@@ -86,6 +87,8 @@ import eu.kanade.tachiyomi.util.system.toast
 import eu.kanade.tachiyomi.util.view.setComposeContent
 import `is`.xyz.mpv.MPVLib
 import `is`.xyz.mpv.Utils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
@@ -397,7 +400,10 @@ class PlayerActivity : BaseActivity() {
             when (state.sheet) {
                 is PlayerViewModel.Sheet.ScreenshotOptions -> {
                     ScreenshotOptionsSheet(
-                        screenModel = PlayerSettingsScreenModel(viewModel.playerPreferences),
+                        screenModel = PlayerSettingsScreenModel(
+                            preferences = viewModel.playerPreferences,
+                            hasSubTracks = streams.subtitle.tracks.size > 1,
+                        ),
                         cachePath = cacheDir.path,
                         onSetAsCover = viewModel::setAsCover,
                         onShare = { viewModel.shareImage(it, player.timePos) },
@@ -511,8 +517,8 @@ class PlayerActivity : BaseActivity() {
                 is PlayerViewModel.Sheet.SubtitleSettings -> {
                     SubtitleSettingsSheet(
                         screenModel = PlayerSettingsScreenModel(
-                            viewModel.playerPreferences,
-                            streams.subtitle.tracks.size > 1,
+                            preferences = viewModel.playerPreferences,
+                            hasSubTracks = streams.subtitle.tracks.size > 1,
                         ),
                         onDismissRequest = pauseForDialogSheet(fadeControls = true),
                     )
@@ -621,19 +627,7 @@ class PlayerActivity : BaseActivity() {
                 MPVLib.setPropertyDouble("sub-delay", subtitlesDelay().get() / 1000.0)
             }
 
-            // TODO: I think this is a bad hack.
-            //  We need to find a way to let MPV access our fonts directory.
-            val storageManager: StorageManager = Injekt.get()
-            storageManager.getFontsDirectory()?.listFiles()?.forEach { font ->
-                val outFile = UniFile.fromFile(applicationContext.filesDir)?.createFile(font.name)
-                outFile?.let {
-                    font.openInputStream().copyTo(it.openOutputStream())
-                }
-            }
-            MPVLib.setPropertyString(
-                "sub-fonts-dir",
-                applicationContext.filesDir.path,
-            )
+            copyFontsDirectory()
 
             if (playerPreferences.subtitleFont().get().trim() != "") {
                 MPVLib.setPropertyString("sub-font", playerPreferences.subtitleFont().get())
@@ -653,6 +647,25 @@ class PlayerActivity : BaseActivity() {
         }
     }
 
+    private fun copyFontsDirectory() {
+        // TODO: I think this is a bad hack.
+        //  We need to find a way to let MPV directly access our fonts directory.
+        CoroutineScope(Dispatchers.IO).launchIO {
+            val storageManager: StorageManager = Injekt.get()
+            storageManager.getFontsDirectory()?.listFiles()?.forEach { font ->
+                val outFile = UniFile.fromFile(applicationContext.filesDir)?.createFile(font.name)
+                outFile?.let {
+                    font.openInputStream().copyTo(it.openOutputStream())
+                }
+            }
+            MPVLib.setPropertyString(
+                "sub-fonts-dir",
+                applicationContext.filesDir.path,
+            )
+            logcat { "FINISHED FONTS" }
+        }
+    }
+
     private fun setupPlayerBrightness() {
         val useDeviceBrightness =
             playerPreferences.playerBrightnessValue().get() == -1.0F ||
@@ -834,11 +847,7 @@ class PlayerActivity : BaseActivity() {
         super.onResume()
         refreshUi()
         if (pip.supportedAndEnabled && PipState.mode == PipState.ON) {
-            player.paused?.let {
-                pip.update(
-                    !it,
-                )
-            }
+            player.paused?.let { pip.update(!it) }
         }
     }
 
@@ -980,12 +989,8 @@ class PlayerActivity : BaseActivity() {
         val gestures = GestureHandler(this, deviceWidth.toFloat(), deviceHeight.toFloat())
         val mDetector = GestureDetectorCompat(this, gestures)
         player.setOnTouchListener { v, event ->
-            try { // TODO: https://issuetracker.google.com/issues/238920463 is fixed in API 34, but for now this will do
-                gestures.onTouch(v, event)
-                mDetector.onTouchEvent(event)
-            } catch (_: NullPointerException) {
-                false
-            }
+            gestures.onTouch(v, event)
+            mDetector.onTouchEvent(event)
         }
     }
 
@@ -1447,18 +1452,21 @@ class PlayerActivity : BaseActivity() {
                         return
                     }
                     when (intent.getIntExtra(EXTRA_CONTROL_TYPE, 0)) {
-                        CONTROL_TYPE_PLAY -> {
+                        PIP_PLAY -> {
                             player.paused = false
                         }
-                        CONTROL_TYPE_PAUSE -> {
+                        PIP_PAUSE -> {
                             player.paused = true
                         }
-                        CONTROL_TYPE_PREVIOUS -> {
+                        PIP_PREVIOUS -> {
                             changeEpisode(viewModel.getAdjacentEpisodeId(previous = true))
                         }
-                        CONTROL_TYPE_NEXT -> {
+                        PIP_NEXT -> {
                             changeEpisode(viewModel.getAdjacentEpisodeId(previous = false))
                         }
+                        PIP_SKIP -> {
+                            doubleTapSeek(time = 10)
+                        }
                     }
                 }
             }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt
index b9d5934b5e..47c309197f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt
@@ -305,7 +305,7 @@ class PlayerViewModel @JvmOverloads constructor(
     fun isEpisodeOnline(): Boolean? {
         val anime = currentAnime ?: return null
         val episode = currentEpisode ?: return null
-        return currentSource is AnimeHttpSource && !EpisodeLoader.isDownloaded(
+        return currentSource is AnimeHttpSource && !EpisodeLoader.isDownload(
             episode.toDomainEpisode()!!,
             anime,
         )
@@ -379,8 +379,8 @@ class PlayerViewModel @JvmOverloads constructor(
 
         val nextEpisode = this.currentPlaylist[getCurrentEpisodeIndex() + 1]
         val episodesAreDownloaded =
-            EpisodeLoader.isDownloaded(currentEpisode.toDomainEpisode()!!, anime) &&
-                EpisodeLoader.isDownloaded(nextEpisode.toDomainEpisode()!!, anime)
+            EpisodeLoader.isDownload(currentEpisode.toDomainEpisode()!!, anime) &&
+                EpisodeLoader.isDownload(nextEpisode.toDomainEpisode()!!, anime)
 
         viewModelScope.launchIO {
             if (!episodesAreDownloaded) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/loader/EpisodeLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/loader/EpisodeLoader.kt
index 269de89954..49e6186419 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/loader/EpisodeLoader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/loader/EpisodeLoader.kt
@@ -29,16 +29,9 @@ class EpisodeLoader {
          * @param source the source of the anime.
          */
         suspend fun getLinks(episode: Episode, anime: Anime, source: AnimeSource): List<Video> {
-            val downloadManager: AnimeDownloadManager = Injekt.get()
-            val isDownloaded = downloadManager.isEpisodeDownloaded(
-                episode.name,
-                episode.scanlator,
-                anime.title,
-                anime.source,
-                skipCache = true,
-            )
+            val isDownloaded = isDownload(episode, anime)
             return when {
-                isDownloaded -> isDownloaded(episode, anime, source, downloadManager)
+                isDownloaded -> isDownload(episode, anime, source)
                 source is AnimeHttpSource -> isHttp(episode, source)
                 source is LocalAnimeSource -> isLocal(episode)
                 else -> error("source not supported")
@@ -51,7 +44,7 @@ class EpisodeLoader {
          * @param episode the episode being parsed.
          * @param anime the anime of the episode.
          */
-        fun isDownloaded(episode: Episode, anime: Anime): Boolean {
+        fun isDownload(episode: Episode, anime: Anime): Boolean {
             val downloadManager: AnimeDownloadManager = Injekt.get()
             return downloadManager.isEpisodeDownloaded(
                 episode.name,
@@ -90,14 +83,13 @@ class EpisodeLoader {
          * @param episode the episode being parsed.
          * @param anime the anime of the episode.
          * @param source the source of the anime.
-         * @param downloadManager the AnimeDownloadManager instance to use.
          */
-        private fun isDownloaded(
+        private fun isDownload(
             episode: Episode,
             anime: Anime,
             source: AnimeSource,
-            downloadManager: AnimeDownloadManager,
         ): List<Video> {
+            val downloadManager: AnimeDownloadManager = Injekt.get()
             return try {
                 val video = downloadManager.buildVideo(source, anime, episode)
                 listOf(video)
@@ -111,7 +103,7 @@ class EpisodeLoader {
          *
          * @param episode the episode being parsed.
          */
-        private suspend fun isLocal(
+        private fun isLocal(
             episode: Episode,
         ): List<Video> {
             return try {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerPreferences.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerPreferences.kt
index d0d4b92294..27374acff2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerPreferences.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerPreferences.kt
@@ -15,6 +15,7 @@ class PlayerPreferences(
     fun enablePip() = preferenceStore.getBoolean("pref_enable_pip", true)
     fun pipEpisodeToasts() = preferenceStore.getBoolean("pref_pip_episode_toasts", true)
     fun pipOnExit() = preferenceStore.getBoolean("pref_pip_on_exit", false)
+    fun pipReplaceWithPrevious() = preferenceStore.getBoolean("pip_replace_with_previous", false)
 
     fun rememberPlayerBrightness() = preferenceStore.getBoolean("pref_remember_brightness", false)
     fun playerBrightnessValue() = preferenceStore.getFloat("player_brightness_value", -1.0F)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerSettingsScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerSettingsScreenModel.kt
index ece7031059..e16cdb5c92 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerSettingsScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/PlayerSettingsScreenModel.kt
@@ -46,7 +46,7 @@ val sheetDialogPadding = PaddingValues(
 
 class PlayerSettingsScreenModel(
     val preferences: PlayerPreferences = Injekt.get(),
-    private val hasSubTracks: Boolean = true,
+    val hasSubTracks: Boolean = true,
 ) : ScreenModel {
 
     fun togglePreference(preference: (PlayerPreferences) -> Preference<Boolean>) =
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/dialogs/DefaultDecoderDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/dialogs/DefaultDecoderDialog.kt
deleted file mode 100644
index 3dacdfd043..0000000000
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/dialogs/DefaultDecoderDialog.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package eu.kanade.tachiyomi.ui.player.settings.dialogs
-
-import android.os.Build
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import eu.kanade.tachiyomi.ui.player.viewer.HwDecState
-import tachiyomi.i18n.MR
-import tachiyomi.presentation.core.components.RadioItem
-
-@Composable
-fun DefaultDecoderDialog(
-    currentDecoder: String,
-    onSelectDecoder: (String) -> Unit,
-    onDismissRequest: () -> Unit,
-) {
-    val items = mutableListOf(
-        Pair("${HwDecState.HW.title} (${HwDecState.HW.mpvValue})", HwDecState.HW.mpvValue),
-        Pair(HwDecState.SW.title, HwDecState.SW.mpvValue),
-    )
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-        items.add(
-            index = 0,
-            Pair(
-                "${HwDecState.HW_PLUS.title} (${HwDecState.HW_PLUS.mpvValue})",
-                HwDecState.HW_PLUS.mpvValue,
-            ),
-        )
-    }
-
-    fun selectDecoder(decoder: String) {
-        onSelectDecoder(decoder)
-        onDismissRequest()
-    }
-
-    PlayerDialog(
-        titleRes = MR.strings.player_hwdec_mode,
-        modifier = Modifier.fillMaxWidth(fraction = 0.8F),
-        onDismissRequest = onDismissRequest,
-    ) {
-        Column {
-            items.forEach {
-                Spacer(Modifier.height(16.dp))
-                RadioItem(
-                    label = it.first,
-                    selected = it.second == currentDecoder,
-                    onClick = { selectDecoder(it.second) },
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/PlayerSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/PlayerSettingsSheet.kt
index 589030782c..8549f7142d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/PlayerSettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/PlayerSettingsSheet.kt
@@ -134,7 +134,7 @@ fun PlayerSettingsSheet(
                     modifier = Modifier.padding(vertical = MaterialTheme.padding.tiny),
                     horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
                 ) {
-                    PlayerStatsPage.values().forEach {
+                    PlayerStatsPage.entries.forEach {
                         FilterChip(
                             selected = statisticsPage == it.page,
                             onClick = { togglePlayerStatsPage(it.page) },
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/ScreenshotOptionsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/ScreenshotOptionsSheet.kt
index 76503067ee..91875aeba4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/ScreenshotOptionsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/ScreenshotOptionsSheet.kt
@@ -10,24 +10,18 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Photo
 import androidx.compose.material.icons.outlined.Save
 import androidx.compose.material.icons.outlined.Share
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.components.AdaptiveSheet
 import eu.kanade.tachiyomi.ui.player.settings.PlayerSettingsScreenModel
 import eu.kanade.tachiyomi.ui.player.settings.dialogs.PlayerDialog
 import tachiyomi.i18n.MR
+import tachiyomi.presentation.core.components.ActionButton
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.stringResource
 import tachiyomi.presentation.core.util.collectAsState
@@ -80,13 +74,15 @@ fun ScreenshotOptionsSheet(
                 )
             }
 
-            screenModel.ToggleableRow(
-                textRes = MR.strings.screenshot_show_subs,
-                paddingValues = PaddingValues(MaterialTheme.padding.medium),
-                isChecked = showSubtitles.collectAsState().value,
-                onClick = { screenModel.togglePreference { showSubtitles } },
-                coloredText = true,
-            )
+            if (screenModel.hasSubTracks) {
+                screenModel.ToggleableRow(
+                    textRes = MR.strings.screenshot_show_subs,
+                    paddingValues = PaddingValues(MaterialTheme.padding.medium),
+                    isChecked = showSubtitles.collectAsState().value,
+                    onClick = { screenModel.togglePreference { showSubtitles } },
+                    coloredText = true,
+                )
+            }
         }
     }
 
@@ -106,33 +102,3 @@ fun ScreenshotOptionsSheet(
         )
     }
 }
-
-// TODO: (Merge_Change) function is to be removed once added in merge
-//  "package tachiyomi.presentation.core.components"
-
-@Composable
-private fun ActionButton(
-    modifier: Modifier = Modifier,
-    title: String,
-    icon: ImageVector,
-    onClick: () -> Unit,
-) {
-    TextButton(
-        modifier = modifier,
-        onClick = onClick,
-    ) {
-        Column(
-            verticalArrangement = Arrangement.spacedBy(4.dp),
-            horizontalAlignment = Alignment.CenterHorizontally,
-        ) {
-            Icon(
-                imageVector = icon,
-                contentDescription = null,
-            )
-            Text(
-                text = title,
-                textAlign = TextAlign.Center,
-            )
-        }
-    }
-}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/StreamsCatalogSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/StreamsCatalogSheet.kt
index 8cfb35b6d6..c04a2fc82e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/StreamsCatalogSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/settings/sheets/StreamsCatalogSheet.kt
@@ -34,7 +34,7 @@ import eu.kanade.tachiyomi.animesource.model.Track
 import eu.kanade.tachiyomi.ui.player.PlayerViewModel
 import eu.kanade.tachiyomi.ui.player.settings.sheetDialogPadding
 import `is`.xyz.mpv.MPVLib
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import tachiyomi.core.i18n.stringResource
 import tachiyomi.i18n.MR
 import tachiyomi.presentation.core.components.material.padding
@@ -62,7 +62,7 @@ fun StreamsCatalogSheet(
 
     TabbedDialog(
         onDismissRequest = onDismissRequest,
-        tabTitles = tabTitles.toPersistentList(),
+        tabTitles = tabTitles.toImmutableList(),
         onOverflowMenuClicked = onSettingsClicked,
         overflowIcon = Icons.Outlined.Settings,
         hideSystemBars = true,
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/PictureInPictureHandler.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/PictureInPictureHandler.kt
index 0cfb9a0b21..4d7ab0d1fa 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/PictureInPictureHandler.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/PictureInPictureHandler.kt
@@ -43,19 +43,21 @@ class PictureInPictureHandler(
         titleRes: StringResource,
         requestCode: Int,
         controlType: Int,
+        isEnabled: Boolean = true,
     ): RemoteAction {
-        return RemoteAction(
+        val action = RemoteAction(
             Icon.createWithResource(activity, iconResId),
             activity.stringResource(titleRes),
             activity.stringResource(titleRes),
             PendingIntent.getBroadcast(
                 activity,
                 requestCode,
-                Intent(ACTION_MEDIA_CONTROL)
-                    .putExtra(EXTRA_CONTROL_TYPE, controlType),
+                Intent(ACTION_MEDIA_CONTROL).putExtra(EXTRA_CONTROL_TYPE, controlType),
                 PendingIntent.FLAG_IMMUTABLE,
             ),
         )
+        action.isEnabled = isEnabled
+        return action
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
@@ -72,37 +74,50 @@ class PictureInPictureHandler(
                 activity.player.videoAspect!!.times(10000).toInt()
             }
         }
+        val plCount = activity.viewModel.currentPlaylist.size
+        val plPos = activity.viewModel.getCurrentEpisodeIndex()
         val mPictureInPictureParams = PictureInPictureParams.Builder()
             // Set action items for the picture-in-picture mode. These are the only custom controls
             // available during the picture-in-picture mode.
             .setActions(
                 arrayListOf(
-                    createRemoteAction(
-                        R.drawable.ic_skip_previous_24dp,
-                        MR.strings.action_previous_episode,
-                        CONTROL_TYPE_PREVIOUS,
-                        REQUEST_PREVIOUS,
-                    ),
+                    if (activity.playerPreferences.pipReplaceWithPrevious().get()) {
+                        createRemoteAction(
+                            R.drawable.ic_skip_previous_24dp,
+                            MR.strings.action_previous_episode,
+                            PIP_PREVIOUS,
+                            PIP_PREVIOUS,
+                            plPos != 0,
+                        )
+                    } else {
+                        createRemoteAction(
+                            R.drawable.ic_forward_10_24dp,
+                            MR.strings.pref_skip_10,
+                            PIP_SKIP,
+                            PIP_SKIP,
+                        )
+                    },
                     if (playing) {
                         createRemoteAction(
                             R.drawable.ic_pause_24dp,
                             MR.strings.action_pause,
-                            CONTROL_TYPE_PAUSE,
-                            REQUEST_PAUSE,
+                            PIP_PAUSE,
+                            PIP_PAUSE,
                         )
                     } else {
                         createRemoteAction(
                             R.drawable.ic_play_arrow_24dp,
                             MR.strings.action_play,
-                            CONTROL_TYPE_PLAY,
-                            REQUEST_PLAY,
+                            PIP_PLAY,
+                            PIP_PLAY,
                         )
                     },
                     createRemoteAction(
                         R.drawable.ic_skip_next_24dp,
                         MR.strings.action_next_episode,
-                        CONTROL_TYPE_NEXT,
-                        REQUEST_NEXT,
+                        PIP_NEXT,
+                        PIP_NEXT,
+                        plPos != plCount - 1,
                     ),
                 ),
             )
@@ -113,15 +128,11 @@ class PictureInPictureHandler(
     }
 }
 
-private const val REQUEST_PLAY = 1
-private const val REQUEST_PAUSE = 2
-private const val REQUEST_PREVIOUS = 3
-private const val REQUEST_NEXT = 4
-
-internal const val CONTROL_TYPE_PLAY = 1
-internal const val CONTROL_TYPE_PAUSE = 2
-internal const val CONTROL_TYPE_PREVIOUS = 3
-internal const val CONTROL_TYPE_NEXT = 4
+internal const val PIP_PLAY = 1
+internal const val PIP_PAUSE = 2
+internal const val PIP_PREVIOUS = 3
+internal const val PIP_NEXT = 4
+internal const val PIP_SKIP = 5
 
 internal const val ACTION_MEDIA_CONTROL = "media_control"
 internal const val EXTRA_CONTROL_TYPE = "control_type"
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/PlayerEnums.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/PlayerEnums.kt
index 6ad5a345a8..ef4509045a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/PlayerEnums.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/player/viewer/PlayerEnums.kt
@@ -62,7 +62,13 @@ enum class HwDecState(val title: String, val mpvValue: String) {
     companion object {
         internal val isHwSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
 
-        internal val defaultHwDec = if (isHwSupported) HW_PLUS else HW
+        private val isWSA = Build.MODEL == "Subsystem for Android(TM)"
+
+        internal val defaultHwDec = when {
+            isHwSupported -> HW_PLUS
+            isWSA -> SW
+            else -> HW
+        }
     }
 }
 
diff --git a/app/src/main/res/drawable/ic_forward_10_24dp.xml b/app/src/main/res/drawable/ic_forward_10_24dp.xml
new file mode 100644
index 0000000000..e04eb24423
--- /dev/null
+++ b/app/src/main/res/drawable/ic_forward_10_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path android:fillColor="#000" android:pathData="M18,13c0,3.31 -2.69,6 -6,6s-6,-2.69 -6,-6s2.69,-6 6,-6v4l5,-5l-5,-5v4c-4.42,0 -8,3.58 -8,8c0,4.42 3.58,8 8,8s8,-3.58 8,-8H18z"/>
+    <path android:fillColor="#000" android:pathData="M10.86,15.94l0,-4.27l-0.09,0l-1.77,0.63l0,0.69l1.01,-0.31l0,3.26z"/>
+    <path android:fillColor="#000" android:pathData="M12.25,13.44v0.74c0,1.9 1.31,1.82 1.44,1.82c0.14,0 1.44,0.09 1.44,-1.82v-0.74c0,-1.9 -1.31,-1.82 -1.44,-1.82C13.55,11.62 12.25,11.53 12.25,13.44zM14.29,13.32v0.97c0,0.77 -0.21,1.03 -0.59,1.03c-0.38,0 -0.6,-0.26 -0.6,-1.03v-0.97c0,-0.75 0.22,-1.01 0.59,-1.01C14.07,12.3 14.29,12.57 14.29,13.32z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_fullscreen_black_20dp.xml b/app/src/main/res/drawable/ic_fullscreen_black_20dp.xml
index 5821762c2d..61a16eb980 100644
--- a/app/src/main/res/drawable/ic_fullscreen_black_20dp.xml
+++ b/app/src/main/res/drawable/ic_fullscreen_black_20dp.xml
@@ -2,8 +2,7 @@
     android:width="20dp"
     android:height="20dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
       android:fillColor="#000"
       android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
diff --git a/i18n/src/commonMain/resources/MR/base/strings-aniyomi.xml b/i18n/src/commonMain/resources/MR/base/strings-aniyomi.xml
index e7e35aa975..d8573ad060 100644
--- a/i18n/src/commonMain/resources/MR/base/strings-aniyomi.xml
+++ b/i18n/src/commonMain/resources/MR/base/strings-aniyomi.xml
@@ -122,6 +122,7 @@
     <string name="pref_enable_pip">Enable the use of PiP mode</string>
     <string name="pref_pip_episode_toasts">Show episode toasts when switching episodes in PiP mode</string>
     <string name="pref_pip_on_exit">Automatically switch to PiP mode on exiting the player</string>
+    <string name="pref_pip_replace_with_previous">Replaces the "Skip 10 seconds" option with "Previous episode"</string>
     <string name="pref_remember_brightness">Remember and switch to the last used brightness</string>
     <string name="pref_remember_volume">Remember and switch to the last used volume</string>
     <string name="pref_mpv_conf">Edit MPV configuration file for further player settings</string>