diff --git a/app/src/leanback/res/layout/view_control_cast.xml b/app/src/leanback/res/layout/view_control_cast.xml
index 7752483cc..dc8b92189 100644
--- a/app/src/leanback/res/layout/view_control_cast.xml
+++ b/app/src/leanback/res/layout/view_control_cast.xml
@@ -26,118 +26,56 @@
+ android:text="@string/play_reset" />
+ android:text="@string/play_exo" />
+ android:text="@string/play_decode" />
+ android:fontFeatureSettings="tnum"
+ android:text="@string/play_speed" />
+ android:text="@string/play_scale" />
+ android:text="@string/play_track_text" />
+ android:text="@string/play_track_audio" />
+ android:text="@string/play_track_video" />
diff --git a/app/src/leanback/res/layout/view_control_live.xml b/app/src/leanback/res/layout/view_control_live.xml
index 88874deb7..88666163d 100644
--- a/app/src/leanback/res/layout/view_control_live.xml
+++ b/app/src/leanback/res/layout/view_control_live.xml
@@ -19,173 +19,92 @@
+ android:text="@string/play" />
+ android:text="@string/play_exo" />
+ android:text="@string/play_decode" />
+ android:text="@string/play_scale" />
+ android:text="@string/play_track_audio" />
+ android:text="@string/play_track_video" />
+ android:text="@string/play_invert" />
+ android:text="@string/play_across" />
+ android:text="@string/play_change" />
diff --git a/app/src/leanback/res/layout/view_control_vod.xml b/app/src/leanback/res/layout/view_control_vod.xml
index 3139d8b98..caa8f8306 100644
--- a/app/src/leanback/res/layout/view_control_vod.xml
+++ b/app/src/leanback/res/layout/view_control_vod.xml
@@ -36,210 +36,100 @@
+ android:text="@string/play_next" />
+ android:text="@string/play_prev" />
+ android:text="@string/play_reset" />
+ android:text="@string/play_change" />
+ android:text="@string/play_exo" />
+ android:text="@string/play_decode" />
+ android:fontFeatureSettings="tnum"
+ android:text="@string/play_speed" />
+ android:text="@string/play_scale" />
+ android:text="@string/play_track_text" />
+ android:text="@string/play_track_audio" />
+ android:text="@string/play_track_video" />
+ android:text="@string/play_op" />
+ android:text="@string/play_ed" />
+ android:visibility="gone"
+ tools:visibility="visible" />
+ android:text="@string/play_loop" />
diff --git a/app/src/leanback/res/layout/view_widget_cast.xml b/app/src/leanback/res/layout/view_widget_cast.xml
index 6790e115e..cb51167e4 100644
--- a/app/src/leanback/res/layout/view_widget_cast.xml
+++ b/app/src/leanback/res/layout/view_widget_cast.xml
@@ -12,6 +12,7 @@
diff --git a/app/src/leanback/res/layout/view_widget_live.xml b/app/src/leanback/res/layout/view_widget_live.xml
index fcc1fc740..8b6333652 100644
--- a/app/src/leanback/res/layout/view_widget_live.xml
+++ b/app/src/leanback/res/layout/view_widget_live.xml
@@ -14,6 +14,7 @@
diff --git a/app/src/leanback/res/layout/view_widget_vod.xml b/app/src/leanback/res/layout/view_widget_vod.xml
index b07786bf6..5577d311c 100644
--- a/app/src/leanback/res/layout/view_widget_vod.xml
+++ b/app/src/leanback/res/layout/view_widget_vod.xml
@@ -12,6 +12,7 @@
diff --git a/app/src/leanback/res/values/styles.xml b/app/src/leanback/res/values/styles.xml
index d14d53f96..7a3792229 100644
--- a/app/src/leanback/res/values/styles.xml
+++ b/app/src/leanback/res/values/styles.xml
@@ -23,6 +23,24 @@
- @null
+
+
+
+