diff --git a/app/src/main/res/drawable/baseline_drive_file_move_24.xml b/app/src/main/res/drawable/baseline_drive_file_move_24.xml
index baee78a..eb839b1 100644
--- a/app/src/main/res/drawable/baseline_drive_file_move_24.xml
+++ b/app/src/main/res/drawable/baseline_drive_file_move_24.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:tint="?android:attr/textColor" android:viewportHeight="24"
     android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM14,18v-3h-4v-4h4L14,8l5,5 -5,5z"/>
 </vector>
diff --git a/app/src/main/res/menu/menu_otps.xml b/app/src/main/res/menu/menu_otps.xml
index ee1b5b4..b276e30 100644
--- a/app/src/main/res/menu/menu_otps.xml
+++ b/app/src/main/res/menu/menu_otps.xml
@@ -31,6 +31,12 @@
                 app:showAsAction="never"/>
         </menu>
     </item>
+    <item
+        android:id="@+id/action_lock"
+        android:orderInCategory="100"
+        android:title="Lock"
+        app:showAsAction="never"
+        android:onClick="lockApp" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
@@ -43,10 +49,4 @@
         android:title="@string/action_about"
         app:showAsAction="never"
         android:onClick="openAbout" />
-    <item
-        android:id="@+id/action_lock"
-        android:orderInCategory="100"
-        android:title="Lock"
-        app:showAsAction="never"
-        android:onClick="lockApp" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_otps_edit.xml b/app/src/main/res/menu/menu_otps_edit.xml
index d459948..7d06562 100644
--- a/app/src/main/res/menu/menu_otps_edit.xml
+++ b/app/src/main/res/menu/menu_otps_edit.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/action_view_otp"
         android:orderInCategory="100"
-        android:icon="@drawable/baseline_preview_24"
+        android:icon="@drawable/baseline_visibility_24"
         android:title="View OTP"
         android:onClick="viewOTP"
         app:showAsAction="always" />
@@ -18,7 +18,7 @@
     <item
         android:id="@+id/action_move_otp"
         android:orderInCategory="100"
-        android:icon="@drawable/baseline_drive_file_move_rtl_24"
+        android:icon="@drawable/baseline_drive_file_move_24"
         android:title="Move OTP"
         android:onClick="moveOTP"
         app:showAsAction="always" />
@@ -29,6 +29,12 @@
         android:title="Delete OTP"
         android:onClick="deleteOTP"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/action_lock"
+        android:orderInCategory="100"
+        android:title="Lock"
+        app:showAsAction="never"
+        android:onClick="lockApp" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
@@ -41,10 +47,4 @@
         android:title="@string/action_about"
         app:showAsAction="never"
         android:onClick="openAbout" />
-    <item
-        android:id="@+id/action_lock"
-        android:orderInCategory="100"
-        android:title="Lock"
-        app:showAsAction="never"
-        android:onClick="lockApp" />
 </menu>
\ No newline at end of file