diff --git a/app/src/main/res/layout/player_custom_layout_tv.xml b/app/src/main/res/layout/player_custom_layout_tv.xml
index 20b2c219..de010761 100644
--- a/app/src/main/res/layout/player_custom_layout_tv.xml
+++ b/app/src/main/res/layout/player_custom_layout_tv.xml
@@ -298,73 +298,67 @@
                     android:layout_gravity="center">
 
                 <LinearLayout
+                        android:id="@+id/player_lock_holder"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:paddingTop="10dp"
-                        android:paddingBottom="10dp">
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
 
                     <com.google.android.material.button.MaterialButton
-                            android:id="@+id/player_lock"
+                            android:id="@+id/player_resize_btt"
                             style="@style/VideoButtonTV"
-                            android:nextFocusLeft="@id/player_skip_episode"
-                            android:nextFocusRight="@id/player_resize_btt"
+                            android:nextFocusLeft="@id/player_lock"
+                            android:nextFocusRight="@id/player_speed_btt"
                             android:nextFocusUp="@id/player_pause_play"
-                            android:text="@string/video_lock"
-                            app:icon="@drawable/video_locked" />
+                            android:text="@string/video_aspect_ratio_resize"
+                            app:icon="@drawable/ic_baseline_aspect_ratio_24" />
 
-                    <LinearLayout
-                            android:id="@+id/player_lock_holder"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:orientation="horizontal">
+                    <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_speed_btt"
+                            style="@style/VideoButtonTV"
+                            android:nextFocusLeft="@id/player_resize_btt"
+                            android:nextFocusRight="@id/player_subtitle_offset_btt"
+                            android:nextFocusUp="@id/player_pause_play"
+                            app:icon="@drawable/ic_baseline_speed_24"
+                            tools:text="Speed" />
 
-                        <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_resize_btt"
-                                style="@style/VideoButtonTV"
-                                android:nextFocusLeft="@id/player_lock"
-                                android:nextFocusRight="@id/player_speed_btt"
-                                android:nextFocusUp="@id/player_pause_play"
-                                android:text="@string/video_aspect_ratio_resize"
-                                app:icon="@drawable/ic_baseline_aspect_ratio_24" />
+                    <com.google.android.material.button.MaterialButton
+                            android:visibility="gone"
+                            tools:visibility="visible"
+                            android:id="@+id/player_subtitle_offset_btt"
+                            style="@style/VideoButtonTV"
+                            android:nextFocusLeft="@id/player_speed_btt"
 
-                        <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_speed_btt"
-                                style="@style/VideoButtonTV"
-                                android:nextFocusLeft="@id/player_resize_btt"
-                                android:nextFocusRight="@id/player_sources_btt"
-                                android:nextFocusUp="@id/player_pause_play"
-                                app:icon="@drawable/ic_baseline_speed_24"
-                                tools:text="Speed" />
+                            android:nextFocusRight="@id/player_sources_btt"
+                            app:icon="@drawable/ic_outline_subtitles_24"
+                            android:text="@string/subtitle_offset"/>
 
-                        <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_sources_btt"
-                                style="@style/VideoButtonTV"
-                                android:nextFocusLeft="@id/player_speed_btt"
-                                android:nextFocusRight="@id/player_skip_op"
-                                android:nextFocusUp="@id/player_pause_play"
-                                android:text="@string/video_source"
-                                app:icon="@drawable/ic_baseline_playlist_play_24" />
+                    <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_sources_btt"
+                            style="@style/VideoButtonTV"
+                            android:nextFocusLeft="@id/player_subtitle_offset_btt"
+                            android:nextFocusRight="@id/player_skip_op"
+                            android:nextFocusUp="@id/player_pause_play"
+                            android:text="@string/video_source"
+                            app:icon="@drawable/ic_baseline_playlist_play_24" />
 
-                        <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_skip_op"
-                                style="@style/VideoButtonTV"
-                                android:nextFocusLeft="@id/player_sources_btt"
-                                android:nextFocusRight="@id/player_skip_episode"
-                                android:nextFocusUp="@id/player_pause_play"
-                                android:text="@string/video_skip_op"
-                                app:icon="@drawable/ic_baseline_fast_forward_24" />
+                    <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_skip_op"
+                            style="@style/VideoButtonTV"
+                            android:nextFocusLeft="@id/player_sources_btt"
+                            android:nextFocusRight="@id/player_skip_episode"
+                            android:nextFocusUp="@id/player_pause_play"
+                            android:text="@string/video_skip_op"
+                            app:icon="@drawable/ic_baseline_fast_forward_24" />
 
-                        <com.google.android.material.button.MaterialButton
-                                android:id="@+id/player_skip_episode"
-                                style="@style/VideoButtonTV"
+                    <com.google.android.material.button.MaterialButton
+                            android:id="@+id/player_skip_episode"
+                            style="@style/VideoButtonTV"
 
-                                android:nextFocusLeft="@id/player_skip_op"
-                                android:nextFocusRight="@id/player_lock"
-                                android:nextFocusUp="@id/player_pause_play"
-                                android:text="@string/next_episode"
-                                app:icon="@drawable/ic_baseline_skip_next_24" />
-                    </LinearLayout>
+                            android:nextFocusLeft="@id/player_skip_op"
+                            android:nextFocusRight="@id/player_lock"
+                            android:nextFocusUp="@id/player_pause_play"
+                            android:text="@string/next_episode"
+                            app:icon="@drawable/ic_baseline_skip_next_24" />
                 </LinearLayout>
             </HorizontalScrollView>
         </LinearLayout>