diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml
index 6468c6784..40229e329 100644
--- a/app/src/main/res/layout-land/activity_player_queue_control.xml
+++ b/app/src/main/res/layout-land/activity_player_queue_control.xml
@@ -111,7 +111,7 @@
             tools:ignore="RtlHardcoded">
 
             <ImageButton
-                android:id="@+id/control_backward"
+                android:id="@+id/control_fast_rewind"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_centerVertical="true"
@@ -121,7 +121,7 @@
                 android:focusable="true"
                 android:scaleType="fitCenter"
                 android:tint="?attr/colorAccent"
-                android:src="@drawable/exo_controls_previous"
+                android:src="@drawable/exo_controls_rewind"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 tools:ignore="ContentDescription"/>
 
@@ -161,7 +161,7 @@
                 android:visibility="invisible"/>
 
             <ImageButton
-                android:id="@+id/control_forward"
+                android:id="@+id/control_fast_forward"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
                 android:layout_centerVertical="true"
@@ -172,7 +172,7 @@
                 android:focusable="true"
                 android:scaleType="fitCenter"
                 android:tint="?attr/colorAccent"
-                android:src="@drawable/exo_controls_next"
+                android:src="@drawable/exo_controls_fastforward"
                 tools:ignore="ContentDescription"/>
         </RelativeLayout>
 
@@ -185,8 +185,8 @@
             android:orientation="horizontal"
             tools:ignore="RtlHardcoded">
 
-            <TextView
-                android:id="@+id/control_playback_speed"
+            <ImageButton
+                android:id="@+id/control_backward"
                 android:layout_width="wrap_content"
                 android:layout_height="35dp"
                 android:layout_marginLeft="5dp"
@@ -195,11 +195,13 @@
                 android:layout_toLeftOf="@+id/control_repeat"
                 android:gravity="center"
                 android:minWidth="50dp"
-                android:text="1x"
-                android:textColor="?attr/colorAccent"
-                android:textStyle="bold"
-                android:background="?attr/selectableItemBackground"
-                tools:ignore="HardcodedText,RtlHardcoded"/>
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:clickable="true"
+                android:focusable="true"
+                android:scaleType="fitXY"
+                android:src="@drawable/exo_controls_previous"
+                android:tint="?attr/colorAccent"
+                tools:ignore="ContentDescription" />
 
             <ImageButton
                 android:id="@+id/control_repeat"
@@ -236,8 +238,8 @@
                 android:src="@drawable/ic_shuffle_white_24dp"
                 tools:ignore="ContentDescription"/>
 
-            <TextView
-                android:id="@+id/control_playback_pitch"
+            <ImageButton
+                android:id="@+id/control_forward"
                 android:layout_width="wrap_content"
                 android:layout_height="35dp"
                 android:layout_marginLeft="5dp"
@@ -246,11 +248,13 @@
                 android:layout_toRightOf="@+id/control_shuffle"
                 android:gravity="center"
                 android:minWidth="50dp"
-                android:text="100%"
-                android:textColor="?attr/colorAccent"
-                android:textStyle="bold"
-                android:background="?attr/selectableItemBackground"
-                tools:ignore="HardcodedText,RtlHardcoded"/>
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:clickable="true"
+                android:focusable="true"
+                android:scaleType="fitXY"
+                android:src="@drawable/exo_controls_next"
+                android:tint="?attr/colorAccent"
+                tools:ignore="ContentDescription" />
         </RelativeLayout>
     </RelativeLayout>