diff --git a/app/src/main/res/drawable-hdpi/ic_action_accept.png b/app/src/main/res/drawable-hdpi/ic_action_accept.png
new file mode 100644
index 000000000..700fc8151
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_accept.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_accounts.png b/app/src/main/res/drawable-hdpi/ic_action_accounts.png
new file mode 100644
index 000000000..ae02bea67
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_accounts.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_cancel.png b/app/src/main/res/drawable-hdpi/ic_action_cancel.png
new file mode 100644
index 000000000..e206f296c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_cancel.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_copy.png b/app/src/main/res/drawable-hdpi/ic_action_copy.png
new file mode 100644
index 000000000..f97df1d51
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_copy.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_discard.png b/app/src/main/res/drawable-hdpi/ic_action_discard.png
new file mode 100644
index 000000000..703b31f80
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_discard.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_new.png b/app/src/main/res/drawable-hdpi/ic_action_new.png
new file mode 100644
index 000000000..d866d6160
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_new.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh.png b/app/src/main/res/drawable-hdpi/ic_action_refresh.png
new file mode 100644
index 000000000..dae27903e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_refresh.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_save.png b/app/src/main/res/drawable-hdpi/ic_action_save.png
new file mode 100644
index 000000000..0fe36a1ec
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_save.png differ
diff --git a/app/src/main/res/drawable-hdpi/ico_add.png b/app/src/main/res/drawable-hdpi/ico_add.png
deleted file mode 100644
index b5544aaa5..000000000
Binary files a/app/src/main/res/drawable-hdpi/ico_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ico_cancel.png b/app/src/main/res/drawable-hdpi/ico_cancel.png
deleted file mode 100644
index 58831148c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ico_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ico_check.png b/app/src/main/res/drawable-hdpi/ico_check.png
deleted file mode 100644
index b9cb0f93c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ico_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ico_confirm_add.png b/app/src/main/res/drawable-hdpi/ico_confirm_add.png
deleted file mode 100644
index 1d994832a..000000000
Binary files a/app/src/main/res/drawable-hdpi/ico_confirm_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ico_copy.png b/app/src/main/res/drawable-hdpi/ico_copy.png
deleted file mode 100644
index d4facfa30..000000000
Binary files a/app/src/main/res/drawable-hdpi/ico_copy.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ico_del.png b/app/src/main/res/drawable-hdpi/ico_del.png
deleted file mode 100644
index 7be9fc76f..000000000
Binary files a/app/src/main/res/drawable-hdpi/ico_del.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ico_eye.png b/app/src/main/res/drawable-hdpi/ico_eye.png
deleted file mode 100644
index a7604ac45..000000000
Binary files a/app/src/main/res/drawable-hdpi/ico_eye.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ico_key.png b/app/src/main/res/drawable-hdpi/ico_key.png
deleted file mode 100644
index 35c2fa311..000000000
Binary files a/app/src/main/res/drawable-hdpi/ico_key.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ico_sync.png b/app/src/main/res/drawable-hdpi/ico_sync.png
deleted file mode 100644
index 16f1f00d8..000000000
Binary files a/app/src/main/res/drawable-hdpi/ico_sync.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ico_undo.png b/app/src/main/res/drawable-hdpi/ico_undo.png
deleted file mode 100644
index d28e49639..000000000
Binary files a/app/src/main/res/drawable-hdpi/ico_undo.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_accept.png b/app/src/main/res/drawable-mdpi/ic_action_accept.png
new file mode 100644
index 000000000..41107b870
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_accept.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_accounts.png b/app/src/main/res/drawable-mdpi/ic_action_accounts.png
new file mode 100644
index 000000000..2a703c14e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_accounts.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_cancel.png b/app/src/main/res/drawable-mdpi/ic_action_cancel.png
new file mode 100644
index 000000000..70e6d2d2a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_cancel.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_copy.png b/app/src/main/res/drawable-mdpi/ic_action_copy.png
new file mode 100644
index 000000000..d846e72c6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_copy.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_discard.png b/app/src/main/res/drawable-mdpi/ic_action_discard.png
new file mode 100644
index 000000000..248fb09cd
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_discard.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_new.png b/app/src/main/res/drawable-mdpi/ic_action_new.png
new file mode 100644
index 000000000..f17e7980e
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_new.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh.png b/app/src/main/res/drawable-mdpi/ic_action_refresh.png
new file mode 100644
index 000000000..94ab6f4c5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_refresh.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_save.png b/app/src/main/res/drawable-mdpi/ic_action_save.png
new file mode 100644
index 000000000..664260d8c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_save.png differ
diff --git a/app/src/main/res/drawable-mdpi/ico_add.png b/app/src/main/res/drawable-mdpi/ico_add.png
deleted file mode 100644
index eec9dafce..000000000
Binary files a/app/src/main/res/drawable-mdpi/ico_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ico_cancel.png b/app/src/main/res/drawable-mdpi/ico_cancel.png
deleted file mode 100644
index 926a6692e..000000000
Binary files a/app/src/main/res/drawable-mdpi/ico_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ico_check.png b/app/src/main/res/drawable-mdpi/ico_check.png
deleted file mode 100644
index 1040ae02e..000000000
Binary files a/app/src/main/res/drawable-mdpi/ico_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ico_confirm_add.png b/app/src/main/res/drawable-mdpi/ico_confirm_add.png
deleted file mode 100644
index dc54f8dda..000000000
Binary files a/app/src/main/res/drawable-mdpi/ico_confirm_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ico_copy.png b/app/src/main/res/drawable-mdpi/ico_copy.png
deleted file mode 100644
index b508dccbc..000000000
Binary files a/app/src/main/res/drawable-mdpi/ico_copy.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ico_del.png b/app/src/main/res/drawable-mdpi/ico_del.png
deleted file mode 100644
index 78e2dbd18..000000000
Binary files a/app/src/main/res/drawable-mdpi/ico_del.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ico_eye.png b/app/src/main/res/drawable-mdpi/ico_eye.png
deleted file mode 100644
index 84325f9a2..000000000
Binary files a/app/src/main/res/drawable-mdpi/ico_eye.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ico_key.png b/app/src/main/res/drawable-mdpi/ico_key.png
deleted file mode 100644
index 5dc650bff..000000000
Binary files a/app/src/main/res/drawable-mdpi/ico_key.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ico_sync.png b/app/src/main/res/drawable-mdpi/ico_sync.png
deleted file mode 100644
index 6c69bce0a..000000000
Binary files a/app/src/main/res/drawable-mdpi/ico_sync.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ico_undo.png b/app/src/main/res/drawable-mdpi/ico_undo.png
deleted file mode 100644
index bce52b807..000000000
Binary files a/app/src/main/res/drawable-mdpi/ico_undo.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_accept.png b/app/src/main/res/drawable-xhdpi/ic_action_accept.png
new file mode 100644
index 000000000..6ee32b64d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_accept.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_accounts.png b/app/src/main/res/drawable-xhdpi/ic_action_accounts.png
new file mode 100644
index 000000000..d2cb5819b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_accounts.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_cancel.png b/app/src/main/res/drawable-xhdpi/ic_action_cancel.png
new file mode 100644
index 000000000..d1634205d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_cancel.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_copy.png b/app/src/main/res/drawable-xhdpi/ic_action_copy.png
new file mode 100644
index 000000000..a6e1aa290
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_copy.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_discard.png b/app/src/main/res/drawable-xhdpi/ic_action_discard.png
new file mode 100644
index 000000000..9eeeed124
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_discard.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_new.png b/app/src/main/res/drawable-xhdpi/ic_action_new.png
new file mode 100644
index 000000000..dde2141f2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_new.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh.png
new file mode 100644
index 000000000..ab4ab9da6
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_refresh.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_save.png b/app/src/main/res/drawable-xhdpi/ic_action_save.png
new file mode 100644
index 000000000..dde278b5e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_save.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_add.png b/app/src/main/res/drawable-xhdpi/ico_add.png
deleted file mode 100644
index 598647f0b..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ico_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_cancel.png b/app/src/main/res/drawable-xhdpi/ico_cancel.png
deleted file mode 100644
index 36f3e0a4a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ico_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_check.png b/app/src/main/res/drawable-xhdpi/ico_check.png
deleted file mode 100644
index ab20156aa..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ico_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_confirm_add.png b/app/src/main/res/drawable-xhdpi/ico_confirm_add.png
deleted file mode 100644
index 44e369cca..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ico_confirm_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_copy.png b/app/src/main/res/drawable-xhdpi/ico_copy.png
deleted file mode 100644
index 5dd46582a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ico_copy.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_del.png b/app/src/main/res/drawable-xhdpi/ico_del.png
deleted file mode 100644
index 66c779f2a..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ico_del.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_eye.png b/app/src/main/res/drawable-xhdpi/ico_eye.png
deleted file mode 100644
index 517360ba9..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ico_eye.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_key.png b/app/src/main/res/drawable-xhdpi/ico_key.png
deleted file mode 100644
index 2bb671ada..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ico_key.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_sync.png b/app/src/main/res/drawable-xhdpi/ico_sync.png
deleted file mode 100644
index 80346dd3d..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ico_sync.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ico_undo.png b/app/src/main/res/drawable-xhdpi/ico_undo.png
deleted file mode 100644
index 3cac411c4..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ico_undo.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_accept.png b/app/src/main/res/drawable-xxhdpi/ic_action_accept.png
new file mode 100644
index 000000000..68c41decc
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_accept.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_accounts.png b/app/src/main/res/drawable-xxhdpi/ic_action_accounts.png
new file mode 100644
index 000000000..568a47be1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_accounts.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/app/src/main/res/drawable-xxhdpi/ic_action_cancel.png
new file mode 100644
index 000000000..5dc214356
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_cancel.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_copy.png b/app/src/main/res/drawable-xxhdpi/ic_action_copy.png
new file mode 100644
index 000000000..a381cdc3f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_copy.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_discard.png b/app/src/main/res/drawable-xxhdpi/ic_action_discard.png
new file mode 100644
index 000000000..cb1260a4c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_discard.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_new.png b/app/src/main/res/drawable-xxhdpi/ic_action_new.png
new file mode 100644
index 000000000..c42c2bfb5
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_new.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png
new file mode 100644
index 000000000..44ee117ee
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_save.png b/app/src/main/res/drawable-xxhdpi/ic_action_save.png
new file mode 100644
index 000000000..ccf8c82cd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_save.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_add.png b/app/src/main/res/drawable-xxhdpi/ico_add.png
deleted file mode 100644
index b617b81e4..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ico_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_cancel.png b/app/src/main/res/drawable-xxhdpi/ico_cancel.png
deleted file mode 100644
index f91e7381a..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ico_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_check.png b/app/src/main/res/drawable-xxhdpi/ico_check.png
deleted file mode 100644
index 998b2bf88..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ico_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_confirm_add.png b/app/src/main/res/drawable-xxhdpi/ico_confirm_add.png
deleted file mode 100644
index cdd7baeae..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ico_confirm_add.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_copy.png b/app/src/main/res/drawable-xxhdpi/ico_copy.png
deleted file mode 100644
index 0269afad4..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ico_copy.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_del.png b/app/src/main/res/drawable-xxhdpi/ico_del.png
deleted file mode 100644
index d8d0a61a9..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ico_del.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_eye.png b/app/src/main/res/drawable-xxhdpi/ico_eye.png
deleted file mode 100644
index 8dec54643..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ico_eye.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_key.png b/app/src/main/res/drawable-xxhdpi/ico_key.png
deleted file mode 100644
index 2d05b5c6b..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ico_key.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_sync.png b/app/src/main/res/drawable-xxhdpi/ico_sync.png
deleted file mode 100644
index c0b7dd9d2..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ico_sync.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ico_undo.png b/app/src/main/res/drawable-xxhdpi/ico_undo.png
deleted file mode 100644
index 01de3cb53..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ico_undo.png and /dev/null differ
diff --git a/app/src/main/res/layout/child_row_layout.xml b/app/src/main/res/layout/child_row_layout.xml
index 75efefada..d61586a9c 100644
--- a/app/src/main/res/layout/child_row_layout.xml
+++ b/app/src/main/res/layout/child_row_layout.xml
@@ -10,7 +10,7 @@
             android:id="@+id/crypto_delete_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ico_del"
+            android:src="@drawable/ic_action_discard"
             android:background="@drawable/red_rectangle"
             android:layout_gravity="center_vertical"
             android:layout_column="1"
@@ -20,7 +20,7 @@
             android:id="@+id/crypto_show_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ico_key"
+            android:src="@drawable/ic_action_accounts"
             android:background="@drawable/blue_rectangle"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="8dp"
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml
index 5f447a9d5..5fc93b3cb 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/encrypt_layout.xml
@@ -97,7 +97,7 @@
         <ImageButton
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:src="@drawable/ico_confirm_add"
+            android:src="@drawable/ic_action_save"
             android:background="@drawable/blue_rectangle"
             android:id="@+id/crypto_confirm_add"
             android:onClick="handleClick"
@@ -108,7 +108,7 @@
         <ImageButton
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:src="@drawable/ico_cancel"
+            android:src="@drawable/ic_action_cancel"
             android:background="@drawable/red_rectangle"
             android:id="@+id/crypto_cancel_add"
             android:onClick="handleClick"
diff --git a/app/src/main/res/layout/key_id.xml b/app/src/main/res/layout/key_id.xml
index 00cbeddeb..ffeb7a0db 100644
--- a/app/src/main/res/layout/key_id.xml
+++ b/app/src/main/res/layout/key_id.xml
@@ -34,7 +34,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_column="3"
-            android:src="@drawable/ico_key"
+            android:src="@drawable/ic_action_accounts"
             android:background="@android:color/transparent"
             android:onClick="handleClick"
             android:layout_gravity="center_vertical"/>
diff --git a/app/src/main/res/menu/context_pass.xml b/app/src/main/res/menu/context_pass.xml
index fce0d5fe0..009e3fd48 100644
--- a/app/src/main/res/menu/context_pass.xml
+++ b/app/src/main/res/menu/context_pass.xml
@@ -4,7 +4,7 @@
     tools:context=".pwdstore">
 
     <item android:id="@+id/menu_delete_password"
-        android:icon="@drawable/ico_del"
+        android:icon="@drawable/ic_action_discard"
         app:showAsAction="always"
         android:title="Delete"/>
 </menu>
diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml
index fac4e1633..56298a33e 100644
--- a/app/src/main/res/menu/pgp_handler.xml
+++ b/app/src/main/res/menu/pgp_handler.xml
@@ -3,7 +3,7 @@
     xmlns:pwstore="http://schemas.android.com/apk/res-auto"
     tools:context="com.zeapo.pwdstore.crypto.PgpHandler" >
     <item android:title="Copy password"
-        android:icon="@drawable/ico_copy"
+        android:icon="@drawable/ic_action_copy"
         pwstore:showAsAction="ifRoom"
         android:id="@+id/copy_password"
         />
diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml
index d5d4361d7..bfb3ad0c8 100644
--- a/app/src/main/res/menu/pwdstore.xml
+++ b/app/src/main/res/menu/pwdstore.xml
@@ -10,7 +10,7 @@
           pwstore:actionViewClass="android.support.v7.widget.SearchView" />
 
     <item android:id="@+id/menu_add_password"
-        android:icon="@drawable/ico_add"
+        android:icon="@drawable/ic_action_new"
         pwstore:showAsAction="ifRoom"
         android:title="New password"/>
 
@@ -24,7 +24,7 @@
 
     <item android:id="@+id/refresh"
         android:title="Refresh list"
-        pwstore:showAsAction="never"
+        android:showAsAction="never"
         android:icon="@drawable/ico_sync"/>
 
     <item android:id="@+id/user_pref"