diff --git a/app/src/main/res/layout/cast_item.xml b/app/src/main/res/layout/cast_item.xml
index c09cecfa..368fa770 100644
--- a/app/src/main/res/layout/cast_item.xml
+++ b/app/src/main/res/layout/cast_item.xml
@@ -17,6 +17,7 @@
         android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        android:focusable="true"
         android:padding="5dp">
         <!--app:cardCornerRadius="@dimen/roundedImageRadius"-->
         <FrameLayout
@@ -34,7 +35,6 @@
 
                     android:id="@+id/actor_image"
                     android:layout_width="match_parent"
-                    android:focusable="true"
                     android:layout_height="match_parent"
                     android:contentDescription="@string/episode_poster_img_des"
                     android:scaleType="centerCrop"
diff --git a/app/src/main/res/layout/player_prioritize_item.xml b/app/src/main/res/layout/player_prioritize_item.xml
index b78863f8..a8a9729d 100644
--- a/app/src/main/res/layout/player_prioritize_item.xml
+++ b/app/src/main/res/layout/player_prioritize_item.xml
@@ -22,6 +22,7 @@
         android:layout_toStartOf="@id/priority_number"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
+        android:focusable="true"
         android:src="@drawable/baseline_remove_24" />
 
     <TextView
@@ -43,6 +44,7 @@
         android:layout_centerVertical="true"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="10dp"
+        android:focusable="true"
         android:src="@drawable/ic_baseline_add_24" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/player_select_source_priority.xml b/app/src/main/res/layout/player_select_source_priority.xml
index 86a8a756..2af3c339 100644
--- a/app/src/main/res/layout/player_select_source_priority.xml
+++ b/app/src/main/res/layout/player_select_source_priority.xml
@@ -42,8 +42,8 @@
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
                 android:listSelector="@drawable/outline_drawable_less"
-                android:nextFocusLeft="@id/sort_subtitles"
-                android:nextFocusRight="@id/apply_btt"
+                android:nextFocusRight="@id/sort_subtitles"
+                android:nextFocusDown="@id/profile_text_editable"
                 android:requiresFadingEdge="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:layout_height="100dp"
@@ -92,6 +92,8 @@
                         android:layout_height="50dp"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:padding="12dp"
+                        android:focusable="true"
+                        android:nextFocusLeft="@id/sort_sources"
                         android:src="@drawable/baseline_help_outline_24"
                         android:contentDescription="@string/help" />
 
@@ -115,8 +117,10 @@
                 android:layout_rowWeight="1"
                 android:background="?attr/primaryBlackBackground"
                 android:listSelector="@drawable/outline_drawable_less"
-                android:nextFocusLeft="@id/sort_providers"
-                android:nextFocusRight="@id/cancel_btt"
+                android:nextFocusLeft="@id/sort_sources"
+                android:nextFocusRight="@id/apply_btt"
+                android:nextFocusUp="@id/help_btt"
+                android:nextFocusDown="@id/apply_btt"
                 android:requiresFadingEdge="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:layout_height="200dp"
diff --git a/app/src/main/res/layout/subtitle_offset.xml b/app/src/main/res/layout/subtitle_offset.xml
index a98fafef..c17c5eff 100644
--- a/app/src/main/res/layout/subtitle_offset.xml
+++ b/app/src/main/res/layout/subtitle_offset.xml
@@ -35,6 +35,7 @@
             android:layout_gravity="center"
             android:layout_weight="1"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:focusable="true"
             android:nextFocusRight="@id/subtitle_offset_subtract"
             android:padding="10dp"
             android:src="@drawable/ic_baseline_keyboard_arrow_left_24"
@@ -48,6 +49,7 @@
             android:layout_gravity="center"
             android:layout_weight="1"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:focusable="true"
             android:nextFocusLeft="@id/subtitle_offset_subtract_more"
             android:padding="10dp"
             android:src="@drawable/baseline_remove_24"
@@ -70,6 +72,7 @@
             android:layout_gravity="center"
             android:layout_weight="1"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:focusable="true"
             android:nextFocusRight="@id/subtitle_offset_add_more"
             android:padding="10dp"
             android:src="@drawable/ic_baseline_add_24"
@@ -83,7 +86,9 @@
             android:layout_gravity="center"
             android:layout_weight="1"
             android:background="?android:attr/selectableItemBackgroundBorderless"
+            android:focusable="true"
             android:nextFocusLeft="@id/subtitle_offset_add"
+            android:nextFocusDown="@id/apply_btt"
             android:padding="10dp"
             android:src="@drawable/ic_baseline_keyboard_arrow_right_24"
             app:tint="?attr/white"
diff --git a/app/src/main/res/layout/who_is_watching_account.xml b/app/src/main/res/layout/who_is_watching_account.xml
index afa1a2a7..4970d004 100644
--- a/app/src/main/res/layout/who_is_watching_account.xml
+++ b/app/src/main/res/layout/who_is_watching_account.xml
@@ -11,6 +11,7 @@
     android:foreground="?attr/selectableItemBackgroundBorderless"
     app:cardCornerRadius="@dimen/rounded_image_radius"
     android:layout_margin="5dp"
+    android:focusable="true"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintDimensionRatio="1"
     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/who_is_watching_account_add.xml b/app/src/main/res/layout/who_is_watching_account_add.xml
index ed67e144..91c7e419 100644
--- a/app/src/main/res/layout/who_is_watching_account_add.xml
+++ b/app/src/main/res/layout/who_is_watching_account_add.xml
@@ -11,6 +11,7 @@
     android:foreground="?attr/selectableItemBackgroundBorderless"
     app:cardCornerRadius="@dimen/rounded_image_radius"
     android:layout_margin="5dp"
+    android:focusable="true"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintDimensionRatio="1"
     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/who_is_watching_account_edit.xml b/app/src/main/res/layout/who_is_watching_account_edit.xml
index 74553517..cec37a4f 100644
--- a/app/src/main/res/layout/who_is_watching_account_edit.xml
+++ b/app/src/main/res/layout/who_is_watching_account_edit.xml
@@ -88,6 +88,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:layout_gravity="center"
+                android:focusable="true"
                 android:contentDescription="@string/preview_background_img_des"
                 android:scaleType="centerCrop"
                 android:src="@drawable/profile_bg_blue" />