diff --git a/app/src/main/res/layout/playlist_control.xml b/app/src/main/res/layout/playlist_control.xml
index 685082013c4..baf94e9e0f3 100644
--- a/app/src/main/res/layout/playlist_control.xml
+++ b/app/src/main/res/layout/playlist_control.xml
@@ -8,23 +8,29 @@
 
     <LinearLayout
         android:id="@+id/playlist_ctrl_play_bg_button"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/playlist_ctrl_height"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:orientation="vertical"
+        android:gravity="center"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:gravity="center">
+        android:paddingVertical="8dp">
 
-        <org.schabi.newpipe.views.NewPipeTextView
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/ic_headset"
+            android:contentDescription="@string/controls_background_title" />
+
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/ic_headset"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
             android:text="@string/controls_background_title"
-            android:textColor="?attr/colorAccent"
-            android:textSize="@dimen/channel_rss_title_size" />
+            android:textColor="#6C6C6C"
+            android:textSize="@dimen/channel_rss_title_size"
+            android:gravity="center" />
     </LinearLayout>
 
     <View
@@ -37,23 +43,29 @@
 
     <LinearLayout
         android:id="@+id/playlist_ctrl_play_all_button"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:orientation="vertical"
+        android:gravity="center"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:gravity="center">
+        android:paddingVertical="8dp">
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/ic_playlist_play"
+            android:contentDescription="@string/play_all" />
 
-        <org.schabi.newpipe.views.NewPipeTextView
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/ic_playlist_play"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
             android:text="@string/play_all"
-            android:textColor="?attr/colorAccent"
-            android:textSize="@dimen/channel_rss_title_size" />
+            android:textColor="#6C6C6C"
+            android:textSize="@dimen/channel_rss_title_size"
+            android:gravity="center" />
     </LinearLayout>
 
     <View
@@ -66,22 +78,29 @@
 
     <LinearLayout
         android:id="@+id/playlist_ctrl_play_popup_button"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:orientation="vertical"
+        android:gravity="center"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:gravity="center">
+        android:paddingVertical="8dp">
+
+        <ImageView
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/ic_picture_in_picture"
+            android:contentDescription="@string/controls_popup_title" />
 
-        <org.schabi.newpipe.views.NewPipeTextView
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/ic_picture_in_picture"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
             android:text="@string/controls_popup_title"
-            android:textColor="?attr/colorAccent"
-            android:textSize="@dimen/channel_rss_title_size" />
+            android:textColor="#6C6C6C"
+            android:textSize="@dimen/channel_rss_title_size"
+            android:gravity="center" />
     </LinearLayout>
+
 </LinearLayout>