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 d138a1e6..f54c8698 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
@@ -11,6 +11,9 @@ import com.lagradost.cloudstream3.databinding.FragmentChildDownloadsBinding
 import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup.handleDownloadClick
 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.isLayout
 import com.lagradost.cloudstream3.utils.Coroutines.main
 import com.lagradost.cloudstream3.utils.DataStore.getKey
 import com.lagradost.cloudstream3.utils.DataStore.getKeys
@@ -86,9 +89,11 @@ class DownloadChildFragment : Fragment() {
 
         binding?.downloadChildToolbar?.apply {
             title = name
-            setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-            setNavigationOnClickListener {
-                activity?.onBackPressedDispatcher?.onBackPressed()
+            if (isLayout(PHONE or EMULATOR)) {
+                setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
+                setNavigationOnClickListener {
+                    activity?.onBackPressedDispatcher?.onBackPressed()
+                }
             }
             setAppBarNoScrollFlagsOnTV()
         }
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 e9e00736..85e20d1c 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
@@ -34,6 +34,9 @@ import com.lagradost.cloudstream3.ui.search.SearchAdapter
 import com.lagradost.cloudstream3.ui.search.SearchClickCallback
 import com.lagradost.cloudstream3.ui.search.SearchHelper
 import com.lagradost.cloudstream3.ui.search.SearchViewModel
+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.AppUtils.ownShow
@@ -274,8 +277,13 @@ class QuickSearchFragment : Fragment() {
         //        UIHelper.showInputMethod(view.findFocus())
         //    }
         //}
-        binding?.quickSearchBack?.setOnClickListener {
-            activity?.popCurrentPage()
+        if (isLayout(PHONE or EMULATOR)) {
+            binding?.quickSearchBack?.apply {
+                isVisible = true
+                setOnClickListener {
+                    activity?.popCurrentPage()
+                }
+            }
         }
 
         if (isLayout(TV)) {
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 443eeda7..8ac17928 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
@@ -23,6 +23,7 @@ import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.account
 import com.lagradost.cloudstream3.ui.home.HomeFragment
 import com.lagradost.cloudstream3.ui.result.txt
 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.DataStoreHelper
@@ -84,9 +85,11 @@ class SettingsFragment : Fragment() {
 
             settingsToolbar.apply {
                 setTitle(title)
-                setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-                setNavigationOnClickListener {
-                    activity?.onBackPressedDispatcher?.onBackPressed()
+                if (isLayout(PHONE or EMULATOR)) {
+                    setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
+                    setNavigationOnClickListener {
+                        activity?.onBackPressedDispatcher?.onBackPressed()
+                    }
                 }
             }
             UIHelper.fixPaddingStatusbar(settingsToolbar)
@@ -98,10 +101,12 @@ class SettingsFragment : Fragment() {
 
             settingsToolbar.apply {
                 setTitle(title)
-                setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
-                children.firstOrNull { it is ImageView }?.tag = getString(R.string.tv_no_focus_tag)
-                setNavigationOnClickListener {
-                    activity?.onBackPressedDispatcher?.onBackPressed()
+                if (isLayout(PHONE or EMULATOR)) {
+                    setNavigationIcon(R.drawable.ic_baseline_arrow_back_24)
+                    children.firstOrNull { it is ImageView }?.tag = getString(R.string.tv_no_focus_tag)
+                    setNavigationOnClickListener {
+                        activity?.onBackPressedDispatcher?.onBackPressed()
+                    }
                 }
             }
             UIHelper.fixPaddingStatusbar(settingsToolbar)
diff --git a/app/src/main/res/layout/quick_search.xml b/app/src/main/res/layout/quick_search.xml
index 12d94aaa..84f2c548 100644
--- a/app/src/main/res/layout/quick_search.xml
+++ b/app/src/main/res/layout/quick_search.xml
@@ -23,11 +23,10 @@
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:src="@drawable/ic_baseline_arrow_back_24"
             app:tint="@android:color/white"
-            android:focusable="true"
+            android:visibility="gone"
             android:layout_width="25dp"
-            android:layout_height="wrap_content">
-
-            <requestFocus />
+            android:layout_height="wrap_content"
+            tools:visibility="visible">
         </ImageView>
 
         <FrameLayout