From 48604a66201e0c0f403ba1576e35833c7407a7d0 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Wed, 21 Jan 2015 23:00:35 -0500
Subject: Use Material Design Icons on API 21+

---
 art/render.rb                                      |   1 +
 .../services/NotificationService.java              |  23 +++++++++++++++------
 .../conversations/ui/ConversationActivity.java     |   9 ++++++--
 src/main/res/drawable-hdpi/ic_add_white_48dp.png   | Bin 0 -> 222 bytes
 .../drawable-hdpi/ic_attach_file_white_48dp.png    | Bin 0 -> 870 bytes
 .../res/drawable-hdpi/ic_cancel_white_24dp.png     | Bin 0 -> 510 bytes
 .../res/drawable-hdpi/ic_cancel_white_36dp.png     | Bin 0 -> 751 bytes
 .../res/drawable-hdpi/ic_cancel_white_48dp.png     | Bin 0 -> 893 bytes
 src/main/res/drawable-hdpi/ic_chat_white_48dp.png  | Bin 0 -> 363 bytes
 .../drawable-hdpi/ic_content_copy_grey600_36dp.png | Bin 0 -> 348 bytes
 .../res/drawable-hdpi/ic_delete_white_48dp.png     | Bin 0 -> 338 bytes
 src/main/res/drawable-hdpi/ic_edit_black_48dp.png  | Bin 0 -> 366 bytes
 .../res/drawable-hdpi/ic_edit_grey600_36dp.png     | Bin 0 -> 419 bytes
 src/main/res/drawable-hdpi/ic_edit_white_48dp.png  | Bin 0 -> 490 bytes
 .../drawable-hdpi/ic_file_download_white_24dp.png  | Bin 0 -> 277 bytes
 .../drawable-hdpi/ic_file_download_white_36dp.png  | Bin 0 -> 354 bytes
 .../res/drawable-hdpi/ic_group_add_white_48dp.png  | Bin 0 -> 722 bytes
 src/main/res/drawable-hdpi/ic_group_white_48dp.png | Bin 0 -> 599 bytes
 .../drawable-hdpi/ic_import_export_white_48dp.png  | Bin 0 -> 414 bytes
 .../res/drawable-hdpi/ic_lock_open_white_48dp.png  | Bin 0 -> 739 bytes
 .../drawable-hdpi/ic_lock_outline_white_48dp.png   | Bin 0 -> 743 bytes
 .../res/drawable-hdpi/ic_person_add_white_48dp.png | Bin 0 -> 683 bytes
 .../res/drawable-hdpi/ic_refresh_white_48dp.png    | Bin 0 -> 875 bytes
 .../res/drawable-hdpi/ic_remove_grey600_36dp.png   | Bin 0 -> 217 bytes
 .../res/drawable-hdpi/ic_search_white_18dp.png     | Bin 0 -> 403 bytes
 .../res/drawable-hdpi/ic_search_white_48dp.png     | Bin 0 -> 871 bytes
 .../res/drawable-hdpi/ic_settings_grey600_36dp.png | Bin 0 -> 780 bytes
 .../res/drawable-hdpi/ic_warning_white_36dp.png    | Bin 0 -> 540 bytes
 src/main/res/drawable-mdpi/ic_add_white_48dp.png   | Bin 0 -> 198 bytes
 .../drawable-mdpi/ic_attach_file_white_48dp.png    | Bin 0 -> 576 bytes
 .../res/drawable-mdpi/ic_cancel_white_24dp.png     | Bin 0 -> 393 bytes
 .../res/drawable-mdpi/ic_cancel_white_36dp.png     | Bin 0 -> 510 bytes
 .../res/drawable-mdpi/ic_cancel_white_48dp.png     | Bin 0 -> 645 bytes
 src/main/res/drawable-mdpi/ic_chat_white_48dp.png  | Bin 0 -> 290 bytes
 .../drawable-mdpi/ic_content_copy_grey600_36dp.png | Bin 0 -> 287 bytes
 .../res/drawable-mdpi/ic_delete_white_48dp.png     | Bin 0 -> 270 bytes
 src/main/res/drawable-mdpi/ic_edit_black_48dp.png  | Bin 0 -> 299 bytes
 .../res/drawable-mdpi/ic_edit_grey600_36dp.png     | Bin 0 -> 341 bytes
 src/main/res/drawable-mdpi/ic_edit_white_48dp.png  | Bin 0 -> 378 bytes
 .../drawable-mdpi/ic_file_download_white_24dp.png  | Bin 0 -> 210 bytes
 .../drawable-mdpi/ic_file_download_white_36dp.png  | Bin 0 -> 277 bytes
 .../res/drawable-mdpi/ic_group_add_white_48dp.png  | Bin 0 -> 484 bytes
 src/main/res/drawable-mdpi/ic_group_white_48dp.png | Bin 0 -> 464 bytes
 .../drawable-mdpi/ic_import_export_white_48dp.png  | Bin 0 -> 330 bytes
 .../res/drawable-mdpi/ic_lock_open_white_48dp.png  | Bin 0 -> 513 bytes
 .../drawable-mdpi/ic_lock_outline_white_48dp.png   | Bin 0 -> 449 bytes
 .../res/drawable-mdpi/ic_person_add_white_48dp.png | Bin 0 -> 423 bytes
 .../res/drawable-mdpi/ic_refresh_white_48dp.png    | Bin 0 -> 637 bytes
 .../res/drawable-mdpi/ic_remove_grey600_36dp.png   | Bin 0 -> 197 bytes
 .../res/drawable-mdpi/ic_search_white_18dp.png     | Bin 0 -> 324 bytes
 .../res/drawable-mdpi/ic_search_white_48dp.png     | Bin 0 -> 591 bytes
 .../res/drawable-mdpi/ic_settings_grey600_36dp.png | Bin 0 -> 572 bytes
 .../res/drawable-mdpi/ic_warning_white_36dp.png    | Bin 0 -> 421 bytes
 src/main/res/drawable-xhdpi/ic_add_white_48dp.png  | Bin 0 -> 269 bytes
 .../drawable-xhdpi/ic_attach_file_white_48dp.png   | Bin 0 -> 1039 bytes
 .../res/drawable-xhdpi/ic_cancel_white_24dp.png    | Bin 0 -> 645 bytes
 .../res/drawable-xhdpi/ic_cancel_white_36dp.png    | Bin 0 -> 893 bytes
 .../res/drawable-xhdpi/ic_cancel_white_48dp.png    | Bin 0 -> 1179 bytes
 src/main/res/drawable-xhdpi/ic_chat_white_48dp.png | Bin 0 -> 533 bytes
 .../ic_content_copy_grey600_36dp.png               | Bin 0 -> 435 bytes
 .../res/drawable-xhdpi/ic_delete_white_48dp.png    | Bin 0 -> 397 bytes
 src/main/res/drawable-xhdpi/ic_edit_black_48dp.png | Bin 0 -> 406 bytes
 .../res/drawable-xhdpi/ic_edit_grey600_36dp.png    | Bin 0 -> 493 bytes
 src/main/res/drawable-xhdpi/ic_edit_white_48dp.png | Bin 0 -> 632 bytes
 .../drawable-xhdpi/ic_file_download_white_24dp.png | Bin 0 -> 282 bytes
 .../drawable-xhdpi/ic_file_download_white_36dp.png | Bin 0 -> 351 bytes
 .../res/drawable-xhdpi/ic_group_add_white_48dp.png | Bin 0 -> 935 bytes
 .../res/drawable-xhdpi/ic_group_white_48dp.png     | Bin 0 -> 759 bytes
 .../drawable-xhdpi/ic_import_export_white_48dp.png | Bin 0 -> 502 bytes
 .../res/drawable-xhdpi/ic_lock_open_white_48dp.png | Bin 0 -> 946 bytes
 .../drawable-xhdpi/ic_lock_outline_white_48dp.png  | Bin 0 -> 948 bytes
 .../drawable-xhdpi/ic_person_add_white_48dp.png    | Bin 0 -> 909 bytes
 .../res/drawable-xhdpi/ic_refresh_white_48dp.png   | Bin 0 -> 1148 bytes
 .../res/drawable-xhdpi/ic_remove_grey600_36dp.png  | Bin 0 -> 212 bytes
 .../res/drawable-xhdpi/ic_search_white_18dp.png    | Bin 0 -> 504 bytes
 .../res/drawable-xhdpi/ic_search_white_48dp.png    | Bin 0 -> 1090 bytes
 .../drawable-xhdpi/ic_settings_grey600_36dp.png    | Bin 0 -> 994 bytes
 .../res/drawable-xhdpi/ic_warning_white_36dp.png   | Bin 0 -> 639 bytes
 src/main/res/drawable-xxhdpi/ic_add_white_48dp.png | Bin 0 -> 356 bytes
 .../drawable-xxhdpi/ic_attach_file_white_48dp.png  | Bin 0 -> 1642 bytes
 .../res/drawable-xxhdpi/ic_cancel_white_24dp.png   | Bin 0 -> 893 bytes
 .../res/drawable-xxhdpi/ic_cancel_white_36dp.png   | Bin 0 -> 1325 bytes
 .../res/drawable-xxhdpi/ic_cancel_white_48dp.png   | Bin 0 -> 1742 bytes
 .../res/drawable-xxhdpi/ic_chat_white_48dp.png     | Bin 0 -> 717 bytes
 .../ic_content_copy_grey600_36dp.png               | Bin 0 -> 631 bytes
 .../res/drawable-xxhdpi/ic_delete_white_48dp.png   | Bin 0 -> 574 bytes
 .../res/drawable-xxhdpi/ic_edit_black_48dp.png     | Bin 0 -> 566 bytes
 .../res/drawable-xxhdpi/ic_edit_grey600_36dp.png   | Bin 0 -> 656 bytes
 .../res/drawable-xxhdpi/ic_edit_white_48dp.png     | Bin 0 -> 843 bytes
 .../ic_file_download_white_24dp.png                | Bin 0 -> 351 bytes
 .../ic_file_download_white_36dp.png                | Bin 0 -> 514 bytes
 .../drawable-xxhdpi/ic_group_add_white_48dp.png    | Bin 0 -> 1406 bytes
 .../res/drawable-xxhdpi/ic_group_white_48dp.png    | Bin 0 -> 1273 bytes
 .../ic_import_export_white_48dp.png                | Bin 0 -> 768 bytes
 .../drawable-xxhdpi/ic_lock_open_white_48dp.png    | Bin 0 -> 1438 bytes
 .../drawable-xxhdpi/ic_lock_outline_white_48dp.png | Bin 0 -> 1437 bytes
 .../drawable-xxhdpi/ic_person_add_white_48dp.png   | Bin 0 -> 1346 bytes
 .../res/drawable-xxhdpi/ic_refresh_white_48dp.png  | Bin 0 -> 1704 bytes
 .../res/drawable-xxhdpi/ic_remove_grey600_36dp.png | Bin 0 -> 278 bytes
 .../res/drawable-xxhdpi/ic_search_white_18dp.png   | Bin 0 -> 731 bytes
 .../res/drawable-xxhdpi/ic_search_white_48dp.png   | Bin 0 -> 1671 bytes
 .../drawable-xxhdpi/ic_settings_grey600_36dp.png   | Bin 0 -> 1486 bytes
 .../res/drawable-xxhdpi/ic_warning_white_36dp.png  | Bin 0 -> 1050 bytes
 .../res/drawable-xxxhdpi/ic_add_white_48dp.png     | Bin 0 -> 470 bytes
 .../drawable-xxxhdpi/ic_attach_file_white_48dp.png | Bin 0 -> 2215 bytes
 .../res/drawable-xxxhdpi/ic_cancel_white_24dp.png  | Bin 0 -> 1179 bytes
 .../res/drawable-xxxhdpi/ic_cancel_white_36dp.png  | Bin 0 -> 1742 bytes
 .../res/drawable-xxxhdpi/ic_cancel_white_48dp.png  | Bin 0 -> 2357 bytes
 .../res/drawable-xxxhdpi/ic_chat_white_48dp.png    | Bin 0 -> 929 bytes
 .../ic_content_copy_grey600_36dp.png               | Bin 0 -> 760 bytes
 .../res/drawable-xxxhdpi/ic_delete_white_48dp.png  | Bin 0 -> 719 bytes
 .../res/drawable-xxxhdpi/ic_edit_black_48dp.png    | Bin 0 -> 731 bytes
 .../res/drawable-xxxhdpi/ic_edit_grey600_36dp.png  | Bin 0 -> 846 bytes
 .../res/drawable-xxxhdpi/ic_edit_white_48dp.png    | Bin 0 -> 1098 bytes
 .../ic_file_download_white_24dp.png                | Bin 0 -> 433 bytes
 .../ic_file_download_white_36dp.png                | Bin 0 -> 615 bytes
 .../drawable-xxxhdpi/ic_group_add_white_48dp.png   | Bin 0 -> 1935 bytes
 .../res/drawable-xxxhdpi/ic_group_white_48dp.png   | Bin 0 -> 1719 bytes
 .../ic_import_export_white_48dp.png                | Bin 0 -> 1025 bytes
 src/main/res/drawable-xxxhdpi/ic_launcher.png      | Bin 0 -> 14234 bytes
 .../drawable-xxxhdpi/ic_lock_open_white_48dp.png   | Bin 0 -> 1872 bytes
 .../ic_lock_outline_white_48dp.png                 | Bin 0 -> 1874 bytes
 src/main/res/drawable-xxxhdpi/ic_notification.png  | Bin 0 -> 2063 bytes
 .../drawable-xxxhdpi/ic_person_add_white_48dp.png  | Bin 0 -> 1729 bytes
 .../res/drawable-xxxhdpi/ic_received_indicator.png | Bin 0 -> 1608 bytes
 .../res/drawable-xxxhdpi/ic_refresh_white_48dp.png | Bin 0 -> 2312 bytes
 .../drawable-xxxhdpi/ic_remove_grey600_36dp.png    | Bin 0 -> 341 bytes
 .../res/drawable-xxxhdpi/ic_search_white_18dp.png  | Bin 0 -> 871 bytes
 .../res/drawable-xxxhdpi/ic_search_white_48dp.png  | Bin 0 -> 2279 bytes
 .../drawable-xxxhdpi/ic_settings_grey600_36dp.png  | Bin 0 -> 1978 bytes
 .../res/drawable-xxxhdpi/ic_warning_white_36dp.png | Bin 0 -> 1324 bytes
 src/main/res/layout/activity_edit_account.xml      |   2 +-
 src/main/res/layout/activity_muc_details.xml       |   4 ++--
 src/main/res/layout/contact_key.xml                |   2 +-
 src/main/res/menu/choose_contact.xml               |   2 +-
 src/main/res/menu/contact_details.xml              |   4 ++--
 src/main/res/menu/conversations.xml                |   8 +++----
 src/main/res/menu/manageaccounts.xml               |   2 +-
 src/main/res/menu/muc_details.xml                  |   2 +-
 src/main/res/menu/share_with.xml                   |   2 +-
 src/main/res/menu/start_conversation.xml           |   6 +++---
 src/main/res/values-v21/themes.xml                 |  21 +++++++++++++++++++
 src/main/res/values/attrs.xml                      |  20 ++++++++++++++++++
 src/main/res/values/strings.xml                    |   1 +
 src/main/res/values/themes.xml                     |  21 +++++++++++++++++++
 145 files changed, 105 insertions(+), 25 deletions(-)
 create mode 100644 src/main/res/drawable-hdpi/ic_add_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_cancel_white_36dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_cancel_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_chat_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_delete_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_edit_black_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_edit_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_file_download_white_36dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_group_add_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_group_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_import_export_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_person_add_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_refresh_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_search_white_18dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_search_white_48dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_warning_white_36dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_add_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_cancel_white_24dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_cancel_white_36dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_cancel_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_chat_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_delete_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_edit_black_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_edit_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_file_download_white_36dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_group_add_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_group_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_import_export_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_person_add_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_refresh_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_search_white_18dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_search_white_48dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_warning_white_36dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_add_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_chat_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_delete_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_edit_black_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_edit_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_group_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_search_white_18dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_search_white_48dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_warning_white_36dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_add_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_group_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_search_white_18dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_search_white_48dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_launcher.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_notification.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_received_indicator.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png

diff --git a/art/render.rb b/art/render.rb
index 386366a4..2ab3e94f 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -4,6 +4,7 @@ resolutions={
 	'hdpi' => 1.5,
 	'xhdpi' => 2,
 	'xxhdpi' => 3,
+	'xxxhdpi' => 4,
 	}
 images = {
 	'conversations_baloon.svg' => ['ic_launcher', 48],
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 894af421..2ea0904f 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -270,7 +270,8 @@ public class NotificationService {
 			}
 			if ((message = getFirstDownloadableMessage(messages)) != null) {
 				mBuilder.addAction(
-						R.drawable.ic_action_download,
+						Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ?
+								R.drawable.ic_file_download_white_24dp : R.drawable.ic_action_download,
 						mXmppConnectionService.getResources().getString(R.string.download_x_file,
 							UIHelper.getFileDescriptionString(mXmppConnectionService, message)),
 						createDownloadIntent(message)
@@ -446,18 +447,24 @@ public class NotificationService {
 
 	public Notification createForegroundNotification() {
 		final NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(mXmppConnectionService);
-		mBuilder.setSmallIcon(R.drawable.ic_stat_communication_import_export);
+
 		mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service));
 		mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_open_conversations));
-		mBuilder.addAction(R.drawable.ic_action_cancel,
-				mXmppConnectionService.getString(R.string.disable_foreground_service),
-				createDisableForeground());
 		mBuilder.setContentIntent(createOpenConversationsIntent());
 		mBuilder.setWhen(0);
 		mBuilder.setPriority(NotificationCompat.PRIORITY_MIN);
+		final int cancelIcon;
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 			mBuilder.setCategory(Notification.CATEGORY_SERVICE);
+			mBuilder.setSmallIcon(R.drawable.ic_import_export_white_48dp);
+			cancelIcon = R.drawable.ic_cancel_white_24dp;
+		} else {
+			mBuilder.setSmallIcon(R.drawable.ic_stat_communication_import_export);
+			cancelIcon = R.drawable.ic_action_cancel;
 		}
+		mBuilder.addAction(cancelIcon,
+				mXmppConnectionService.getString(R.string.disable_foreground_service),
+				createDisableForeground());
 		setNotificationColor(mBuilder);
 		return mBuilder.build();
 	}
@@ -487,7 +494,11 @@ public class NotificationService {
 		}
 		mBuilder.setOngoing(true);
 		//mBuilder.setLights(0xffffffff, 2000, 4000);
-		mBuilder.setSmallIcon(R.drawable.ic_stat_alert_warning);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			mBuilder.setSmallIcon(R.drawable.ic_warning_white_36dp);
+		} else {
+			mBuilder.setSmallIcon(R.drawable.ic_stat_alert_warning);
+		}
 		final TaskStackBuilder stackBuilder = TaskStackBuilder.create(mXmppConnectionService);
 		stackBuilder.addParentStack(ConversationActivity.class);
 
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 7aa48c0c..299fb848 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -10,6 +10,7 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.IntentSender.SendIntentException;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.provider.MediaStore;
@@ -296,8 +297,12 @@ public class ConversationActivity extends XmppActivity
 			if (this.getSelectedConversation() != null) {
 				if (this.getSelectedConversation().getLatestMessage()
 						.getEncryption() != Message.ENCRYPTION_NONE) {
-					menuSecure.setIcon(R.drawable.ic_action_secure);
-						}
+					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+						menuSecure.setIcon(R.drawable.ic_lock_outline_white_48dp);
+					} else {
+						menuSecure.setIcon(R.drawable.ic_action_secure);
+					}
+				}
 				if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) {
 					menuContactDetails.setVisible(false);
 					menuAttach.setVisible(false);
diff --git a/src/main/res/drawable-hdpi/ic_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..72cedcad
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_add_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..7256ca3d
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..794b7b78
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png
new file mode 100644
index 00000000..64c8a6ab
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png
new file mode 100644
index 00000000..faa409f8
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_chat_white_48dp.png b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..71cac75a
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..bd2c60b8
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_delete_white_48dp.png b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..0e95e9b1
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_edit_black_48dp.png b/src/main/res/drawable-hdpi/ic_edit_black_48dp.png
new file mode 100644
index 00000000..827b6848
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_black_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..f8970cb2
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_edit_white_48dp.png b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..34ec7092
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..46aeab45
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png
new file mode 100644
index 00000000..a0a112dc
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..a5ad0a29
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_group_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..a6ed594f
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_group_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..c3497037
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..b90a5980
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..d0c25290
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..074db2d3
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..72128fe6
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..aeb1cea9
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_search_white_18dp.png b/src/main/res/drawable-hdpi/ic_search_white_18dp.png
new file mode 100644
index 00000000..9ad0bfe3
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_search_white_18dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_search_white_48dp.png b/src/main/res/drawable-hdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..0bbeab15
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_search_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..cff84744
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_warning_white_36dp.png b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..c8b7140a
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..67042105
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_add_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..db23fd65
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..df332ef3
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png
new file mode 100644
index 00000000..794b7b78
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png
new file mode 100644
index 00000000..e9e9c7a5
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_chat_white_48dp.png b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..526ebec6
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..5592d5c8
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_delete_white_48dp.png b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..cdb230c2
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_edit_black_48dp.png b/src/main/res/drawable-mdpi/ic_edit_black_48dp.png
new file mode 100644
index 00000000..aa7748ad
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_black_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..b5f88c80
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_edit_white_48dp.png b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..7f0ea51b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..e089466d
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png
new file mode 100644
index 00000000..46aeab45
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..6055325e
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_group_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..0c5fd333
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_group_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..fb82f420
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..6e1321e4
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..2d2c9417
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..c402e8f0
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..5f89fc25
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..efc9560e
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_search_white_18dp.png b/src/main/res/drawable-mdpi/ic_search_white_18dp.png
new file mode 100644
index 00000000..d113cdcb
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_search_white_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_search_white_48dp.png b/src/main/res/drawable-mdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..043759ac
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_search_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..20d2b66e
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_warning_white_36dp.png b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..30eee6c4
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..2bef0595
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..caaee37a
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..e9e9c7a5
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png
new file mode 100644
index 00000000..faa409f8
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 00000000..b9b6c0b3
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..1230ab39
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..2fdbbea1
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..ccf8c716
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png
new file mode 100644
index 00000000..d3c4ccef
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..6ed4351c
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..9380370f
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..990dfb82
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png
new file mode 100644
index 00000000..95502de3
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..0ac3d4a8
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xhdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..a62b5677
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_group_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..06b27ea1
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..8f35034c
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..3de35f9b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..4e2121e5
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..d271d8e0
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..3d5136fe
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xhdpi/ic_search_white_18dp.png
new file mode 100644
index 00000000..a2fc5b2e
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_search_white_18dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xhdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..70c21baf
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_search_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..6a70402b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..3f401317
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..b12e040e
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..b50e5161
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..faa409f8
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png
new file mode 100644
index 00000000..e3a7884c
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 00000000..215c3b38
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..bb39d157
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..72b3474b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..a8d8ca84
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png
new file mode 100644
index 00000000..74f0c795
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..21b617a9
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..fe5bd13f
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..95502de3
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png
new file mode 100644
index 00000000..368dc49c
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..7ff60d6f
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..fffa6a6a
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..cabd50c0
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..031eb06e
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..f57082d8
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..ba242487
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..87ab2d64
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..4b1003db
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png
new file mode 100644
index 00000000..c5721977
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..75d9aa69
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..d47d042e
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..a6e5788b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..cd32f0a8
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..55464b7e
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..b9b6c0b3
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png
new file mode 100644
index 00000000..215c3b38
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 00000000..bef7e17f
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..68f14af6
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..435c087a
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..47fef5aa
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png
new file mode 100644
index 00000000..0429e7e1
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..1361eedc
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..73680649
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..a57e72f7
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png
new file mode 100644
index 00000000..e261f9a8
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..7e9d67f6
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..2a27316b
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..ea80bc00
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..b6dcb0b9
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..f7652e60
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..440070a1
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notification.png b/src/main/res/drawable-xxxhdpi/ic_notification.png
new file mode 100644
index 00000000..ee2f3a43
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notification.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..89c1aef2
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png
new file mode 100644
index 00000000..86db9890
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..fe0ae13a
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..524cc0a0
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png
new file mode 100644
index 00000000..0bbeab15
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..7caf6c9b
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..8fea47f6
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..abc5c7a5
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png differ
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 0093f032..750c28e0 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -338,7 +338,7 @@
                         android:layout_centerVertical="true"
                         android:background="?android:selectableItemBackground"
                         android:padding="8dp"
-                        android:src="@drawable/ic_action_copy"
+                        android:src="?attr/icon_copy"
                         android:visibility="visible"
                         android:contentDescription="@string/copy_otr_clipboard_description"/>
                 </RelativeLayout>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 332ac2a9..36873654 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -76,7 +76,7 @@
 					android:layout_centerVertical="true"
 					android:background="?android:selectableItemBackground"
 					android:padding="8dp"
-					android:src="@drawable/ic_action_edit_dark"/>
+					android:src="?attr/icon_edit_dark"/>
 			</RelativeLayout>
 
 			<RelativeLayout
@@ -103,7 +103,7 @@
 				android:layout_centerVertical="true"
 				android:background="?android:selectableItemBackground"
 				android:padding="8dp"
-				android:src="@drawable/ic_action_settings"/>
+				android:src="?attr/icon_settings"/>
 				</RelativeLayout>
 
 			<TextView
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 7053857f..75572877 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -35,7 +35,7 @@
         android:layout_centerVertical="true"
         android:background="?android:selectableItemBackground"
         android:padding="8dp"
-        android:src="@drawable/ic_action_remove"
+        android:src="?attr/icon_remove"
         android:visibility="invisible" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index e39091b3..c025d00f 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/action_search"
         android:actionLayout="@layout/actionview_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="?attr/icon_search"
         android:showAsAction="collapseActionView|always"
         android:title="@string/search"/>
 
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index ba8889d8..bd81b6d4 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -3,13 +3,13 @@
 
     <item
         android:id="@+id/action_edit_contact"
-        android:icon="@drawable/ic_action_edit"
+        android:icon="?attr/icon_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_edit_contact"/>
     <item
         android:id="@+id/action_delete_contact"
-        android:icon="@drawable/ic_action_discard"
+        android:icon="?attr/icon_discard"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_delete_contact"/>
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index d68c1436..4c724d27 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -2,19 +2,19 @@
 
     <item
         android:id="@+id/action_add"
-        android:icon="@drawable/ic_action_new"
+        android:icon="?attr/icon_new"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_add"/>
     <item
         android:id="@+id/action_security"
-        android:icon="@drawable/ic_action_not_secure"
+        android:icon="?attr/icon_not_secure"
         android:orderInCategory="20"
         android:showAsAction="always"
         android:title="@string/action_secure"/>
     <item
         android:id="@+id/action_attach_file"
-        android:icon="@drawable/ic_action_new_attachment"
+        android:icon="?attr/icon_new_attachment"
         android:orderInCategory="30"
         android:showAsAction="always"
         android:title="@string/attach_file"/>
@@ -25,7 +25,7 @@
         android:title="@string/action_contact_details"/>
     <item
         android:id="@+id/action_muc_details"
-        android:icon="@drawable/ic_action_group"
+        android:icon="?attr/icon_group"
         android:orderInCategory="40"
         android:showAsAction="ifRoom"
         android:title="@string/action_muc_details"/>
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index 5b04484f..f8a30ff7 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -3,7 +3,7 @@
 
 	<item
 		android:id="@+id/action_add_account"
-		android:icon="@drawable/ic_action_add_person"
+		android:icon="?attr/icon_add_person"
 		android:showAsAction="always"
 		android:title="@string/action_add_account"/>
 	<item
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 7587e55c..51de4e75 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_edit_subject"
-        android:icon="@drawable/ic_action_edit"
+        android:icon="?attr/icon_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_edit_subject"/>
diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
index cbd15c11..bc51f462 100644
--- a/src/main/res/menu/share_with.xml
+++ b/src/main/res/menu/share_with.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_add"
-        android:icon="@drawable/ic_action_new"
+        android:icon="?attr/icon_new"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_add"/>
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index 3dd09e90..a89d71ff 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -4,17 +4,17 @@
     <item
         android:id="@+id/action_search"
         android:actionLayout="@layout/actionview_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="?attr/icon_search"
         android:showAsAction="collapseActionView|always"
         android:title="@string/search" />
     <item
         android:id="@+id/action_create_contact"
-        android:icon="@drawable/ic_action_add_person"
+        android:icon="?attr/icon_add_person"
         android:showAsAction="always"
         android:title="@string/create_contact" />
     <item
         android:id="@+id/action_join_conference"
-        android:icon="@drawable/ic_action_add_group"
+        android:icon="?attr/icon_add_group"
         android:showAsAction="always"
         android:title="@string/join_conference" />
     <item
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index fddab466..75539533 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -9,6 +9,27 @@
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
         <item name="TextSizeHeadline">20sp</item>
+
+        <item name="attr/icon_add_group">@drawable/ic_group_add_white_48dp</item>
+        <item name="attr/icon_add_person">@drawable/ic_person_add_white_48dp</item>
+        <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item>
+        <item name="attr/icon_chat">@drawable/ic_chat_white_48dp</item>
+        <item name="attr/icon_copy">@drawable/ic_content_copy_grey600_36dp</item>
+        <item name="attr/icon_discard">@drawable/ic_delete_white_48dp</item>
+        <item name="attr/icon_download">@drawable/ic_file_download_white_24dp</item>
+        <item name="attr/icon_edit">@drawable/ic_edit_white_48dp</item>
+        <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_36dp</item>
+        <item name="attr/icon_group">@drawable/ic_group_white_48dp</item>
+        <item name="attr/icon_new">@drawable/ic_add_white_48dp</item>
+        <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_48dp</item>
+        <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_48dp</item>
+        <item name="attr/icon_refresh">@drawable/ic_refresh_white_48dp</item>
+        <item name="attr/icon_remove">@drawable/ic_remove_grey600_36dp</item>
+        <item name="attr/icon_search">@drawable/ic_search_white_48dp</item>
+        <item name="attr/icon_secure">@drawable/ic_lock_outline_white_48dp</item>
+        <item name="attr/icon_settings">@drawable/ic_settings_grey600_36dp</item>
+        <item name="attr/icon_import_export">@drawable/ic_import_export_white_48dp</item>
+
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 2354a5e8..e314f752 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -5,4 +5,24 @@
     <attr name="TextSizeBody" format="dimension" />
     <attr name="TextSizeHeadline" format="dimension" />
 
+    <attr name="icon_add_group" format="reference"/>
+    <attr name="icon_add_person" format="reference"/>
+    <attr name="icon_cancel" format="reference"/>
+    <attr name="icon_chat" format="reference"/>
+    <attr name="icon_copy" format="reference"/>
+    <attr name="icon_discard" format="reference"/>
+    <attr name="icon_download" format="reference"/>
+    <attr name="icon_edit" format="reference"/>
+    <attr name="icon_edit_dark" format="reference"/>
+    <attr name="icon_group" format="reference"/>
+    <attr name="icon_new" format="reference"/>
+    <attr name="icon_new_attachment" format="reference"/>
+    <attr name="icon_not_secure" format="reference"/>
+    <attr name="icon_refresh" format="reference"/>
+    <attr name="icon_remove" format="reference"/>
+    <attr name="icon_search" format="reference"/>
+    <attr name="icon_secure" format="reference"/>
+    <attr name="icon_settings" format="reference"/>
+    <attr name="icon_import_export" format="reference"/>
+
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3d3d69a3..ae8dcd67 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -296,6 +296,7 @@
             \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0)
             \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0)
             \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
+            \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0)
     </string>
     <string name="title_pref_quiet_hours">Quiet Hours</string>
     <string name="title_pref_quiet_hours_start_time">Start time</string>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index fa7973d2..80f2bfe6 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -8,6 +8,27 @@
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
         <item name="TextSizeHeadline">20sp</item>
+
+        <item name="attr/icon_add_group">@drawable/ic_action_add_group</item>
+        <item name="attr/icon_add_person">@drawable/ic_action_add_person</item>
+        <item name="attr/icon_cancel">@drawable/ic_action_cancel</item>
+        <item name="attr/icon_chat">@drawable/ic_action_chat</item>
+        <item name="attr/icon_copy">@drawable/ic_action_copy</item>
+        <item name="attr/icon_discard">@drawable/ic_action_discard</item>
+        <item name="attr/icon_download">@drawable/ic_action_download</item>
+        <item name="attr/icon_edit">@drawable/ic_action_edit</item>
+        <item name="attr/icon_edit_dark">@drawable/ic_action_edit_dark</item>
+
+        <item name="attr/icon_group">@drawable/ic_action_group</item>
+        <item name="attr/icon_new">@drawable/ic_action_new</item>
+        <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item>
+        <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item>
+        <item name="attr/icon_refresh">@drawable/ic_action_refresh</item>
+        <item name="attr/icon_remove">@drawable/ic_action_remove</item>
+        <item name="attr/icon_search">@drawable/ic_action_search</item>
+        <item name="attr/icon_secure">@drawable/ic_action_secure</item>
+        <item name="attr/icon_settings">@drawable/ic_action_settings</item>
+        <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
     </style>
 
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
-- 
cgit v1.2.3