diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c8d2f6ce49..566753178d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -69,6 +69,8 @@ android {
         resValue("string", "commit_hash", getGitCommitHash())
         resValue("bool", "is_prerelease", "false")
 
+        manifestPlaceholders["target_sdk_version"] = libs.versions.targetSdk.get()
+
         // Reads local.properties
         val localProperties = gradleLocalProperties(rootDir, project.providers)
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4dda33a7e9..983fdca7fc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,7 +49,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:targetApi="35">
+        tools:targetApi="${target_sdk_version}">
 
         <meta-data
             android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index bfc0e80830..5fc1422c27 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -120,6 +120,7 @@ import com.lagradost.cloudstream3.ui.search.SearchResultBuilder
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
 import com.lagradost.cloudstream3.ui.settings.SettingsGeneral
@@ -162,12 +163,14 @@ import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SnackbarHelper.showSnackbar
 import com.lagradost.cloudstream3.utils.UIHelper.changeStatusBarState
 import com.lagradost.cloudstream3.utils.UIHelper.checkWrite
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.enableEdgeToEdgeCompat
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getResourceColor
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.requestRW
+import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
 import com.lagradost.cloudstream3.utils.USER_SELECTED_HOMEPAGE_API
@@ -539,25 +542,14 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             layoutParams = params
         }*/
 
-        val landscape = when (resources.configuration.orientation) {
-            Configuration.ORIENTATION_LANDSCAPE -> {
-                true
-            }
-
-            Configuration.ORIENTATION_PORTRAIT -> {
-                isLayout(TV or EMULATOR)
-            }
-
-            else -> {
-                false
-            }
-        }
-
         binding?.apply {
-            navRailView.isVisible = isNavVisible && landscape
-            navView.isVisible = isNavVisible && !landscape
-            navHostFragment.layoutParams = (navHostFragment.layoutParams as ViewGroup.MarginLayoutParams).apply {
-                marginStart = if (isNavVisible && landscape && isLayout(TV or EMULATOR)) 62.toPx else 0
+            navRailView.isVisible = isNavVisible && isLandscape()
+            navView.isVisible = isNavVisible && !isLandscape()
+            navHostFragment.apply {
+                val marginPx = resources.getDimensionPixelSize(R.dimen.nav_rail_view_width)
+                layoutParams = (navHostFragment.layoutParams as ViewGroup.MarginLayoutParams).apply {
+                    marginStart = if (isNavVisible && isLandscape() && isLayout(TV or EMULATOR)) marginPx else 0
+                }
             }
 
             /**
@@ -1185,6 +1177,8 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
         MainAPI.settingsForProvider = settingsForProvider
 
         loadThemes(this)
+        enableEdgeToEdgeCompat()
+        setNavigationBarColorCompat(R.attr.primaryGrayBackground)
         updateLocale()
         super.onCreate(savedInstanceState)
         try {
@@ -1268,6 +1262,20 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             null
         }
 
+        fixSystemBarsPadding(
+            binding?.navView,
+            heightResId = R.dimen.nav_view_height,
+            padTop = false,
+            overlayCutout = false
+        )
+
+        fixSystemBarsPadding(
+            binding?.navRailView,
+            widthResId = R.dimen.nav_rail_view_width,
+            padRight = false,
+            padTop = false
+        )
+
         // overscan
         val padding = settingsManager.getInt(getString(R.string.overscan_key), 0).toPx
         binding?.homeRoot?.setPadding(padding, padding, padding, padding)
@@ -1650,9 +1658,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             if (navDestination.matchDestination(R.id.navigation_home)) {
                 attachBackPressedCallback("MainActivity") {
                     showConfirmExitDialog(settingsManager)
-                    @Suppress("DEPRECATION")
-                    window?.navigationBarColor =
-                        colorFromAttribute(R.attr.primaryGrayBackground)
+                    setNavigationBarColorCompat(R.attr.primaryGrayBackground)
                     updateLocale()
                 }
             } else detachBackPressedCallback("MainActivity")
@@ -2021,8 +2027,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
             this,
             object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() {
-                    @Suppress("DEPRECATION")
-                    window?.navigationBarColor = colorFromAttribute(R.attr.primaryGrayBackground)
+                    setNavigationBarColorCompat(R.attr.primaryGrayBackground)
                     updateLocale()
 
                     // If we don't disable we end up in a loop with default behavior calling
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
index a0647219e5..61193ea18e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/account/AccountSelectActivity.kt
@@ -31,8 +31,10 @@ import com.lagradost.cloudstream3.utils.BiometricAuthenticator.startBiometricAut
 import com.lagradost.cloudstream3.utils.DataStoreHelper.accounts
 import com.lagradost.cloudstream3.utils.DataStoreHelper.selectedKeyIndex
 import com.lagradost.cloudstream3.utils.DataStoreHelper.setAccount
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.UIHelper.enableEdgeToEdgeCompat
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.openActivity
+import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
 
 class AccountSelectActivity : FragmentActivity(), BiometricCallback {
 
@@ -43,8 +45,8 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
         super.onCreate(savedInstanceState)
         loadThemes(this)
 
-        @Suppress("DEPRECATION")
-        window.navigationBarColor = colorFromAttribute(R.attr.primaryBlackBackground)
+        enableEdgeToEdgeCompat()
+        setNavigationBarColorCompat(R.attr.primaryBlackBackground)
 
         // Are we editing and coming from MainActivity?
         val isEditingFromMainActivity = intent.getBooleanExtra(
@@ -105,6 +107,7 @@ class AccountSelectActivity : FragmentActivity(), BiometricCallback {
 
         val binding = ActivityAccountSelectBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        fixSystemBarsPadding(binding.root, padTop = false)
 
         val recyclerView: AutofitRecyclerView = binding.accountRecyclerView
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt
index 1f5b9e337f..d255272ce9 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadChildFragment.kt
@@ -18,10 +18,12 @@ import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
+import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.setAppBarNoScrollFlagsOnTV
 
 class DownloadChildFragment : Fragment() {
@@ -162,7 +164,11 @@ class DownloadChildFragment : Fragment() {
         }
 
         context?.let { downloadsViewModel.updateChildList(it, folder) }
-        fixPaddingStatusbar(binding?.downloadChildRoot)
+        fixSystemBarsPadding(
+            binding?.downloadChildRoot,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
     }
 
     private fun handleSelectedChange(selected: MutableSet<Int>) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
index 2010fe7e36..38e5d3ac72 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/download/DownloadFragment.kt
@@ -38,7 +38,9 @@ import com.lagradost.cloudstream3.ui.player.LinkGenerator
 import com.lagradost.cloudstream3.ui.player.OfflinePlaybackHelper.playUri
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
+import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
@@ -46,7 +48,7 @@ import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPres
 import com.lagradost.cloudstream3.utils.DOWNLOAD_EPISODE_CACHE
 import com.lagradost.cloudstream3.utils.DataStore.getFolderName
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.setAppBarNoScrollFlagsOnTV
@@ -236,7 +238,11 @@ class DownloadFragment : Fragment() {
         }
 
         context?.let { downloadsViewModel.updateHeaderList(it) }
-        fixPaddingStatusbar(binding?.downloadRoot)
+        fixSystemBarsPadding(
+            binding?.downloadRoot,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
     }
 
     private fun handleItemClick(click: DownloadHeaderClickEvent) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
index 2498bcf87f..a91cc2d011 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt
@@ -55,6 +55,7 @@ import com.lagradost.cloudstream3.ui.search.SearchHelper.handleSearchClickCallba
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
@@ -70,6 +71,7 @@ import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getFlagFromIso
 import com.lagradost.cloudstream3.utils.TvChannelUtils
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
@@ -642,6 +644,12 @@ class HomeFragment : Fragment() {
         context?.let { HomeChildItemAdapter.updatePosterSize(it) }
 
         binding?.apply {
+            fixSystemBarsPadding(
+                root,
+                padTop = false,
+                padBottom = isLandscape(),
+                padLeft = isLayout(TV or EMULATOR)
+            )
             //homeChangeApiLoading.setOnClickListener(apiChangeClickListener)
             //homeChangeApiLoading.setOnClickListener(apiChangeClickListener)
             homeApiFab.setOnClickListener(apiChangeClickListener)
@@ -666,7 +674,6 @@ class HomeFragment : Fragment() {
                 homeViewModel, accountViewModel
             )
             homeMasterRecycler.adapter = homeMasterAdapter
-            //fixPaddingStatusbar(homeLoadingStatusbar)
 
             homeApiFab.isVisible = isLayout(PHONE)
 
@@ -849,10 +856,6 @@ class HomeFragment : Fragment() {
             }
         }
 
-
-        //context?.fixPaddingStatusbarView(home_statusbar)
-        //context?.fixPaddingStatusbar(home_padding)
-
         observeNullable(homeViewModel.popup) { item ->
             if (item == null) {
                 bottomSheetDialog?.dismissSafe()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
index ad68ca4d20..fb88c00465 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeParentItemAdapterPreview.kt
@@ -456,6 +456,7 @@ class HomeParentItemAdapterPreview(
                 nextLeft = R.id.nav_rail_view,
                 nextRight = FOCUS_SELF
             )
+
             bookmarkRecyclerView.setLinearListLayout(
                 nextLeft = R.id.nav_rail_view,
                 nextRight = FOCUS_SELF
@@ -602,9 +603,7 @@ class HomeParentItemAdapterPreview(
                     params.height = 0
                     layoutParams = params
                 }
-            } else {
-                fixPaddingStatusbarView(homeNonePadding)
-            }
+            } else fixPaddingStatusbarView(homeNonePadding)
 
             when (preview) {
                 is Resource.Success -> {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
index 7c87542afe..cde40f176e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeScrollAdapter.kt
@@ -1,6 +1,5 @@
 package com.lagradost.cloudstream3.ui.home
 
-import android.content.res.Configuration
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,6 +12,7 @@ import com.lagradost.cloudstream3.ui.NoStateAdapter
 import com.lagradost.cloudstream3.ui.ViewHolderState
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 
@@ -40,11 +40,9 @@ class HomeScrollAdapter(
     ) {
         val binding = holder.view
         val itemView = holder.itemView
-        val isHorizontal =
-            binding is HomeScrollViewTvBinding || itemView.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
 
         val posterUrl =
-            if (isHorizontal) item.backgroundPosterUrl ?: item.posterUrl else item.posterUrl
+            if (isLandscape()) item.backgroundPosterUrl ?: item.posterUrl else item.posterUrl
                 ?: item.backgroundPosterUrl
 
         when (binding) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
index bd8876ba44..fdf31aba07 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/library/LibraryFragment.kt
@@ -52,13 +52,14 @@ import com.lagradost.cloudstream3.ui.search.SEARCH_ACTION_SHOW_METADATA
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadResult
 import com.lagradost.cloudstream3.utils.AppContextUtils.loadSearchResult
 import com.lagradost.cloudstream3.utils.AppContextUtils.reduceDragSensitivity
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.math.abs
@@ -150,7 +151,11 @@ class LibraryFragment : Fragment() {
     @SuppressLint("ResourceType", "CutPasteId")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        fixPaddingStatusbar(binding?.searchStatusBarPadding)
+        fixSystemBarsPadding(
+            binding?.root,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
 
         binding?.sortFab?.setOnClickListener(sortChangeClickListener)
         binding?.librarySort?.setOnClickListener(sortChangeClickListener)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
index 7fc297235a..a3a9b7125e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/DownloadedPlayerActivity.kt
@@ -11,6 +11,7 @@ import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.ui.player.OfflinePlaybackHelper.playLink
 import com.lagradost.cloudstream3.ui.player.OfflinePlaybackHelper.playUri
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
+import com.lagradost.cloudstream3.utils.UIHelper.enableEdgeToEdgeCompat
 
 class DownloadedPlayerActivity : AppCompatActivity() {
     private val dTAG = "DownloadedPlayerAct"
@@ -30,6 +31,7 @@ class DownloadedPlayerActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         CommonActivity.loadThemes(this)
         CommonActivity.init(this)
+        enableEdgeToEdgeCompat()
         setContentView(R.layout.empty_layout)
         Log.i(dTAG, "onCreate")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
index 9f9bc1ac71..6bc0966fd7 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/FullScreenPlayer.kt
@@ -73,6 +73,7 @@ import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPres
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getNavigationBarHeight
 import com.lagradost.cloudstream3.utils.UIHelper.getStatusBarHeight
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
@@ -550,10 +551,11 @@ open class FullScreenPlayer : AbstractPlayerFragment() {
         val binding = SubtitleOffsetBinding.inflate(LayoutInflater.from(ctx), null, false)
 
         // Use dialog as opposed to alertdialog to get fullscreen
-        val dialog = Dialog(ctx, R.style.AlertDialogCustomBlack).apply {
+        val dialog = Dialog(ctx, R.style.DialogFullscreenPlayer).apply {
             setContentView(binding.root)
         }
         dialog.show()
+        fixSystemBarsPadding(binding.root)
 
         var currentOffset = subtitleDelay
         binding.apply {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
index 199ed8b974..c5f822af63 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
@@ -116,6 +116,7 @@ import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
@@ -614,15 +615,15 @@ class GeneratorPlayer : FullScreenPlayer() {
         val providers = subsProviders.toList()
         val isSingleProvider = subsProviders.size == 1
 
-        val dialog = Dialog(context, R.style.AlertDialogCustomBlack)
+        val dialog = Dialog(context, R.style.DialogFullscreenPlayer)
         val binding =
             DialogOnlineSubtitlesBinding.inflate(LayoutInflater.from(context), null, false)
         dialog.setContentView(binding.root)
+        fixSystemBarsPadding(binding.root)
 
         var currentSubtitles: List<AbstractSubtitleEntities.SubtitleEntity> = emptyList()
         var currentSubtitle: AbstractSubtitleEntities.SubtitleEntity? = null
 
-
         val layout = R.layout.sort_bottom_single_choice_double_text
         val arrayAdapter =
             object : ArrayAdapter<AbstractSubtitleEntities.SubtitleEntity>(dialog.context, layout) {
@@ -1036,11 +1037,12 @@ class GeneratorPlayer : FullScreenPlayer() {
                 player.handleEvent(CSPlayerEvent.Pause, PlayerEventSource.UI)
                 val currentSubtitles = sortSubs(currentSubs)
 
-                val sourceDialog = Dialog(ctx, R.style.AlertDialogCustomBlack)
+                val sourceDialog = Dialog(ctx, R.style.DialogFullscreenPlayer)
                 val binding =
                     PlayerSelectSourceAndSubsBinding.inflate(LayoutInflater.from(ctx), null, false)
                 sourceDialog.setContentView(binding.root)
 
+                fixSystemBarsPadding(binding.root)
                 selectSourceDialog = sourceDialog
 
                 sourceDialog.show()
@@ -1061,7 +1063,9 @@ class GeneratorPlayer : FullScreenPlayer() {
 
                 binding.subtitleSettingsBtt.setOnClickListener {
                     safe {
-                        SubtitlesFragment().show(this.parentFragmentManager, "SubtitleSettings")
+                        val subtitlesFragment = SubtitlesFragment()
+                        subtitlesFragment.systemBarsAddPadding = true
+                        subtitlesFragment.show(this.parentFragmentManager, "SubtitleSettings")
                     }
                 }
 
@@ -1295,7 +1299,7 @@ class GeneratorPlayer : FullScreenPlayer() {
                     val activity = activity ?: return@setOnClickListener
                     QualityProfileDialog(
                         activity,
-                        R.style.AlertDialogCustomBlack,
+                        R.style.DialogFullscreenPlayer,
                         currentLinks.mapNotNull { it.first },
                         currentQualityProfile
                     ) { profile ->
@@ -1393,10 +1397,12 @@ class GeneratorPlayer : FullScreenPlayer() {
                 val currentAudioTracks = tracks.allAudioTracks
                 val binding: PlayerSelectTracksBinding =
                     PlayerSelectTracksBinding.inflate(LayoutInflater.from(ctx), null, false)
-                val trackDialog = Dialog(ctx, R.style.AlertDialogCustomBlack)
+                val trackDialog = Dialog(ctx, R.style.DialogFullscreenPlayer)
                 trackDialog.setContentView(binding.root)
                 trackDialog.show()
 
+                fixSystemBarsPadding(binding.root)
+
 //                selectTracksDialog = tracksDialog
 
                 val videosList = binding.videoTracksList
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt
index 19e98138cb..8db455d037 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/QualityProfileDialog.kt
@@ -11,6 +11,7 @@ import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 class QualityProfileDialog(
     val activity: FragmentActivity,
@@ -24,6 +25,7 @@ class QualityProfileDialog(
         val binding = PlayerQualityProfileDialogBinding.inflate(this.layoutInflater, null, false)
 
         setContentView(binding.root)//R.layout.player_quality_profile_dialog)
+        fixSystemBarsPadding(binding.root)
         /*val profilesRecyclerView: RecyclerView = profiles_recyclerview
         val useBtt: View = use_btt
         val editBtt: View = edit_btt
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt
index 4c74ec80f3..e20564de34 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/source_priority/SourcePriorityDialog.kt
@@ -11,6 +11,7 @@ import com.lagradost.cloudstream3.utils.txt
 import com.lagradost.cloudstream3.utils.ExtractorLink
 import com.lagradost.cloudstream3.utils.Qualities
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 class SourcePriorityDialog(
     val ctx: Context,
@@ -26,6 +27,7 @@ class SourcePriorityDialog(
     override fun show() {
         val binding = PlayerSelectSourcePriorityBinding.inflate(LayoutInflater.from(ctx), null, false)
         setContentView(binding.root)
+        fixSystemBarsPadding(binding.root)
         val sourcesRecyclerView = binding.sortSources
         val qualitiesRecyclerView = binding.sortQualities
         val profileText = binding.profileTextEditable
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
index be6fc5e338..bbde9d2cad 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/quicksearch/QuickSearchFragment.kt
@@ -43,9 +43,9 @@ import com.lagradost.cloudstream3.utils.AppContextUtils.filterSearchResultByFilm
 import com.lagradost.cloudstream3.utils.AppContextUtils.isRecyclerScrollable
 import com.lagradost.cloudstream3.utils.AppContextUtils.ownShow
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
-import com.lagradost.cloudstream3.utils.UIHelper
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
+import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import java.util.concurrent.locks.ReentrantLock
@@ -149,7 +149,7 @@ class QuickSearchFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        fixPaddingStatusbar(binding?.quickSearchRoot)
+        fixSystemBarsPadding(binding?.quickSearchRoot)
         fixGrid()
 
         arguments?.getStringArray(PROVIDER_KEY)?.let {
@@ -282,7 +282,7 @@ class QuickSearchFragment : Fragment() {
         binding?.quickSearch?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
                 if (search(context, query, false))
-                    UIHelper.hideKeyboard(binding?.quickSearch)
+                    hideKeyboard(binding?.quickSearch)
                 return true
             }
 
@@ -321,13 +321,6 @@ class QuickSearchFragment : Fragment() {
             }
         }
 
-
-        //quick_search.setOnQueryTextFocusChangeListener { _, b ->
-        //    if (b) {
-        //        // https://stackoverflow.com/questions/12022715/unable-to-show-keyboard-automatically-in-the-searchview
-        //        UIHelper.showInputMethod(view.findFocus())
-        //    }
-        //}
         if (isLayout(PHONE or EMULATOR)) {
             binding?.quickSearchBack?.apply {
                 isVisible = true
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
index 4f6e479816..18bc4ffa9e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragment.kt
@@ -208,10 +208,7 @@ object ResultFragment {
      override fun onResume() {
          afterPluginsLoadedEvent += ::reloadViewModel
          super.onResume()
-         activity?.let {
-             it.window?.navigationBarColor =
-                 it.colorFromAttribute(R.attr.primaryBlackBackground)
-         }
+         activity?.setNavigationBarColorCompat(R.attr.primaryBlackBackground)
      }
 
      override fun onDestroy() {
@@ -305,8 +302,6 @@ object ResultFragment {
         context?.updateHasTrailers()
         activity?.loadCache()
 
-        //activity?.fixPaddingStatusbar(result_barstatus)
-
         /* val backParameter = result_back.layoutParams as FrameLayout.LayoutParams
          backParameter.setMargins(
              backParameter.leftMargin,
@@ -316,8 +311,6 @@ object ResultFragment {
          )
          result_back.layoutParams = backParameter*/
 
-        // activity?.fixPaddingStatusbar(result_toolbar)
-
         val storedData = (activity ?: context)?.let {
             getStoredData(it)
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
index 6030b5dc2c..0530d07d39 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentPhone.kt
@@ -73,14 +73,16 @@ import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
-import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
 import com.lagradost.cloudstream3.utils.UIHelper.populateChips
 import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
+import com.lagradost.cloudstream3.utils.UIHelper.setListViewHeightBasedOnItems
+import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
 import com.lagradost.cloudstream3.utils.VideoDownloadHelper
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 import com.lagradost.cloudstream3.utils.setText
@@ -305,11 +307,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
 
     override fun onResume() {
         afterPluginsLoadedEvent += ::reloadViewModel
-        activity?.let {
-            @Suppress("DEPRECATION")
-            it.window?.navigationBarColor =
-                it.colorFromAttribute(R.attr.primaryBlackBackground)
-        }
+        activity?.setNavigationBarColorCompat(R.attr.primaryBlackBackground)
         super.onResume()
         PanelsChildGestureRegionObserver.Provider.get()
             .addGestureRegionsUpdateListener(gestureRegionsListener)
@@ -330,7 +328,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
         super.onViewCreated(view, savedInstanceState)
 
         // ===== setup =====
-        UIHelper.fixPaddingStatusbar(binding?.resultTopBar)
+        fixSystemBarsPadding(binding?.root)
         val storedData = getStoredData() ?: return
         activity?.window?.decorView?.clearFocus()
         activity?.loadCache()
@@ -1032,7 +1030,7 @@ open class ResultFragmentPhone : FullScreenPlayer() {
             syncBinding?.apply {
                 resultSyncCheck.choiceMode = AbsListView.CHOICE_MODE_SINGLE
                 resultSyncCheck.adapter = arrayAdapter
-                UIHelper.setListViewHeightBasedOnItems(resultSyncCheck)
+                setListViewHeightBasedOnItems(resultSyncCheck)
 
                 resultSyncCheck.setOnItemClickListener { _, _, which, _ ->
                     syncModel.setStatus(which - 1)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
index cacf029428..dc77b6135f 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultFragmentTv.kt
@@ -54,11 +54,12 @@ import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPres
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
-import com.lagradost.cloudstream3.utils.UIHelper
-import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
+import com.lagradost.cloudstream3.utils.UIHelper.populateChips
+import com.lagradost.cloudstream3.utils.UIHelper.setNavigationBarColorCompat
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.utils.setTextHtml
@@ -189,11 +190,7 @@ class ResultFragmentTv : Fragment() {
     }
 
     override fun onResume() {
-        activity?.let {
-            @Suppress("DEPRECATION")
-            it.window?.navigationBarColor =
-                it.colorFromAttribute(R.attr.primaryBlackBackground)
-        }
+        activity?.setNavigationBarColorCompat(R.attr.primaryBlackBackground)
         afterPluginsLoadedEvent += ::reloadViewModel
         super.onResume()
     }
@@ -257,6 +254,7 @@ class ResultFragmentTv : Fragment() {
 
         // ===== setup =====
         val storedData = getStoredData() ?: return
+        fixSystemBarsPadding(binding?.root, padTop = false)
         activity?.window?.decorView?.clearFocus()
         activity?.loadCache()
         hideKeyboard()
@@ -946,7 +944,7 @@ class ResultFragmentTv : Fragment() {
                         comingSoon = d.comingSoon
                         resultTvComingSoon.isVisible = d.comingSoon
 
-                        UIHelper.populateChips(resultTag, d.tags)
+                        populateChips(resultTag, d.tags)
                         resultCastItems.isGone = d.actors.isNullOrEmpty()
                         (resultCastItems.adapter as? ActorAdaptor)?.updateList(
                             d.actors ?: emptyList()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
index 5253974e83..969fa6d95c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/result/ResultTrailerPlayer.kt
@@ -3,12 +3,14 @@ package com.lagradost.cloudstream3.ui.result
 import android.animation.ValueAnimator
 import android.content.Context
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.view.ViewCompat
 import com.lagradost.cloudstream3.CommonActivity.screenHeight
 import com.lagradost.cloudstream3.CommonActivity.screenWidth
 import com.lagradost.cloudstream3.LoadResponse
@@ -18,6 +20,7 @@ import com.lagradost.cloudstream3.ui.player.PlayerEventSource
 import com.lagradost.cloudstream3.ui.player.SubtitleData
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.attachBackPressedCallback
 import com.lagradost.cloudstream3.utils.BackPressedCallbackHelper.detachBackPressedCallback
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 open class ResultTrailerPlayer : ResultFragmentPhone() {
 
@@ -46,6 +49,21 @@ open class ResultTrailerPlayer : ResultFragmentPhone() {
     }
 
     private fun fixPlayerSize() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            binding?.apply {
+                if (isFullScreenPlayer) {
+                    // Remove listener
+                    ViewCompat.setOnApplyWindowInsetsListener(root, null)
+                    root.overlay.clear() // Clear the cutout overlay
+                    root.setPadding(0, 0, 0, 0) // Reset padding for full screen
+                } else {
+                    // Reapply padding when not in full screen
+                    fixSystemBarsPadding(root)
+                    ViewCompat.requestApplyInsets(root)
+                }
+            }
+        }
+
         playerWidthHeight?.let { (w, h) ->
             if(w <= 0 || h <= 0) return@let
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
index fb493a1a94..74349b5c32 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/search/SearchFragment.kt
@@ -60,6 +60,7 @@ import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterProviderByPreferredMedia
 import com.lagradost.cloudstream3.utils.AppContextUtils.filterSearchResultByFilmQuality
@@ -74,7 +75,7 @@ import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.DataStoreHelper.currentAccount
 import com.lagradost.cloudstream3.utils.SubtitleHelper
 import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.getSpanCount
 import com.lagradost.cloudstream3.utils.UIHelper.hideKeyboard
 import java.util.Locale
@@ -236,8 +237,12 @@ class SearchFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        fixSystemBarsPadding(
+            binding?.searchRoot,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
 
-        fixPaddingStatusbar(binding?.searchRoot)
         fixGrid()
         reloadRepos()
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt
index aa513d87a6..93e469a4d6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/Globals.kt
@@ -3,6 +3,7 @@ package com.lagradost.cloudstream3.ui.settings
 import android.app.UiModeManager
 import android.content.Context
 import android.content.res.Configuration
+import android.content.res.Resources
 import android.os.Build
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
@@ -44,6 +45,11 @@ object Globals {
         layoutId = layoutIntCorrected()
     }
 
+    /** Returns true if the current orientation is landscape. */
+    fun isLandscape(): Boolean =
+        isLayout(TV or EMULATOR) ||
+            Resources.getSystem().configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
     /** Returns true if the layout is any of the flags,
      * so isLayout(TV or EMULATOR) is a valid statement for checking if the layout is in the emulator
      * or tv. Auto will become the "TV" or the "PHONE" layout.
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
index f216219de5..69b8ab0296 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
@@ -45,6 +45,7 @@ import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.utils.AppContextUtils.html
@@ -428,6 +429,7 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricCallback {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setUpToolbar(R.string.category_account)
+        setSystemBarsPadding()
         setPaddingBottom()
         setToolBarScrollFlags()
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
index 1e4689bf63..785f264bf1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsFragment.kt
@@ -24,11 +24,12 @@ import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.errorProfilePic
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.DataStoreHelper
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
-import com.lagradost.cloudstream3.utils.UIHelper
 import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
@@ -122,7 +123,6 @@ class SettingsFragment : Fragment() {
                     }
                 }
             }
-            UIHelper.fixPaddingStatusbar(settingsToolbar)
         }
 
         fun Fragment?.setUpToolbar(@StringRes title: Int) {
@@ -139,7 +139,14 @@ class SettingsFragment : Fragment() {
                     }
                 }
             }
-            UIHelper.fixPaddingStatusbar(settingsToolbar)
+        }
+
+        fun Fragment.setSystemBarsPadding() {
+            fixSystemBarsPadding(
+                view,
+                padLeft = isLayout(TV or EMULATOR),
+                padBottom = isLandscape()
+            )
         }
 
         fun getFolderSize(dir: File): Long {
@@ -175,6 +182,12 @@ class SettingsFragment : Fragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        fixSystemBarsPadding(
+            binding?.root,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
+
         fun navigate(id: Int) {
             activity?.navigate(id, Bundle())
         }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
index 1ff95a96b3..0dc4b575d6 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
@@ -30,6 +30,7 @@ import com.lagradost.cloudstream3.ui.settings.Globals.beneneCount
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.ui.settings.utils.getChooseFolderLauncher
@@ -139,6 +140,7 @@ class SettingsGeneral : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setUpToolbar(R.string.category_general)
+        setSystemBarsPadding()
         setPaddingBottom()
         setToolBarScrollFlags()
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
index 5c6acdd9b8..20e4a01904 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsPlayer.kt
@@ -16,6 +16,7 @@ import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hidePrefs
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.ui.subtitles.ChromecastSubtitlesFragment
@@ -29,6 +30,7 @@ class SettingsPlayer : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setUpToolbar(R.string.category_player)
+        setSystemBarsPadding()
         setPaddingBottom()
         setToolBarScrollFlags()
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
index 01475799ea..64fd8fe140 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsProviders.kt
@@ -10,6 +10,7 @@ import com.lagradost.cloudstream3.*
 import com.lagradost.cloudstream3.ui.APIRepository
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiDubstatusSettings
@@ -23,6 +24,7 @@ class SettingsProviders : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setUpToolbar(R.string.category_providers)
+        setSystemBarsPadding()
         setPaddingBottom()
         setToolBarScrollFlags()
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
index 6446ae75d9..d107fd1bfe 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUI.kt
@@ -19,6 +19,7 @@ import com.lagradost.cloudstream3.ui.settings.Globals.updateTv
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
@@ -31,6 +32,7 @@ class SettingsUI : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setUpToolbar(R.string.category_ui)
+        setSystemBarsPadding()
         setPaddingBottom()
         setToolBarScrollFlags()
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
index bacca67ec2..1f0f4aa748 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsUpdates.kt
@@ -25,6 +25,7 @@ import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.getPref
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.hideOn
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setPaddingBottom
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.ui.settings.utils.getChooseFolderLauncher
@@ -51,6 +52,7 @@ class SettingsUpdates : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setUpToolbar(R.string.category_updates)
+        setSystemBarsPadding()
         setPaddingBottom()
         setToolBarScrollFlags()
     }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
index 78a43c6b14..55307fb39e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsFragment.kt
@@ -31,6 +31,7 @@ import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.utils.setText
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.utils.AppContextUtils.addRepositoryDialog
@@ -84,9 +85,8 @@ class ExtensionsFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        //context?.fixPaddingStatusbar(extensions_root)
-
         setUpToolbar(R.string.extensions)
+        setSystemBarsPadding()
         setToolBarScrollFlags()
 
         binding?.repoRecyclerView?.apply {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt
index 3aa97dad18..ee6933364e 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginDetailsFragment.kt
@@ -17,12 +17,17 @@ import com.lagradost.cloudstream3.plugins.VotingApi.getVotes
 import com.lagradost.cloudstream3.plugins.VotingApi.hasVoted
 import com.lagradost.cloudstream3.plugins.VotingApi.vote
 import com.lagradost.cloudstream3.R
+import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
+import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
+import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.getImageFromDrawable
 import com.lagradost.cloudstream3.utils.ImageLoader.loadImage
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
 import com.lagradost.cloudstream3.utils.UIHelper.colorFromAttribute
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.toPx
 
 
@@ -61,6 +66,11 @@ class PluginDetailsFragment(val data: PluginViewData) : BottomSheetDialogFragmen
         super.onViewCreated(view, savedInstanceState)
         val metadata = data.plugin.second
         binding?.apply {
+            fixSystemBarsPadding(
+                root,
+                padBottom = isLandscape(),
+                padLeft = isLayout(TV or EMULATOR)
+            )
             pluginIcon.loadImage(metadata.iconUrl?.replace("%size%", "$iconSize")
                 ?.replace("%exact_size%", "$iconSizeExact")) {
                 error { getImageFromDrawable(context ?: return@error null , R.drawable.ic_baseline_extension_24) }
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
index 4564237e0f..cdca8130b1 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/PluginsFragment.kt
@@ -18,8 +18,9 @@ import com.lagradost.cloudstream3.ui.home.HomeFragment.Companion.bindChips
 import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
 import com.lagradost.cloudstream3.ui.result.setLinearListLayout
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
-import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
@@ -79,6 +80,7 @@ class PluginsFragment : Fragment() {
 
         setToolBarScrollFlags()
         setUpToolbar(name)
+        setSystemBarsPadding()
         binding?.settingsToolbar?.apply {
             setOnMenuItemClickListener { menuItem ->
                 when (menuItem?.itemId) {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
index 921ac0674b..435fd3b48c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestFragment.kt
@@ -13,6 +13,7 @@ import com.lagradost.cloudstream3.mvvm.observe
 import com.lagradost.cloudstream3.mvvm.observeNullable
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setSystemBarsPadding
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setToolBarScrollFlags
 import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.setUpToolbar
 
@@ -29,6 +30,7 @@ class TestFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         setUpToolbar(R.string.category_provider_test)
+        setSystemBarsPadding()
         setToolBarScrollFlags()
         super.onViewCreated(view, savedInstanceState)
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
index 0dccd5cc42..5c2b40d246 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt
@@ -17,8 +17,7 @@ import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIE
 import com.lagradost.cloudstream3.ui.settings.extensions.PluginsViewModel
 import com.lagradost.cloudstream3.ui.settings.extensions.RepoAdapter
 import com.lagradost.cloudstream3.utils.Coroutines.main
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 class SetupFragmentExtensions : Fragment() {
     companion object {
@@ -86,7 +85,7 @@ class SetupFragmentExtensions : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        fixPaddingStatusbar(binding?.setupRoot)
+        fixSystemBarsPadding(binding?.setupRoot)
         val isSetup = arguments?.getBoolean(SETUP_EXTENSION_BUNDLE_IS_SETUP) ?: false
 
 //        view_public_repositories_button?.setOnClickListener {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
index b3429d049d..7e8a7c2972 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt
@@ -20,7 +20,7 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.ui.settings.appLanguages
 import com.lagradost.cloudstream3.ui.settings.getCurrentLocale
 import com.lagradost.cloudstream3.ui.settings.nameNextToFlagEmoji
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 const val HAS_DONE_SETUP_KEY = "HAS_DONE_SETUP"
 
@@ -48,7 +48,7 @@ class SetupFragmentLanguage : Fragment() {
 
         // We don't want a crash for all users
         safe {
-            fixPaddingStatusbar(binding?.setupRoot)
+            fixSystemBarsPadding(binding?.setupRoot)
 
             val ctx = context ?: return@safe
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
index 85eabefa4b..cfa913b199 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLayout.kt
@@ -13,7 +13,7 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.FragmentSetupLayoutBinding
 import com.lagradost.cloudstream3.mvvm.safe
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import org.acra.ACRA
 
 
@@ -38,7 +38,7 @@ class SetupFragmentLayout : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        fixPaddingStatusbar(binding?.setupRoot)
+        fixSystemBarsPadding(binding?.setupRoot)
 
         safe {
             val ctx = context ?: return@safe
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt
index 9db967dcb5..e02aa66939 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentMedia.kt
@@ -15,8 +15,7 @@ import com.lagradost.cloudstream3.TvType
 import com.lagradost.cloudstream3.databinding.FragmentSetupMediaBinding
 import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.utils.DataStoreHelper
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
-
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 class SetupFragmentMedia : Fragment() {
     var binding: FragmentSetupMediaBinding? = null
@@ -40,7 +39,7 @@ class SetupFragmentMedia : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         safe {
-            fixPaddingStatusbar(binding?.setupRoot)
+            fixSystemBarsPadding(binding?.setupRoot)
 
             val ctx = context ?: return@safe
             val settingsManager = PreferenceManager.getDefaultSharedPreferences(ctx)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
index 294c81e6ae..131ac51d53 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentProviderLanguage.kt
@@ -17,7 +17,7 @@ import com.lagradost.cloudstream3.mvvm.safe
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
 import com.lagradost.cloudstream3.utils.SubtitleHelper.getNameNextToFlagEmoji
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 
 class SetupFragmentProviderLanguage : Fragment() {
     var binding: FragmentSetupProviderLanguagesBinding? = null
@@ -40,7 +40,7 @@ class SetupFragmentProviderLanguage : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        fixPaddingStatusbar(binding?.setupRoot)
+        fixSystemBarsPadding(binding?.setupRoot)
 
         safe {
             val ctx = context ?: return@safe
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
index c76a218e54..ace48c8225 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/ChromecastSubtitlesFragment.kt
@@ -29,11 +29,12 @@ import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.databinding.ChromecastSubtitleSettingsBinding
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
@@ -173,7 +174,11 @@ class ChromecastSubtitlesFragment : Fragment() {
         onColorSelectedEvent += ::onColorSelected
         onDialogDismissedEvent += ::onDialogDismissed
 
-        fixPaddingStatusbar(binding?.subsRoot)
+        fixSystemBarsPadding(
+            binding?.subsRoot,
+            padBottom = isLandscape(),
+            padLeft = isLayout(TV or EMULATOR)
+        )
 
         state = getCurrentSavedStyle()
         updateState()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
index 2aa960c951..ab1a178c3c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/subtitles/SubtitlesFragment.kt
@@ -40,14 +40,16 @@ import com.lagradost.cloudstream3.ui.player.CustomDecoder
 import com.lagradost.cloudstream3.ui.player.CustomDecoder.Companion.setSubtitleAlignment
 import com.lagradost.cloudstream3.ui.player.OutlineSpan
 import com.lagradost.cloudstream3.ui.player.RoundedBackgroundColorSpan
+import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
 import com.lagradost.cloudstream3.ui.settings.Globals.TV
+import com.lagradost.cloudstream3.ui.settings.Globals.isLandscape
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
 import com.lagradost.cloudstream3.utils.DataStore.setKey
 import com.lagradost.cloudstream3.utils.Event
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
 import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showMultiDialog
 import com.lagradost.cloudstream3.utils.SubtitleHelper.languages
-import com.lagradost.cloudstream3.utils.UIHelper.fixPaddingStatusbar
+import com.lagradost.cloudstream3.utils.UIHelper.fixSystemBarsPadding
 import com.lagradost.cloudstream3.utils.UIHelper.hideSystemUI
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
@@ -369,6 +371,8 @@ class SubtitlesFragment : DialogFragment() {
     private lateinit var state: SaveCaptionStyle
     private var hide: Boolean = true
 
+    var systemBarsAddPadding = isLayout(TV or EMULATOR)
+
     override fun onDestroy() {
         super.onDestroy()
         onColorSelectedEvent -= ::onColorSelected
@@ -376,11 +380,11 @@ class SubtitlesFragment : DialogFragment() {
 
     override fun onStart() {
         super.onStart()
-        dialog?.window?.setWindowAnimations(R.style.DialogFullscreen)
+        dialog?.window?.setWindowAnimations(R.style.DialogFullscreenPlayer)
     }
 
     override fun getTheme(): Int {
-        return R.style.DialogFullscreen
+        return R.style.DialogFullscreenPlayer
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -393,7 +397,11 @@ class SubtitlesFragment : DialogFragment() {
             context?.getExternalFilesDir(null)?.absolutePath.toString() + "/Fonts"
         )
 
-        fixPaddingStatusbar(binding?.subsRoot)
+        fixSystemBarsPadding(
+            binding?.subsRoot,
+            padBottom = systemBarsAddPadding || isLandscape(),
+            padLeft = systemBarsAddPadding
+        )
 
         state = getCurrentSavedStyle()
         context?.updateState()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
index 06cdb34b4a..d9becde970 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt
@@ -13,7 +13,12 @@ import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.graphics.Bitmap
+import android.graphics.Canvas
 import android.graphics.Color
+import android.graphics.ColorFilter
+import android.graphics.Paint
+import android.graphics.PixelFormat
+import android.graphics.drawable.Drawable
 import android.os.Build
 import android.os.Bundle
 import android.os.TransactionTooLargeException
@@ -23,7 +28,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.MarginLayoutParams
-import android.view.WindowInsets
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import android.widget.ListAdapter
@@ -31,6 +35,7 @@ import android.widget.ListView
 import android.widget.Toast.LENGTH_LONG
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
+import androidx.annotation.DimenRes
 import androidx.annotation.StyleRes
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.appcompat.view.menu.MenuBuilder
@@ -47,6 +52,11 @@ import androidx.core.view.marginLeft
 import androidx.core.view.marginRight
 import androidx.core.view.marginTop
 import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.navigation.NavOptions
@@ -63,9 +73,11 @@ import com.lagradost.cloudstream3.CommonActivity.activity
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.mvvm.logError
-import com.lagradost.cloudstream3.ui.settings.Globals
 import com.lagradost.cloudstream3.ui.settings.Globals.EMULATOR
+import com.lagradost.cloudstream3.ui.settings.Globals.PHONE
+import com.lagradost.cloudstream3.ui.settings.Globals.TV
 import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
+import com.lagradost.cloudstream3.utils.AppContextUtils.isRtl
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.UIHelper.navigate
 import kotlinx.coroutines.delay
@@ -211,7 +223,7 @@ object UIHelper {
     }
 
     fun View?.setAppBarNoScrollFlagsOnTV() {
-        if (isLayout(Globals.TV or EMULATOR)) {
+        if (isLayout(TV or EMULATOR)) {
             this?.updateLayoutParams<AppBarLayout.LayoutParams> {
                 scrollFlags = AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL
             }
@@ -336,35 +348,45 @@ object UIHelper {
 
     fun Activity.hideSystemUI() {
         // Enables regular immersive mode.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val controller = WindowCompat.getInsetsController(window, window.decorView)
+            controller.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+            controller.hide(WindowInsetsCompat.Type.systemBars())
+            return
+        }
+
         // For "lean back" mode, remove SYSTEM_UI_FLAG_IMMERSIVE.
         // Or for "sticky immersive," replace it with SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-        /** BUGGED AF  **/
-        /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        @Suppress("DEPRECATION")
+        window.decorView.systemUiVisibility = (
+            View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                // Set the content to appear under the system bars so that the
+                // content doesn't resize when the system bars hide and show.
+                or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                // Hide the nav bar and status bar
+                or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                or View.SYSTEM_UI_FLAG_FULLSCREEN
+        )
+    }
 
-            WindowCompat.setDecorFitsSystemWindows(window, false)
-            WindowInsetsControllerCompat(window, View(this)).let { controller ->
-                controller.hide(WindowInsetsCompat.Type.systemBars())
-                controller.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            }
-        }*/
+    fun Activity.enableEdgeToEdgeCompat() {
+        // edge-to-edge is very buggy on earlier versions
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return
+        WindowCompat.enableEdgeToEdge(window)
+    }
+
+    fun Activity.setNavigationBarColorCompat(@AttrRes resourceId: Int) {
+        // edge-to-edge handles this
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) return
 
         @Suppress("DEPRECATION")
-        window.decorView.systemUiVisibility = (
-                View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                        // Set the content to appear under the system bars so that the
-                        // content doesn't resize when the system bars hide and show.
-                        or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                        or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                        or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                        // Hide the nav bar and status bar
-                        or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                        or View.SYSTEM_UI_FLAG_FULLSCREEN
-                ) // FIXME this should be replaced
-        //}
+        window?.navigationBarColor = colorFromAttribute(resourceId)
     }
 
     fun Context.getStatusBarHeight(): Int {
-        if (isLayout(Globals.TV or EMULATOR)) {
+        if (isLayout(TV or EMULATOR)) {
             return 0
         }
 
@@ -376,17 +398,6 @@ object UIHelper {
         return result
     }
 
-    fun fixPaddingStatusbar(v: View?) {
-        if (v == null) return
-        val ctx = v.context ?: return
-        v.setPadding(
-            v.paddingLeft,
-            v.paddingTop + ctx.getStatusBarHeight(),
-            v.paddingRight,
-            v.paddingBottom
-        )
-    }
-
     fun fixPaddingStatusbarMargin(v: View?) {
         if (v == null) return
         val ctx = v.context ?: return
@@ -411,6 +422,84 @@ object UIHelper {
         v.layoutParams = params
     }
 
+    fun fixSystemBarsPadding(
+        v: View?,
+        @DimenRes heightResId: Int? = null,
+        @DimenRes widthResId: Int? = null,
+        padTop: Boolean = true,
+        padBottom: Boolean = true,
+        padLeft: Boolean = true,
+        padRight: Boolean = true,
+        overlayCutout: Boolean = true
+    ) {
+        if (v == null) return
+
+        // edge-to-edge is very buggy on earlier versions so we just
+        // handle the status bar here instead.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            if (padTop) {
+                val ctx = v.context ?: return
+                v.updatePadding(top = ctx.getStatusBarHeight())
+            }
+            return
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(v) { view, windowInsets ->
+            val leftCheck = if (view.isRtl()) padRight else padLeft
+            val rightCheck = if (view.isRtl()) padLeft else padRight
+
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
+                    or WindowInsetsCompat.Type.displayCutout()
+            )
+
+            view.updatePadding(
+                left = if (leftCheck) insets.left else view.paddingLeft,
+                right = if (rightCheck) insets.right else view.paddingRight,
+                bottom = if (padBottom) insets.bottom else view.paddingBottom,
+                top = if (padTop) insets.top else view.paddingTop
+            )
+
+            heightResId?.let {
+                val heightPx = view.resources.getDimensionPixelSize(it)
+                view.updateLayoutParams {
+                    height = heightPx + insets.bottom
+                }
+            }
+
+            widthResId?.let {
+                val widthPx = view.resources.getDimensionPixelSize(it)
+                view.updateLayoutParams {
+                    val startInset = if (view.isRtl()) insets.right else insets.left
+                    width = if (startInset > 0) widthPx + startInset else widthPx
+                }
+            }
+
+            if (overlayCutout && isLayout(PHONE)) {
+                // Draw a black overlay over the cutout. We do this so that
+                // it doesn't use the fragment background. We want it to
+                // appear as if the screen actually ends at cutout.
+                val cutout = windowInsets.displayCutout
+                if (cutout != null) {
+                    val left = if (!leftCheck) 0 else cutout.safeInsetLeft
+                    val right = if (!rightCheck) 0 else cutout.safeInsetRight
+                    view.overlay.clear()
+                    if (left > 0 || right > 0) {
+                        view.overlay.add(
+                            CutoutOverlayDrawable(
+                                view,
+                                leftCutout = left,
+                                rightCutout = right
+                            )
+                        )
+                    }
+                }
+            }
+
+            WindowInsetsCompat.CONSUMED
+        }
+    }
+
     fun Context.getNavigationBarHeight(): Int {
         var result = 0
         val resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android")
@@ -426,12 +515,12 @@ object UIHelper {
         return settingsManager.getBoolean(getString(R.string.bottom_title_key), true)
     }
 
-    fun Activity.changeStatusBarState(hide: Boolean): Int {
+    fun Activity.changeStatusBarState(hide: Boolean) {
         try {
             if (hide) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    window.insetsController?.hide(WindowInsets.Type.statusBars())
-
+                    val controller = WindowCompat.getInsetsController(window, window.decorView)
+                    controller.hide(WindowInsetsCompat.Type.statusBars())
                 } else {
                     @Suppress("DEPRECATION")
                     window.setFlags(
@@ -439,42 +528,35 @@ object UIHelper {
                         WindowManager.LayoutParams.FLAG_FULLSCREEN
                     )
                 }
-                0
             } else {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    window.insetsController?.show(WindowInsets.Type.statusBars())
+                    val controller = WindowCompat.getInsetsController(window, window.decorView)
+                    controller.show(WindowInsetsCompat.Type.statusBars())
                 } else {
                     @Suppress("DEPRECATION")
                     window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
                 }
-
-                this.getStatusBarHeight()
             }
         } catch (t: Throwable) {
             logError(t)
         }
-        return if (hide) {
-            0
-        } else {
-            this.getStatusBarHeight()
-        }
     }
 
     // Shows the system bars by removing all the flags
     // except for the ones that make the content appear under the system bars.
     fun Activity.showSystemUI() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val controller = WindowCompat.getInsetsController(window, window.decorView)
+            if (isLayout(EMULATOR)) {
+                controller.show(WindowInsetsCompat.Type.navigationBars())
+                controller.hide(WindowInsetsCompat.Type.statusBars())
+            } else controller.show(WindowInsetsCompat.Type.systemBars())
+            return
+        }
 
-        /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-
-            WindowCompat.setDecorFitsSystemWindows(window, true)
-            WindowInsetsControllerCompat(window, View(this)).show(WindowInsetsCompat.Type.systemBars())
-
-        } else {*/
-        /** WINDOW COMPAT IS BUGGY DUE TO FU*KED UP PLAYER AND TRAILERS **/
         @Suppress("DEPRECATION")
         window.decorView.systemUiVisibility =
-            (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN) // FIXME this should be replaced
-        //}
+            (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
 
         changeStatusBarState(isLayout(EMULATOR))
     }
@@ -590,4 +672,32 @@ object UIHelper {
         popup.show()
         return popup
     }
+}
+
+private class CutoutOverlayDrawable(
+    private val view: View,
+    private val leftCutout: Int,
+    private val rightCutout: Int,
+) : Drawable() {
+    private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.BLACK
+        style = Paint.Style.FILL
+    }
+
+    override fun draw(canvas: Canvas) {
+        if (leftCutout > 0) canvas.drawRect(0f, 0f, leftCutout.toFloat(), view.height.toFloat(), paint)
+        if (rightCutout > 0) {
+            canvas.drawRect(
+                view.width - rightCutout.toFloat(),
+                0f, view.width.toFloat(),
+                view.height.toFloat(),
+                paint
+            )
+        }
+    }
+
+    override fun setAlpha(alpha: Int) {}
+    override fun setColorFilter(colorFilter: ColorFilter?) {}
+    @Suppress("OVERRIDE_DEPRECATION")
+    override fun getOpacity() = PixelFormat.OPAQUE
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a06e6a157c..2483a37145 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,7 +14,7 @@
 
         <com.google.android.material.navigationrail.NavigationRailView
             android:id="@+id/nav_rail_view"
-            android:layout_width="62dp"
+            android:layout_width="@dimen/nav_rail_view_width"
             android:layout_height="match_parent"
             android:background="?attr/primaryGrayBackground"
             android:descendantFocusability="afterDescendants"
@@ -36,7 +36,7 @@
                   -->
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/nav_view"
-            android:layout_height="70dp"
+            android:layout_height="@dimen/nav_view_height"
             android:layout_width="0dp"
             app:labelVisibilityMode="unlabeled"
             android:background="?attr/primaryGrayBackground"
diff --git a/app/src/main/res/layout/activity_main_tv.xml b/app/src/main/res/layout/activity_main_tv.xml
index 7cee7fdbe1..c51d77d162 100644
--- a/app/src/main/res/layout/activity_main_tv.xml
+++ b/app/src/main/res/layout/activity_main_tv.xml
@@ -30,8 +30,8 @@
             android:layout_height="match_parent"
             android:background="?attr/primaryGrayBackground"
             android:descendantFocusability="afterDescendants"
-            android:maxWidth="62dp"
-            android:minWidth="62dp"
+            android:maxWidth="@dimen/nav_rail_view_width"
+            android:minWidth="@dimen/nav_rail_view_width"
             app:collapsedItemMinHeight="0dp"
             app:expanded="false"
             app:expandedItemMinHeight="0dp"
@@ -60,7 +60,7 @@
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/nav_view"
             android:layout_width="0dp"
-            android:layout_height="70dp"
+            android:layout_height="@dimen/nav_view_height"
             android:background="?attr/primaryGrayBackground"
             android:visibility="gone"
             app:itemIconTint="@color/item_select_color"
diff --git a/app/src/main/res/layout/chromecast_subtitle_settings.xml b/app/src/main/res/layout/chromecast_subtitle_settings.xml
index 4d3b50dfe4..b1073190c2 100644
--- a/app/src/main/res/layout/chromecast_subtitle_settings.xml
+++ b/app/src/main/res/layout/chromecast_subtitle_settings.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/subs_root"
+    android:background="?attr/primaryBlackBackground"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/subs_root"
-        android:background="?attr/primaryBlackBackground">
+        android:layout_height="match_parent">
 
-    <LinearLayout
-            android:orientation="vertical"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-        <TextView
+            <TextView
                 android:paddingStart="20dp"
                 android:paddingEnd="20dp"
                 android:layout_marginTop="20dp"
@@ -23,28 +28,28 @@
                 android:layout_rowWeight="1"
                 android:layout_height="wrap_content" />
 
-        <FrameLayout
+            <FrameLayout
                 android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="75sp">
 
-            <ImageView
+                <ImageView
                     android:scaleType="centerCrop"
                     android:src="@drawable/subtitles_preview_background"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:contentDescription="@string/preview_background_img_des" />
 
-            <androidx.media3.ui.SubtitleView
+                <androidx.media3.ui.SubtitleView
                     android:id="@+id/subtitle_text"
 
                     android:layout_width="match_parent"
                     android:layout_gravity="center"
                     android:foregroundGravity="center"
                     android:layout_height="match_parent" />
-        </FrameLayout>
+            </FrameLayout>
 
-        <TextView
+            <TextView
                 android:nextFocusDown="@id/subs_font_size"
                 android:nextFocusLeft="@id/apply_btt"
                 android:nextFocusRight="@id/cancel_btt"
@@ -53,7 +58,7 @@
                 android:text="@string/subs_font"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:nextFocusUp="@id/subs_font"
                 android:nextFocusDown="@id/subs_text_color"
                 android:nextFocusLeft="@id/apply_btt"
@@ -63,7 +68,7 @@
                 android:text="@string/subs_font_size"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:nextFocusUp="@id/subs_font_size"
                 android:nextFocusDown="@id/subs_outline_color"
                 android:nextFocusLeft="@id/apply_btt"
@@ -73,7 +78,7 @@
                 android:text="@string/subs_text_color"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:nextFocusUp="@id/subs_text_color"
                 android:nextFocusDown="@id/subs_background_color"
                 android:nextFocusLeft="@id/apply_btt"
@@ -83,7 +88,7 @@
                 android:text="@string/subs_outline_color"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:nextFocusUp="@id/subs_outline_color"
                 android:nextFocusDown="@id/subs_window_color"
                 android:nextFocusLeft="@id/apply_btt"
@@ -93,7 +98,7 @@
                 android:text="@string/subs_background_color"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:visibility="gone"
                 android:nextFocusUp="@id/subs_background_color"
                 android:nextFocusDown="@id/subs_edge_type"
@@ -104,7 +109,7 @@
                 android:text="@string/subs_window_color"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:nextFocusUp="@id/subs_window_color"
                 android:nextFocusDown="@id/apply_btt"
                 android:nextFocusLeft="@id/apply_btt"
@@ -114,7 +119,7 @@
                 android:text="@string/subs_edge_type"
                 style="@style/SettingsItem" />
 
-        <TextView
+            <TextView
                 android:gravity="center"
                 android:text="@string/subs_hold_to_reset_to_default"
                 android:textSize="14sp"
@@ -124,14 +129,14 @@
                 android:layout_rowWeight="1"
                 android:layout_height="wrap_content" />
 
-        <LinearLayout
+            <LinearLayout
                 android:orientation="horizontal"
                 android:layout_gravity="bottom"
                 android:gravity="bottom|end"
                 android:layout_width="match_parent"
                 android:layout_height="60dp">
 
-            <com.google.android.material.button.MaterialButton
+                <com.google.android.material.button.MaterialButton
                     android:nextFocusUp="@id/subs_edge_type"
                     android:nextFocusRight="@id/cancel_btt"
                     style="@style/WhiteButton"
@@ -141,10 +146,10 @@
                     android:id="@+id/apply_btt"
                     android:layout_width="wrap_content">
 
-                <requestFocus />
-            </com.google.android.material.button.MaterialButton>
+                    <requestFocus />
+                </com.google.android.material.button.MaterialButton>
 
-            <com.google.android.material.button.MaterialButton
+                <com.google.android.material.button.MaterialButton
                     android:nextFocusUp="@id/subs_edge_type"
                     android:nextFocusLeft="@id/apply_btt"
                     style="@style/BlackButton"
@@ -152,6 +157,7 @@
                     android:text="@string/sort_cancel"
                     android:id="@+id/cancel_btt"
                     android:layout_width="wrap_content" />
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+    </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_extensions.xml b/app/src/main/res/layout/fragment_extensions.xml
index 71dd372b4b..fd1d0dade5 100644
--- a/app/src/main/res/layout/fragment_extensions.xml
+++ b/app/src/main/res/layout/fragment_extensions.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/extensions_root"
+    android:background="?attr/primaryGrayBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -13,6 +14,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:clipToPadding="false"
         android:id="@+id/repo_recycler_view"
+        android:background="?attr/primaryBlackBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="80dp"
@@ -27,9 +29,9 @@
 
     <LinearLayout
         android:id="@+id/blank_repo_screen"
+        android:background="?attr/primaryBlackBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="20dp"
         android:gravity="center"
         android:orientation="vertical"
         tools:visibility="gone">
@@ -43,7 +45,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp"
+            android:layout_margin="20dp"
             android:gravity="center"
             android:text="@string/blank_repo_message"
             android:textSize="16sp" />
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 905cac34aa..7b83058f19 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/library_root"
+    android:background="?attr/primaryGrayBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -24,7 +25,6 @@
         android:background="?attr/primaryGrayBackground">
 
         <LinearLayout
-            android:id="@+id/search_status_bar_padding"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -110,6 +110,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:animateLayoutChanges="true"
+        android:background="?attr/primaryBlackBackground"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.viewpager2.widget.ViewPager2
diff --git a/app/src/main/res/layout/fragment_library_tv.xml b/app/src/main/res/layout/fragment_library_tv.xml
index 87390284eb..8d07c43d0c 100644
--- a/app/src/main/res/layout/fragment_library_tv.xml
+++ b/app/src/main/res/layout/fragment_library_tv.xml
@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/library_root"
+    android:background="?attr/primaryGrayBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -24,7 +25,6 @@
         android:background="?attr/primaryGrayBackground">
 
         <LinearLayout
-            android:id="@+id/search_status_bar_padding"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -135,6 +135,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="?attr/primaryBlackBackground"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.viewpager2.widget.ViewPager2
diff --git a/app/src/main/res/layout/fragment_plugins.xml b/app/src/main/res/layout/fragment_plugins.xml
index ee86f12bc3..49917a5476 100644
--- a/app/src/main/res/layout/fragment_plugins.xml
+++ b/app/src/main/res/layout/fragment_plugins.xml
@@ -6,7 +6,8 @@
     android:id="@+id/extensions_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="?attr/primaryGrayBackground">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -38,6 +39,7 @@
         android:nextFocusUp="@id/tvtypes_chips"
 
         android:clipToPadding="false"
+        android:background="?attr/primaryBlackBackground"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/repository_item" />
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index aeffc67395..88dedca5fd 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -14,7 +14,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingBottom="10dp">
+        android:paddingBottom="10dp"
+        android:background="?attr/primaryGrayBackground">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_search_tv.xml b/app/src/main/res/layout/fragment_search_tv.xml
index f2efba6faf..4d45594cf7 100644
--- a/app/src/main/res/layout/fragment_search_tv.xml
+++ b/app/src/main/res/layout/fragment_search_tv.xml
@@ -15,7 +15,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/navbar_width"
         android:orientation="vertical"
-        android:paddingBottom="10dp">
+        android:paddingBottom="10dp"
+        android:background="?attr/primaryGrayBackground">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_testing.xml b/app/src/main/res/layout/fragment_testing.xml
index 1426f59e55..59405bbb8e 100644
--- a/app/src/main/res/layout/fragment_testing.xml
+++ b/app/src/main/res/layout/fragment_testing.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:backgroundTint="?attr/primaryBlackBackground"
+    android:background="?attr/primaryGrayBackground"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -36,8 +36,9 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical"
+        android:background="?attr/primaryBlackBackground"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/subtitle_settings.xml b/app/src/main/res/layout/subtitle_settings.xml
index bf01e1fabe..e5c59e115a 100644
--- a/app/src/main/res/layout/subtitle_settings.xml
+++ b/app/src/main/res/layout/subtitle_settings.xml
@@ -1,314 +1,315 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/subs_root"
+    android:background="?attr/primaryBlackBackground"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/primaryBlackBackground">
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_rowWeight="1"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="10dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:text="@string/subtitles_settings"
-            android:textColor="?attr/textColor"
-            android:textSize="20sp"
-            android:textStyle="bold" />
-
-        <FrameLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="75sp">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-            <ImageView
+            <TextView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/preview_background_img_des"
-                android:scaleType="centerCrop"
-                android:src="@drawable/subtitles_preview_background" />
-
-            <androidx.media3.ui.SubtitleView
-                android:id="@+id/subtitle_text"
+                android:layout_height="wrap_content"
+                android:layout_rowWeight="1"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="10dp"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:text="@string/subtitles_settings"
+                android:textColor="?attr/textColor"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:foregroundGravity="center" />
-        </FrameLayout>
-
-        <TextView
-            android:id="@+id/subs_font"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusDown="@id/subs_font_size"
-            android:text="@string/subs_font" />
-
-        <TextView
-            android:id="@+id/subs_font_size"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_font"
-            android:nextFocusDown="@id/subs_text_color"
-            android:text="@string/subs_font_size" />
-
-        <TextView
-            android:id="@+id/subs_text_color"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_font_size"
-            android:nextFocusDown="@id/subs_outline_color"
-            android:text="@string/subs_text_color" />
-
-        <TextView
-            android:id="@+id/subs_outline_color"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_text_color"
-            android:nextFocusDown="@id/subs_background_color"
-            android:text="@string/subs_outline_color" />
-
-        <TextView
-            android:id="@+id/subs_background_color"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_outline_color"
-            android:nextFocusDown="@id/subs_background_radius"
-            android:text="@string/subs_background_color" />
-
-        <TextView
-            android:id="@+id/subs_background_radius"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_background_color"
-            android:nextFocusDown="@id/subs_window_color"
-            android:text="@string/background_radius" />
-
-        <TextView
-            android:id="@+id/subs_window_color"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_background_radius"
-            android:nextFocusDown="@id/subs_edge_type"
-            android:text="@string/subs_window_color" />
-
-        <TextView
-            android:id="@+id/subs_edge_type"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_window_color"
-            android:nextFocusDown="@id/subs_edge_size"
-            android:text="@string/subs_edge_type" />
-
-
-        <TextView
-            android:id="@+id/subs_edge_size"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_edge_type"
-            android:nextFocusDown="@id/subs_subtitle_alignment"
-            android:text="@string/subs_edge_size" />
-
-        <TextView
-            android:id="@+id/subs_subtitle_alignment"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_edge_size"
-            android:nextFocusDown="@id/subs_subtitle_elevation"
-            android:text="@string/subs_subtitle_alignment" />
-
-        <TextView
-            android:id="@+id/subs_subtitle_elevation"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_subtitle_alignment"
-            android:nextFocusDown="@id/subs_auto_select_language"
-            android:text="@string/subs_subtitle_elevation" />
-
-        <TextView
-            android:id="@+id/subs_auto_select_language"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_subtitle_elevation"
-            android:nextFocusDown="@id/subs_download_languages"
-            android:text="@string/subs_auto_select_language" />
-
-        <TextView
-            android:id="@+id/subs_download_languages"
-            style="@style/SettingsItem"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-
-            android:nextFocusUp="@id/subs_auto_select_language"
-            android:nextFocusDown="@id/subtitles_remove_bloat"
-            android:text="@string/subs_download_languages" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/subtitles_remove_bloat"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusUp="@id/subs_download_languages"
-            android:nextFocusDown="@id/subtitles_remove_captions"
-            android:text="@string/subtitles_remove_bloat"
-            app:trackTint="@color/toggle_selector"
-            app:drawableEndCompat="@null" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/subtitles_remove_captions"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusUp="@id/subtitles_remove_bloat"
-            android:nextFocusDown="@id/subtitles_filter_sub_lang"
-            android:text="@string/subtitles_remove_captions"
-            app:trackTint="@color/toggle_selector"
-            app:drawableEndCompat="@null" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/subtitles_filter_sub_lang"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusUp="@id/subtitles_remove_captions"
-            android:nextFocusDown="@id/subtitles_uppercase"
-            android:text="@string/subtitles_filter_lang"
-            app:trackTint="@color/toggle_selector"
-            app:drawableEndCompat="@null" />
-
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/subtitles_uppercase"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusUp="@id/subtitles_filter_sub_lang"
-            android:nextFocusDown="@id/subtitles_bold"
-            android:text="@string/uppercase_all_subtitles"
-            app:trackTint="@color/toggle_selector"
-            app:drawableEndCompat="@null" />
+                android:layout_height="75sp">
+
+                <ImageView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/preview_background_img_des"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/subtitles_preview_background" />
+
+                <androidx.media3.ui.SubtitleView
+                    android:id="@+id/subtitle_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:foregroundGravity="center" />
+            </FrameLayout>
+
+            <TextView
+                android:id="@+id/subs_font"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
 
+                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusDown="@id/subs_font_size"
+                android:text="@string/subs_font" />
 
+            <TextView
+                android:id="@+id/subs_font_size"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/subtitles_bold"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusUp="@id/subtitles_uppercase"
-            android:nextFocusDown="@id/subtitles_italic"
-            android:text="@string/all_subtitles_bold"
-            app:trackTint="@color/toggle_selector"
-            app:drawableEndCompat="@null" />
+                android:nextFocusUp="@id/subs_font"
+                android:nextFocusDown="@id/subs_text_color"
+                android:text="@string/subs_font_size" />
 
+            <TextView
+                android:id="@+id/subs_text_color"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
 
+                android:nextFocusUp="@id/subs_font_size"
+                android:nextFocusDown="@id/subs_outline_color"
+                android:text="@string/subs_text_color" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/subtitles_italic"
-            style="@style/SettingsItem"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fontFamily="@font/google_sans"
-            android:nextFocusLeft="@id/apply_btt"
-            android:nextFocusRight="@id/cancel_btt"
-            android:nextFocusUp="@id/subtitles_bold"
-            android:nextFocusDown="@id/apply_btt"
-            android:text="@string/all_subtitles_italic"
-            app:trackTint="@color/toggle_selector"
-            app:drawableEndCompat="@null" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_rowWeight="1"
+            <TextView
+                android:id="@+id/subs_outline_color"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
 
-            android:gravity="center"
-            android:text="@string/subs_hold_to_reset_to_default"
-            android:textColor="?attr/textColor"
-            android:textSize="14sp" />
+                android:nextFocusUp="@id/subs_text_color"
+                android:nextFocusDown="@id/subs_background_color"
+                android:text="@string/subs_outline_color" />
 
-        <TextView
-            android:id="@+id/subs_import_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_rowWeight="1"
-            android:gravity="center"
-            android:text="@string/subs_import_text"
-            android:textColor="?attr/textColor"
-            android:textSize="14sp" />
+            <TextView
+                android:id="@+id/subs_background_color"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_gravity="bottom"
-            android:gravity="bottom|end"
-            android:orientation="horizontal">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/apply_btt"
-                style="@style/WhiteButton"
-                android:layout_width="wrap_content"
-                android:layout_gravity="center_vertical|end"
+                android:nextFocusUp="@id/subs_outline_color"
+                android:nextFocusDown="@id/subs_background_radius"
+                android:text="@string/subs_background_color" />
+
+            <TextView
+                android:id="@+id/subs_background_radius"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
                 android:nextFocusRight="@id/cancel_btt"
-                android:nextFocusUp="@id/subtitles_italic"
-                android:text="@string/sort_apply"
-                android:visibility="visible">
-
-                <requestFocus />
-            </com.google.android.material.button.MaterialButton>
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/cancel_btt"
-                style="@style/BlackButton"
-                android:layout_width="wrap_content"
-                android:layout_gravity="center_vertical|end"
+
+                android:nextFocusUp="@id/subs_background_color"
+                android:nextFocusDown="@id/subs_window_color"
+                android:text="@string/background_radius" />
+
+            <TextView
+                android:id="@+id/subs_window_color"
+                style="@style/SettingsItem"
                 android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_background_radius"
+                android:nextFocusDown="@id/subs_edge_type"
+                android:text="@string/subs_window_color" />
+
+            <TextView
+                android:id="@+id/subs_edge_type"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_window_color"
+                android:nextFocusDown="@id/subs_edge_size"
+                android:text="@string/subs_edge_type" />
+
+            <TextView
+                android:id="@+id/subs_edge_size"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_edge_type"
+                android:nextFocusDown="@id/subs_subtitle_alignment"
+                android:text="@string/subs_edge_size" />
+
+            <TextView
+                android:id="@+id/subs_subtitle_alignment"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_edge_size"
+                android:nextFocusDown="@id/subs_subtitle_elevation"
+                android:text="@string/subs_subtitle_alignment" />
+
+            <TextView
+                android:id="@+id/subs_subtitle_elevation"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_subtitle_alignment"
+                android:nextFocusDown="@id/subs_auto_select_language"
+                android:text="@string/subs_subtitle_elevation" />
+
+            <TextView
+                android:id="@+id/subs_auto_select_language"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_subtitle_elevation"
+                android:nextFocusDown="@id/subs_download_languages"
+                android:text="@string/subs_auto_select_language" />
+
+            <TextView
+                android:id="@+id/subs_download_languages"
+                style="@style/SettingsItem"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+
+                android:nextFocusUp="@id/subs_auto_select_language"
+                android:nextFocusDown="@id/subtitles_remove_bloat"
+                android:text="@string/subs_download_languages" />
+
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/subtitles_remove_bloat"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusUp="@id/subs_download_languages"
+                android:nextFocusDown="@id/subtitles_remove_captions"
+                android:text="@string/subtitles_remove_bloat"
+                app:trackTint="@color/toggle_selector"
+                app:drawableEndCompat="@null" />
+
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/subtitles_remove_captions"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusUp="@id/subtitles_remove_bloat"
+                android:nextFocusDown="@id/subtitles_filter_sub_lang"
+                android:text="@string/subtitles_remove_captions"
+                app:trackTint="@color/toggle_selector"
+                app:drawableEndCompat="@null" />
+
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/subtitles_filter_sub_lang"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
                 android:nextFocusUp="@id/subtitles_remove_captions"
-                android:text="@string/sort_cancel" />
+                android:nextFocusDown="@id/subtitles_uppercase"
+                android:text="@string/subtitles_filter_lang"
+                app:trackTint="@color/toggle_selector"
+                app:drawableEndCompat="@null" />
+
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/subtitles_uppercase"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusUp="@id/subtitles_filter_sub_lang"
+                android:nextFocusDown="@id/subtitles_bold"
+                android:text="@string/uppercase_all_subtitles"
+                app:trackTint="@color/toggle_selector"
+                app:drawableEndCompat="@null" />
+
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/subtitles_bold"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusUp="@id/subtitles_uppercase"
+                android:nextFocusDown="@id/subtitles_italic"
+                android:text="@string/all_subtitles_bold"
+                app:trackTint="@color/toggle_selector"
+                app:drawableEndCompat="@null" />
+
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/subtitles_italic"
+                style="@style/SettingsItem"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fontFamily="@font/google_sans"
+                android:nextFocusLeft="@id/apply_btt"
+                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusUp="@id/subtitles_bold"
+                android:nextFocusDown="@id/apply_btt"
+                android:text="@string/all_subtitles_italic"
+                app:trackTint="@color/toggle_selector"
+                app:drawableEndCompat="@null" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_rowWeight="1"
+
+                android:gravity="center"
+                android:text="@string/subs_hold_to_reset_to_default"
+                android:textColor="?attr/textColor"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/subs_import_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_rowWeight="1"
+                android:gravity="center"
+                android:text="@string/subs_import_text"
+                android:textColor="?attr/textColor"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:layout_gravity="bottom"
+                android:gravity="bottom|end"
+                android:orientation="horizontal">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/apply_btt"
+                    style="@style/WhiteButton"
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center_vertical|end"
+                    android:nextFocusRight="@id/cancel_btt"
+                    android:nextFocusUp="@id/subtitles_italic"
+                    android:text="@string/sort_apply"
+                    android:visibility="visible">
+
+                    <requestFocus />
+                </com.google.android.material.button.MaterialButton>
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/cancel_btt"
+                    style="@style/BlackButton"
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center_vertical|end"
+                    android:nextFocusLeft="@id/apply_btt"
+                    android:nextFocusUp="@id/subtitles_remove_captions"
+                    android:text="@string/sort_cancel" />
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
+    </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5bf1e87ed8..fbb0e35c93 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -18,6 +18,9 @@
     <dimen name="storage_radius">3dp</dimen>
     <dimen name="navbar_width">0dp</dimen>
 
+    <dimen name="nav_view_height">70dp</dimen>
+    <dimen name="nav_rail_view_width">62dp</dimen>
+
     <dimen name="download_size">50dp</dimen>
     <dimen name="video_frame_width">1dp</dimen>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6e18c6ed87..290ec5da3d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,26 +1,22 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. Material3 -->
     <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
         <item name="android:windowBackground">@drawable/splash_background</item>
-        <item name="android:navigationBarColor">?attr/primaryBlackBackground</item>
         <item name="android:colorEdgeEffect">?attr/textColor</item>
 
-        <!-- Opt out of edgeToEdge enforcement in >= Android 15 -->
-        <!-- However this will be deprecated in future (ETA ~ 1.6 years) -->
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
-        <!--<item name="android:navigationBarColor">@color/darkBackground</item>-->
+        <item name="android:navigationBarColor">?attr/primaryBlackBackground</item>
         <item name="android:statusBarColor">?attr/iconGrayBackground</item>
 
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+
         <item name="android:scrollbarThumbVertical">@null</item>
         <item name="android:scrollbarThumbHorizontal">@null</item>
 
-        <item name="android:windowTranslucentStatus">true</item> <!--true-->
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
-
         <item name="android:textViewStyle">@style/AppTextViewStyle</item>
         <item name="android:buttonStyle">@style/AppButtonStyle</item>
         <item name="android:editTextStyle">@style/AppEditStyle</item>
+        <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
         <item name="materialButtonStyle">@style/AppMaterialButtonStyle</item>
         <item name="preferenceFragmentCompatStyle">@style/PreferenceTheme</item>
         <item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
@@ -176,8 +172,9 @@
         <item name="grayTextColor">@color/lightGrayTextColor</item>
         <item name="white">@color/black</item>
         <item name="black">@color/white</item>
-
         <item name="colorOnPrimary">@color/blackText</item>
+        <item name="isLightTheme">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="DraculaMode">
@@ -202,6 +199,8 @@
         <item name="white">@color/LavenderTextColor</item>
         <item name="black">@color/LavenderPrimaryGrayBackground</item>
         <item name="colorOnPrimary">@color/LavenderTextColor</item>
+        <item name="isLightTheme">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
     <style name="MonetMode">
@@ -565,6 +564,17 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
+    <style name="DialogFullscreenPlayer" parent="DialogFullscreen">
+        <item name="android:windowBackground">?attr/primaryBlackBackground</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:windowTranslucentStatus">false</item>
+
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:navigationBarColor">?attr/primaryBlackBackground</item>
+        <item name="android:statusBarColor">?attr/primaryBlackBackground</item>
+        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
+    </style>
+
     <style name="DialogHalfFullscreen" parent="AlertDialogCustom">
         <item name="android:windowEnterAnimation">@anim/enter_anim</item>
         <item name="android:windowExitAnimation">@anim/exit_anim</item>
@@ -614,7 +624,7 @@
 
     <style name="SettingsItem">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">50sp</item>
+        <item name="android:layout_height">50dp</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:paddingStart">20dp</item>
         <item name="android:paddingEnd">20dp</item>