diff --git a/app/src/main/res/layout/player_activity.xml b/app/src/main/res/layout/player_activity.xml
index 25e9d63e1..14fd817ff 100644
--- a/app/src/main/res/layout/player_activity.xml
+++ b/app/src/main/res/layout/player_activity.xml
@@ -20,16 +20,6 @@
         android:layout_height="match_parent"
         android:background="#70000000" />
 
-    <ImageButton
-        android:layout_marginHorizontal="5dp"
-        android:id="@+id/unlockControls"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/ic_lock_open_24dp"
-        android:visibility="gone"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        app:tint="?attr/colorOnPrimarySurface" />
-
     <!-- This LinearLayout only exists to prevent clipping -->
     <LinearLayout
         android:layout_width="match_parent"
@@ -66,6 +56,8 @@
         android:layout_height="48dp"
         android:src="@drawable/ic_lock_open_24dp"
         android:layout_alignParentLeft="true"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="10dp"
         android:visibility="gone"
         android:background="?attr/selectableItemBackgroundBorderless"
         app:tint="?attr/colorOnPrimarySurface" />
@@ -74,6 +66,7 @@
         android:id="@+id/controls_top"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
         android:gravity="center">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -86,7 +79,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:src="@drawable/ic_arrow_back_24dp"
-                android:layout_marginRight="20dp"
+                android:layout_marginHorizontal="10dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 app:tint="?attr/colorOnPrimarySurface"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -129,6 +122,7 @@
                 android:layout_height="48dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:onClick="openSettings"
+                android:layout_marginRight="10dp"
                 android:src="@drawable/ic_settings_24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
@@ -251,6 +245,7 @@
                         android:id="@+id/lockBtn"
                         android:layout_width="48dp"
                         android:layout_height="48dp"
+                        android:layout_marginLeft="10dp"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:src="@drawable/ic_lock_24dp"
                         app:tint="?attr/colorOnPrimarySurface" />
@@ -284,6 +279,7 @@
                         android:id="@+id/cycleViewModeBtn"
                         android:layout_width="48dp"
                         android:layout_height="match_parent"
+                        android:layout_marginRight="10dp"
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:contentDescription="Cycle view modes"
                         android:onClick="cycleViewMode"
@@ -305,6 +301,7 @@
                     android:id="@+id/prevBtn"
                     android:layout_width="48dp"
                     android:layout_height="48dp"
+                    android:layout_marginLeft="10dp"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/action_previous_episode"
                     android:padding="@dimen/screen_edge_margin"
@@ -341,6 +338,7 @@
                     android:id="@+id/nextBtn"
                     android:layout_width="48dp"
                     android:layout_height="48dp"
+                    android:layout_marginRight="10dp"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/action_next_episode"
                     android:padding="@dimen/screen_edge_margin"
@@ -384,4 +382,4 @@
         android:layout_height="match_parent"
         android:visibility="gone" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>