merge PR #24 changes made by jbaiter

78 files changed, 9 insertions, 9 deletions

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 00000000..700fc815
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_accept.png
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 00000000..ae02bea6
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_accounts.png
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 00000000..e206f296
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_cancel.png
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 00000000..f97df1d5
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_copy.png
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 00000000..703b31f8
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_discard.png
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 00000000..d866d616
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_new.png
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 00000000..dae27903
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_refresh.png
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 00000000..0fe36a1e
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_save.png
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 b5544aaa..00000000
--- a/app/src/main/res/drawable-hdpi/ico_add.png
+++ /dev/null
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 58831148..00000000
--- a/app/src/main/res/drawable-hdpi/ico_cancel.png
+++ /dev/null
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 b9cb0f93..00000000
--- a/app/src/main/res/drawable-hdpi/ico_check.png
+++ /dev/null
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 1d994832..00000000
--- a/app/src/main/res/drawable-hdpi/ico_confirm_add.png
+++ /dev/null
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 d4facfa3..00000000
--- a/app/src/main/res/drawable-hdpi/ico_copy.png
+++ /dev/null
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 7be9fc76..00000000
--- a/app/src/main/res/drawable-hdpi/ico_del.png
+++ /dev/null
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 a7604ac4..00000000
--- a/app/src/main/res/drawable-hdpi/ico_eye.png
+++ /dev/null
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 35c2fa31..00000000
--- a/app/src/main/res/drawable-hdpi/ico_key.png
+++ /dev/null
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 16f1f00d..00000000
--- a/app/src/main/res/drawable-hdpi/ico_sync.png
+++ /dev/null
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 d28e4963..00000000
--- a/app/src/main/res/drawable-hdpi/ico_undo.png
+++ /dev/null
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 00000000..41107b87
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_accept.png
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 00000000..2a703c14
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_accounts.png
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 00000000..70e6d2d2
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_cancel.png
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 00000000..d846e72c
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_copy.png
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 00000000..248fb09c
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_discard.png
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 00000000..f17e7980
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_new.png
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 00000000..94ab6f4c
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_refresh.png
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 00000000..664260d8
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_save.png
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 eec9dafc..00000000
--- a/app/src/main/res/drawable-mdpi/ico_add.png
+++ /dev/null
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 926a6692..00000000
--- a/app/src/main/res/drawable-mdpi/ico_cancel.png
+++ /dev/null
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 1040ae02..00000000
--- a/app/src/main/res/drawable-mdpi/ico_check.png
+++ /dev/null
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 dc54f8dd..00000000
--- a/app/src/main/res/drawable-mdpi/ico_confirm_add.png
+++ /dev/null
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 b508dccb..00000000
--- a/app/src/main/res/drawable-mdpi/ico_copy.png
+++ /dev/null
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 78e2dbd1..00000000
--- a/app/src/main/res/drawable-mdpi/ico_del.png
+++ /dev/null
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 84325f9a..00000000
--- a/app/src/main/res/drawable-mdpi/ico_eye.png
+++ /dev/null
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 5dc650bf..00000000
--- a/app/src/main/res/drawable-mdpi/ico_key.png
+++ /dev/null
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 6c69bce0..00000000
--- a/app/src/main/res/drawable-mdpi/ico_sync.png
+++ /dev/null
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 bce52b80..00000000
--- a/app/src/main/res/drawable-mdpi/ico_undo.png
+++ /dev/null
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 00000000..6ee32b64
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_accept.png
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 00000000..d2cb5819
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_accounts.png
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 00000000..d1634205
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_cancel.png
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 00000000..a6e1aa29
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_copy.png
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 00000000..9eeeed12
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_discard.png
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 00000000..dde2141f
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_new.png
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 00000000..ab4ab9da
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_refresh.png
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 00000000..dde278b5
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_save.png
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 598647f0..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_add.png
+++ /dev/null
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 36f3e0a4..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_cancel.png
+++ /dev/null
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 ab20156a..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_check.png
+++ /dev/null
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 44e369cc..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_confirm_add.png
+++ /dev/null
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 5dd46582..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_copy.png
+++ /dev/null
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 66c779f2..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_del.png
+++ /dev/null
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 517360ba..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_eye.png
+++ /dev/null
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 2bb671ad..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_key.png
+++ /dev/null
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 80346dd3..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_sync.png
+++ /dev/null
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 3cac411c..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_undo.png
+++ /dev/null
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 00000000..68c41dec
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_accept.png
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 00000000..568a47be
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_accounts.png
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 00000000..5dc21435
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_cancel.png
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 00000000..a381cdc3
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_copy.png
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 00000000..cb1260a4
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_discard.png
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 00000000..c42c2bfb
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_new.png
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 00000000..44ee117e
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png
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 00000000..ccf8c82c
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_save.png
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 b617b81e..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_add.png
+++ /dev/null
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 f91e7381..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_cancel.png
+++ /dev/null
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 998b2bf8..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_check.png
+++ /dev/null
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 cdd7baea..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_confirm_add.png
+++ /dev/null
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 0269afad..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_copy.png
+++ /dev/null
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 d8d0a61a..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_del.png
+++ /dev/null
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 8dec5464..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_eye.png
+++ /dev/null
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 2d05b5c6..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_key.png
+++ /dev/null
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 c0b7dd9d..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_sync.png
+++ /dev/null
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 01de3cb5..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_undo.png
+++ /dev/null
diff --git a/app/src/main/res/layout/child_row_layout.xml b/app/src/main/res/layout/child_row_layout.xml
index 75efefad..d61586a9 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 5f447a9d..5fc93b3c 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 00cbedde..ffeb7a0d 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 fce0d5fe..009e3fd4 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 fac4e163..56298a33 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 d5d4361d..bfb3ad0c 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"