diff --git a/app/src/main/res/layout/account_list_item_edit.xml b/app/src/main/res/layout/account_list_item_edit.xml
index 29c86784..4732ae49 100644
--- a/app/src/main/res/layout/account_list_item_edit.xml
+++ b/app/src/main/res/layout/account_list_item_edit.xml
@@ -39,7 +39,7 @@
         android:id="@+id/lock_icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_gravity="top|start"
+        android:layout_gravity="top|end"
         android:layout_margin="4dp"
         android:src="@drawable/video_locked"
         android:visibility="gone" />
@@ -48,7 +48,7 @@
         android:id="@+id/pencil_icon"
         android:layout_width="42dp"
         android:layout_height="42dp"
-        android:layout_gravity="top|end"
+        android:layout_gravity="top|start"
         android:src="@drawable/ic_baseline_edit_24" />
 
     <TextView
diff --git a/app/src/main/res/layout/activity_account_select.xml b/app/src/main/res/layout/activity_account_select.xml
index a6818568..c0038acd 100644
--- a/app/src/main/res/layout/activity_account_select.xml
+++ b/app/src/main/res/layout/activity_account_select.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/primaryBlackBackground"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingTop="36dp"
-    android:gravity="center">
+    android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/edit_account_button"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_gravity="end|top"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="40dp"
         android:layout_marginEnd="16dp"
         android:src="@drawable/ic_baseline_edit_24"
         android:focusable="true"
@@ -23,21 +20,29 @@
         android:contentDescription="@string/manage_accounts"
         app:tint="@color/player_on_button_tv_attr" />
 
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/select_an_account"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingTop="36dp"
+        android:gravity="center">
 
-    <com.lagradost.cloudstream3.ui.AutofitRecyclerView
-        android:id="@+id/account_recycler_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp" />
-</LinearLayout>
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/select_an_account"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp" />
+
+        <com.lagradost.cloudstream3.ui.AutofitRecyclerView
+            android:id="@+id/account_recycler_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp" />
+    </LinearLayout>
+</FrameLayout>