aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorzeapo <mohamed@zenadi.com>2014-10-29 22:25:11 +0100
committerzeapo <mohamed@zenadi.com>2014-10-29 22:25:11 +0100
commite33341da9797f030a2a33b83816f5e90a5a303fd (patch)
tree445a97806f69d392cc1428821839ac516870b520 /app/src/main
parentca06b9626e33c195ff9c183be6c4e33a637bebf1 (diff)
Merge pull request #24 from jbaiter/holo-icons
Previously most of the icons looked a bit cobbled together and not very Android-y. This PR replaces them with semantically equivalent icons from Google's Iconography recommendations. This aligns Android-Password-Store more with Google's design recommendations and other Android apps.
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_accept.pngbin0 -> 401 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_accounts.pngbin0 -> 577 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_cancel.pngbin0 -> 353 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_copy.pngbin0 -> 375 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_discard.pngbin0 -> 450 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_new.pngbin0 -> 262 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_refresh.pngbin0 -> 663 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_save.pngbin0 -> 394 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ico_add.pngbin368 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ico_cancel.pngbin246 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ico_check.pngbin505 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ico_confirm_add.pngbin427 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ico_copy.pngbin235 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ico_del.pngbin701 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ico_eye.pngbin472 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ico_key.pngbin853 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ico_sync.pngbin919 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ico_undo.pngbin394 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_accept.pngbin0 -> 246 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_accounts.pngbin0 -> 456 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_cancel.pngbin0 -> 272 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_copy.pngbin0 -> 284 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_discard.pngbin0 -> 324 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_new.pngbin0 -> 185 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_refresh.pngbin0 -> 508 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_save.pngbin0 -> 362 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ico_add.pngbin266 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ico_cancel.pngbin178 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ico_check.pngbin306 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ico_confirm_add.pngbin277 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ico_copy.pngbin191 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ico_del.pngbin433 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ico_eye.pngbin291 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ico_key.pngbin531 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ico_sync.pngbin583 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ico_undo.pngbin287 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_accept.pngbin0 -> 475 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_accounts.pngbin0 -> 688 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_cancel.pngbin0 -> 415 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_copy.pngbin0 -> 351 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_discard.pngbin0 -> 543 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_new.pngbin0 -> 234 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_refresh.pngbin0 -> 895 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_save.pngbin0 -> 441 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ico_add.pngbin521 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ico_cancel.pngbin341 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ico_check.pngbin470 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ico_confirm_add.pngbin497 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ico_copy.pngbin263 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ico_del.pngbin684 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ico_eye.pngbin624 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ico_key.pngbin957 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ico_sync.pngbin1224 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ico_undo.pngbin475 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_accept.pngbin0 -> 619 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_accounts.pngbin0 -> 973 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_cancel.pngbin0 -> 574 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_copy.pngbin0 -> 464 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_discard.pngbin0 -> 765 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_new.pngbin0 -> 288 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_refresh.pngbin0 -> 1239 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_save.pngbin0 -> 495 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ico_add.pngbin840 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ico_cancel.pngbin494 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ico_check.pngbin891 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ico_confirm_add.pngbin731 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ico_copy.pngbin345 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ico_del.pngbin1332 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ico_eye.pngbin970 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ico_key.pngbin1739 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ico_sync.pngbin1895 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ico_undo.pngbin789 -> 0 bytes
-rw-r--r--app/src/main/res/layout/child_row_layout.xml4
-rw-r--r--app/src/main/res/layout/encrypt_layout.xml4
-rw-r--r--app/src/main/res/layout/key_id.xml2
-rw-r--r--app/src/main/res/menu/context_pass.xml2
-rw-r--r--app/src/main/res/menu/pgp_handler.xml2
-rw-r--r--app/src/main/res/menu/pwdstore.xml4
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
Binary files 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 00000000..ae02bea6
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_accounts.png
Binary files 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 00000000..e206f296
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_cancel.png
Binary files 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 00000000..f97df1d5
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_copy.png
Binary files 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 00000000..703b31f8
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_discard.png
Binary files 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 00000000..d866d616
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_new.png
Binary files 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 00000000..dae27903
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_refresh.png
Binary files 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 00000000..0fe36a1e
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_save.png
Binary files 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 b5544aaa..00000000
--- a/app/src/main/res/drawable-hdpi/ico_add.png
+++ /dev/null
Binary files 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 58831148..00000000
--- a/app/src/main/res/drawable-hdpi/ico_cancel.png
+++ /dev/null
Binary files 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 b9cb0f93..00000000
--- a/app/src/main/res/drawable-hdpi/ico_check.png
+++ /dev/null
Binary files 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 1d994832..00000000
--- a/app/src/main/res/drawable-hdpi/ico_confirm_add.png
+++ /dev/null
Binary files 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 d4facfa3..00000000
--- a/app/src/main/res/drawable-hdpi/ico_copy.png
+++ /dev/null
Binary files 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 7be9fc76..00000000
--- a/app/src/main/res/drawable-hdpi/ico_del.png
+++ /dev/null
Binary files 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 a7604ac4..00000000
--- a/app/src/main/res/drawable-hdpi/ico_eye.png
+++ /dev/null
Binary files 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 35c2fa31..00000000
--- a/app/src/main/res/drawable-hdpi/ico_key.png
+++ /dev/null
Binary files 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 16f1f00d..00000000
--- a/app/src/main/res/drawable-hdpi/ico_sync.png
+++ /dev/null
Binary files 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 d28e4963..00000000
--- a/app/src/main/res/drawable-hdpi/ico_undo.png
+++ /dev/null
Binary files 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 00000000..41107b87
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_accept.png
Binary files 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 00000000..2a703c14
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_accounts.png
Binary files 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 00000000..70e6d2d2
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_cancel.png
Binary files 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 00000000..d846e72c
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_copy.png
Binary files 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 00000000..248fb09c
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_discard.png
Binary files 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 00000000..f17e7980
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_new.png
Binary files 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 00000000..94ab6f4c
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_refresh.png
Binary files 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 00000000..664260d8
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_save.png
Binary files 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 eec9dafc..00000000
--- a/app/src/main/res/drawable-mdpi/ico_add.png
+++ /dev/null
Binary files 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 926a6692..00000000
--- a/app/src/main/res/drawable-mdpi/ico_cancel.png
+++ /dev/null
Binary files 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 1040ae02..00000000
--- a/app/src/main/res/drawable-mdpi/ico_check.png
+++ /dev/null
Binary files 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 dc54f8dd..00000000
--- a/app/src/main/res/drawable-mdpi/ico_confirm_add.png
+++ /dev/null
Binary files 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 b508dccb..00000000
--- a/app/src/main/res/drawable-mdpi/ico_copy.png
+++ /dev/null
Binary files 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 78e2dbd1..00000000
--- a/app/src/main/res/drawable-mdpi/ico_del.png
+++ /dev/null
Binary files 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 84325f9a..00000000
--- a/app/src/main/res/drawable-mdpi/ico_eye.png
+++ /dev/null
Binary files 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 5dc650bf..00000000
--- a/app/src/main/res/drawable-mdpi/ico_key.png
+++ /dev/null
Binary files 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 6c69bce0..00000000
--- a/app/src/main/res/drawable-mdpi/ico_sync.png
+++ /dev/null
Binary files 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 bce52b80..00000000
--- a/app/src/main/res/drawable-mdpi/ico_undo.png
+++ /dev/null
Binary files 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 00000000..6ee32b64
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_accept.png
Binary files 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 00000000..d2cb5819
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_accounts.png
Binary files 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 00000000..d1634205
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_cancel.png
Binary files 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 00000000..a6e1aa29
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_copy.png
Binary files 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 00000000..9eeeed12
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_discard.png
Binary files 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 00000000..dde2141f
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_new.png
Binary files 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 00000000..ab4ab9da
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files 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 00000000..dde278b5
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_save.png
Binary files 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 598647f0..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_add.png
+++ /dev/null
Binary files 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 36f3e0a4..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_cancel.png
+++ /dev/null
Binary files 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 ab20156a..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_check.png
+++ /dev/null
Binary files 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 44e369cc..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_confirm_add.png
+++ /dev/null
Binary files 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 5dd46582..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_copy.png
+++ /dev/null
Binary files 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 66c779f2..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_del.png
+++ /dev/null
Binary files 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 517360ba..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_eye.png
+++ /dev/null
Binary files 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 2bb671ad..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_key.png
+++ /dev/null
Binary files 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 80346dd3..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_sync.png
+++ /dev/null
Binary files 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 3cac411c..00000000
--- a/app/src/main/res/drawable-xhdpi/ico_undo.png
+++ /dev/null
Binary files 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 00000000..68c41dec
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_accept.png
Binary files 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 00000000..568a47be
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_accounts.png
Binary files 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 00000000..5dc21435
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_cancel.png
Binary files 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 00000000..a381cdc3
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_copy.png
Binary files 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 00000000..cb1260a4
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_discard.png
Binary files 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 00000000..c42c2bfb
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_new.png
Binary files 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 00000000..44ee117e
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png
Binary files 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 00000000..ccf8c82c
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_save.png
Binary files 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 b617b81e..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_add.png
+++ /dev/null
Binary files 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 f91e7381..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_cancel.png
+++ /dev/null
Binary files 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 998b2bf8..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_check.png
+++ /dev/null
Binary files 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 cdd7baea..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_confirm_add.png
+++ /dev/null
Binary files 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 0269afad..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_copy.png
+++ /dev/null
Binary files 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 d8d0a61a..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_del.png
+++ /dev/null
Binary files 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 8dec5464..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_eye.png
+++ /dev/null
Binary files 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 2d05b5c6..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_key.png
+++ /dev/null
Binary files 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 c0b7dd9d..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_sync.png
+++ /dev/null
Binary files 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 01de3cb5..00000000
--- a/app/src/main/res/drawable-xxhdpi/ico_undo.png
+++ /dev/null
Binary files differ
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"