diff --git a/app/src/main/res/drawable/ic_baseline_edit_24.xml b/app/src/main/res/drawable/ic_baseline_edit_24.xml
new file mode 100644
index 00000000..dba3e567
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_edit_24.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_list_item_editing.xml b/app/src/main/res/layout/account_list_item_editing.xml
index 64f4d15f..3e33a396 100644
--- a/app/src/main/res/layout/account_list_item_editing.xml
+++ b/app/src/main/res/layout/account_list_item_editing.xml
@@ -46,10 +46,10 @@
 
     <ImageView
         android:id="@+id/pencil_icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:layout_gravity="center"
-        android:src="@drawable/ic_outline_account_circle_24"
+        android:src="@drawable/ic_baseline_edit_24"
         android:visibility="visible" />
 
     <TextView
diff --git a/app/src/main/res/layout/activity_account_select.xml b/app/src/main/res/layout/activity_account_select.xml
index 499bed12..3cfdd639 100644
--- a/app/src/main/res/layout/activity_account_select.xml
+++ b/app/src/main/res/layout/activity_account_select.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout 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"
@@ -9,6 +8,16 @@
     android:paddingTop="36dp"
     android:gravity="center">
 
+    <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_marginEnd="16dp"
+        android:src="@drawable/ic_baseline_edit_24"
+        android:contentDescription="@string/manage_accounts" />
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -25,16 +34,4 @@
         android:layout_gravity="center_horizontal"
         android:paddingLeft="16dp"
         android:paddingRight="16dp" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/edit_account_button"
-        style="@style/RegularButtonTV"
-
-        android:layout_width="wrap_content"
-        android:minWidth="150dp"
-
-        android:text="@string/edit"
-        app:icon="@drawable/ic_baseline_add_24" />
-
 </LinearLayout>
-
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 351315f4..dd653d2b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -726,4 +726,5 @@
     <string name="pin_error_incorrect">Incorrect PIN. Please try again.</string>
     <string name="pin_error_length">PIN must be 4 characters</string>
     <string name="select_an_account">Select an Account</string>
+    <string name="manage_accounts">Manage accounts</string>
 </resources>