diff --git a/F-Droid/res/drawable-hdpi/ic_add_white.png b/F-Droid/res/drawable-hdpi/ic_add_white.png
new file mode 100644
index 000000000..72cedcad4
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_add_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_attach_money_white.png b/F-Droid/res/drawable-hdpi/ic_attach_money_white.png
new file mode 100644
index 000000000..ac3963e53
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_attach_money_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_bluetooth_white.png b/F-Droid/res/drawable-hdpi/ic_bluetooth_white.png
new file mode 100644
index 000000000..bf5912471
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_bluetooth_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_cancel_white.png b/F-Droid/res/drawable-hdpi/ic_cancel_white.png
new file mode 100644
index 000000000..faa409f80
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_cancel_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_delete_white.png b/F-Droid/res/drawable-hdpi/ic_delete_white.png
new file mode 100644
index 000000000..0e95e9b1d
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_delete_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_do_not_disturb_white.png b/F-Droid/res/drawable-hdpi/ic_do_not_disturb_white.png
new file mode 100644
index 000000000..bb07825f1
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_do_not_disturb_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_edit_white.png b/F-Droid/res/drawable-hdpi/ic_edit_white.png
new file mode 100644
index 000000000..34ec7092f
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_edit_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_help_white.png b/F-Droid/res/drawable-hdpi/ic_help_white.png
new file mode 100644
index 000000000..1173aed08
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_help_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_info_white.png b/F-Droid/res/drawable-hdpi/ic_info_white.png
new file mode 100644
index 000000000..185d18d1a
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_info_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_nfc_white.png b/F-Droid/res/drawable-hdpi/ic_nfc_white.png
new file mode 100644
index 000000000..78db0e17e
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_nfc_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_play_arrow_white.png b/F-Droid/res/drawable-hdpi/ic_play_arrow_white.png
new file mode 100644
index 000000000..043acd808
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_play_arrow_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_refresh_white.png b/F-Droid/res/drawable-hdpi/ic_refresh_white.png
new file mode 100644
index 000000000..72128fe69
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_refresh_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_search_white.png b/F-Droid/res/drawable-hdpi/ic_search_white.png
new file mode 100644
index 000000000..0bbeab150
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_search_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_settings_white.png b/F-Droid/res/drawable-hdpi/ic_settings_white.png
new file mode 100644
index 000000000..6bb8f6e08
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_settings_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_share_white.png b/F-Droid/res/drawable-hdpi/ic_share_white.png
new file mode 100644
index 000000000..9963c6a05
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_share_white.png differ
diff --git a/F-Droid/res/drawable-hdpi/ic_view_headline_white.png b/F-Droid/res/drawable-hdpi/ic_view_headline_white.png
new file mode 100644
index 000000000..4f9458b1a
Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_view_headline_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_add_white.png b/F-Droid/res/drawable-mdpi/ic_add_white.png
new file mode 100644
index 000000000..67042105d
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_add_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_attach_money_white.png b/F-Droid/res/drawable-mdpi/ic_attach_money_white.png
new file mode 100644
index 000000000..b0f1e5567
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_attach_money_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_bluetooth_white.png b/F-Droid/res/drawable-mdpi/ic_bluetooth_white.png
new file mode 100644
index 000000000..678678da4
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_bluetooth_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_cancel_white.png b/F-Droid/res/drawable-mdpi/ic_cancel_white.png
new file mode 100644
index 000000000..e9e9c7a53
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_cancel_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_delete_white.png b/F-Droid/res/drawable-mdpi/ic_delete_white.png
new file mode 100644
index 000000000..cdb230c2f
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_delete_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_do_not_disturb_white.png b/F-Droid/res/drawable-mdpi/ic_do_not_disturb_white.png
new file mode 100644
index 000000000..4e4fa1e59
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_do_not_disturb_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_edit_white.png b/F-Droid/res/drawable-mdpi/ic_edit_white.png
new file mode 100644
index 000000000..7f0ea51bf
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_edit_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_help_white.png b/F-Droid/res/drawable-mdpi/ic_help_white.png
new file mode 100644
index 000000000..9f8051b44
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_help_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_info_white.png b/F-Droid/res/drawable-mdpi/ic_info_white.png
new file mode 100644
index 000000000..bee33abb7
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_info_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_nfc_white.png b/F-Droid/res/drawable-mdpi/ic_nfc_white.png
new file mode 100644
index 000000000..428351e8e
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_nfc_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_play_arrow_white.png b/F-Droid/res/drawable-mdpi/ic_play_arrow_white.png
new file mode 100644
index 000000000..a55d19922
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_play_arrow_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_refresh_white.png b/F-Droid/res/drawable-mdpi/ic_refresh_white.png
new file mode 100644
index 000000000..5f89fc257
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_refresh_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_search_white.png b/F-Droid/res/drawable-mdpi/ic_search_white.png
new file mode 100644
index 000000000..043759acd
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_search_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_settings_white.png b/F-Droid/res/drawable-mdpi/ic_settings_white.png
new file mode 100644
index 000000000..12e5d100d
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_settings_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_share_white.png b/F-Droid/res/drawable-mdpi/ic_share_white.png
new file mode 100644
index 000000000..dd536bca2
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_share_white.png differ
diff --git a/F-Droid/res/drawable-mdpi/ic_view_headline_white.png b/F-Droid/res/drawable-mdpi/ic_view_headline_white.png
new file mode 100644
index 000000000..e6ecf5a1d
Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_view_headline_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_add_white.png b/F-Droid/res/drawable-xhdpi/ic_add_white.png
new file mode 100644
index 000000000..2bef05958
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_add_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_attach_money_white.png b/F-Droid/res/drawable-xhdpi/ic_attach_money_white.png
new file mode 100644
index 000000000..385422f14
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_attach_money_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_bluetooth_white.png b/F-Droid/res/drawable-xhdpi/ic_bluetooth_white.png
new file mode 100644
index 000000000..e3fe3cfbb
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_bluetooth_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_cancel_white.png b/F-Droid/res/drawable-xhdpi/ic_cancel_white.png
new file mode 100644
index 000000000..b9b6c0b3d
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_cancel_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_delete_white.png b/F-Droid/res/drawable-xhdpi/ic_delete_white.png
new file mode 100644
index 000000000..e69de29bb
diff --git a/F-Droid/res/drawable-xhdpi/ic_do_not_disturb_white.png b/F-Droid/res/drawable-xhdpi/ic_do_not_disturb_white.png
new file mode 100644
index 000000000..38f12a7b5
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_do_not_disturb_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_edit_white.png b/F-Droid/res/drawable-xhdpi/ic_edit_white.png
new file mode 100644
index 000000000..9380370f4
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_edit_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_help_white.png b/F-Droid/res/drawable-xhdpi/ic_help_white.png
new file mode 100644
index 000000000..9b27847bb
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_help_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_info_white.png b/F-Droid/res/drawable-xhdpi/ic_info_white.png
new file mode 100644
index 000000000..c2dbf1823
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_info_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_nfc_white.png b/F-Droid/res/drawable-xhdpi/ic_nfc_white.png
new file mode 100644
index 000000000..821029ce4
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_nfc_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_play_arrow_white.png b/F-Droid/res/drawable-xhdpi/ic_play_arrow_white.png
new file mode 100644
index 000000000..7cc008475
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_play_arrow_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_refresh_white.png b/F-Droid/res/drawable-xhdpi/ic_refresh_white.png
new file mode 100644
index 000000000..d271d8e03
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_refresh_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_search_white.png b/F-Droid/res/drawable-xhdpi/ic_search_white.png
new file mode 100644
index 000000000..70c21baf7
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_search_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_settings_white.png b/F-Droid/res/drawable-xhdpi/ic_settings_white.png
new file mode 100644
index 000000000..97e9ca945
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_settings_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_share_white.png b/F-Droid/res/drawable-xhdpi/ic_share_white.png
new file mode 100644
index 000000000..bb521c141
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_share_white.png differ
diff --git a/F-Droid/res/drawable-xhdpi/ic_view_headline_white.png b/F-Droid/res/drawable-xhdpi/ic_view_headline_white.png
new file mode 100644
index 000000000..c66e9d234
Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_view_headline_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_add_white.png b/F-Droid/res/drawable-xxhdpi/ic_add_white.png
new file mode 100644
index 000000000..b12e040e0
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_add_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_attach_money_white.png b/F-Droid/res/drawable-xxhdpi/ic_attach_money_white.png
new file mode 100644
index 000000000..edb895799
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_attach_money_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_bluetooth_white.png b/F-Droid/res/drawable-xxhdpi/ic_bluetooth_white.png
new file mode 100644
index 000000000..6c8cb16af
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_bluetooth_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_cancel_white.png b/F-Droid/res/drawable-xxhdpi/ic_cancel_white.png
new file mode 100644
index 000000000..215c3b386
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_cancel_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_delete_white.png b/F-Droid/res/drawable-xxhdpi/ic_delete_white.png
new file mode 100644
index 000000000..a8d8ca84d
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_delete_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_do_not_disturb_white.png b/F-Droid/res/drawable-xxhdpi/ic_do_not_disturb_white.png
new file mode 100644
index 000000000..9ac3d7a02
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_do_not_disturb_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_edit_white.png b/F-Droid/res/drawable-xxhdpi/ic_edit_white.png
new file mode 100644
index 000000000..fe5bd13fb
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_edit_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_help_white.png b/F-Droid/res/drawable-xxhdpi/ic_help_white.png
new file mode 100644
index 000000000..f34516ecc
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_help_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_info_white.png b/F-Droid/res/drawable-xxhdpi/ic_info_white.png
new file mode 100644
index 000000000..cf18a5ca1
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_info_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_nfc_white.png b/F-Droid/res/drawable-xxhdpi/ic_nfc_white.png
new file mode 100644
index 000000000..81b19ef04
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_nfc_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_play_arrow_white.png b/F-Droid/res/drawable-xxhdpi/ic_play_arrow_white.png
new file mode 100644
index 000000000..de7f9bdb5
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_play_arrow_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_refresh_white.png b/F-Droid/res/drawable-xxhdpi/ic_refresh_white.png
new file mode 100644
index 000000000..87ab2d640
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_refresh_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_search_white.png b/F-Droid/res/drawable-xxhdpi/ic_search_white.png
new file mode 100644
index 000000000..75d9aa69f
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_search_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_settings_white.png b/F-Droid/res/drawable-xxhdpi/ic_settings_white.png
new file mode 100644
index 000000000..5940812da
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_settings_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_share_white.png b/F-Droid/res/drawable-xxhdpi/ic_share_white.png
new file mode 100644
index 000000000..cf3072ecf
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_share_white.png differ
diff --git a/F-Droid/res/drawable-xxhdpi/ic_view_headline_white.png b/F-Droid/res/drawable-xxhdpi/ic_view_headline_white.png
new file mode 100644
index 000000000..faccf3d23
Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_view_headline_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_add_white.png b/F-Droid/res/drawable-xxxhdpi/ic_add_white.png
new file mode 100644
index 000000000..cd32f0a82
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_add_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_attach_money_white.png b/F-Droid/res/drawable-xxxhdpi/ic_attach_money_white.png
new file mode 100644
index 000000000..6bdb19da3
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_attach_money_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_bluetooth_white.png b/F-Droid/res/drawable-xxxhdpi/ic_bluetooth_white.png
new file mode 100644
index 000000000..c0181e016
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_bluetooth_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_cancel_white.png b/F-Droid/res/drawable-xxxhdpi/ic_cancel_white.png
new file mode 100644
index 000000000..bef7e17fe
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_cancel_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_delete_white.png b/F-Droid/res/drawable-xxxhdpi/ic_delete_white.png
new file mode 100644
index 000000000..47fef5aab
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_delete_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_do_not_disturb_white.png b/F-Droid/res/drawable-xxxhdpi/ic_do_not_disturb_white.png
new file mode 100644
index 000000000..446abf648
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_do_not_disturb_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_edit_white.png b/F-Droid/res/drawable-xxxhdpi/ic_edit_white.png
new file mode 100644
index 000000000..736806495
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_edit_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_help_white.png b/F-Droid/res/drawable-xxxhdpi/ic_help_white.png
new file mode 100644
index 000000000..c99653261
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_help_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_info_white.png b/F-Droid/res/drawable-xxxhdpi/ic_info_white.png
new file mode 100644
index 000000000..00fc89c26
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_info_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_nfc_white.png b/F-Droid/res/drawable-xxxhdpi/ic_nfc_white.png
new file mode 100644
index 000000000..12cd90eae
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_nfc_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_play_arrow_white.png b/F-Droid/res/drawable-xxxhdpi/ic_play_arrow_white.png
new file mode 100644
index 000000000..f4f713e83
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_play_arrow_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_refresh_white.png b/F-Droid/res/drawable-xxxhdpi/ic_refresh_white.png
new file mode 100644
index 000000000..fe0ae13aa
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_refresh_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_search_white.png b/F-Droid/res/drawable-xxxhdpi/ic_search_white.png
new file mode 100644
index 000000000..7caf6c9b7
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_search_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_settings_white.png b/F-Droid/res/drawable-xxxhdpi/ic_settings_white.png
new file mode 100644
index 000000000..4d36a012e
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_settings_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_share_white.png b/F-Droid/res/drawable-xxxhdpi/ic_share_white.png
new file mode 100644
index 000000000..4eeff94cf
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_share_white.png differ
diff --git a/F-Droid/res/drawable-xxxhdpi/ic_view_headline_white.png b/F-Droid/res/drawable-xxxhdpi/ic_view_headline_white.png
new file mode 100644
index 000000000..7674b081f
Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_view_headline_white.png differ
diff --git a/F-Droid/res/drawable/ic_add_white.png b/F-Droid/res/drawable/ic_add_white.png
new file mode 100644
index 000000000..67042105d
Binary files /dev/null and b/F-Droid/res/drawable/ic_add_white.png differ
diff --git a/F-Droid/res/drawable/ic_attach_money_white.png b/F-Droid/res/drawable/ic_attach_money_white.png
new file mode 100644
index 000000000..b0f1e5567
Binary files /dev/null and b/F-Droid/res/drawable/ic_attach_money_white.png differ
diff --git a/F-Droid/res/drawable/ic_bluetooth_white.png b/F-Droid/res/drawable/ic_bluetooth_white.png
new file mode 100644
index 000000000..678678da4
Binary files /dev/null and b/F-Droid/res/drawable/ic_bluetooth_white.png differ
diff --git a/F-Droid/res/drawable/ic_cancel_white.png b/F-Droid/res/drawable/ic_cancel_white.png
new file mode 100644
index 000000000..e9e9c7a53
Binary files /dev/null and b/F-Droid/res/drawable/ic_cancel_white.png differ
diff --git a/F-Droid/res/drawable/ic_delete_white.png b/F-Droid/res/drawable/ic_delete_white.png
new file mode 100644
index 000000000..cdb230c2f
Binary files /dev/null and b/F-Droid/res/drawable/ic_delete_white.png differ
diff --git a/F-Droid/res/drawable/ic_do_not_disturb_white.png b/F-Droid/res/drawable/ic_do_not_disturb_white.png
new file mode 100644
index 000000000..4e4fa1e59
Binary files /dev/null and b/F-Droid/res/drawable/ic_do_not_disturb_white.png differ
diff --git a/F-Droid/res/drawable/ic_edit_white.png b/F-Droid/res/drawable/ic_edit_white.png
new file mode 100644
index 000000000..7f0ea51bf
Binary files /dev/null and b/F-Droid/res/drawable/ic_edit_white.png differ
diff --git a/F-Droid/res/drawable/ic_help_white.png b/F-Droid/res/drawable/ic_help_white.png
new file mode 100644
index 000000000..9f8051b44
Binary files /dev/null and b/F-Droid/res/drawable/ic_help_white.png differ
diff --git a/F-Droid/res/drawable/ic_info_white.png b/F-Droid/res/drawable/ic_info_white.png
new file mode 100644
index 000000000..bee33abb7
Binary files /dev/null and b/F-Droid/res/drawable/ic_info_white.png differ
diff --git a/F-Droid/res/drawable/ic_nfc_white.png b/F-Droid/res/drawable/ic_nfc_white.png
new file mode 100644
index 000000000..428351e8e
Binary files /dev/null and b/F-Droid/res/drawable/ic_nfc_white.png differ
diff --git a/F-Droid/res/drawable/ic_play_arrow_white.png b/F-Droid/res/drawable/ic_play_arrow_white.png
new file mode 100644
index 000000000..a55d19922
Binary files /dev/null and b/F-Droid/res/drawable/ic_play_arrow_white.png differ
diff --git a/F-Droid/res/drawable/ic_refresh_white.png b/F-Droid/res/drawable/ic_refresh_white.png
new file mode 100644
index 000000000..5f89fc257
Binary files /dev/null and b/F-Droid/res/drawable/ic_refresh_white.png differ
diff --git a/F-Droid/res/drawable/ic_search_white.png b/F-Droid/res/drawable/ic_search_white.png
new file mode 100644
index 000000000..043759acd
Binary files /dev/null and b/F-Droid/res/drawable/ic_search_white.png differ
diff --git a/F-Droid/res/drawable/ic_settings_white.png b/F-Droid/res/drawable/ic_settings_white.png
new file mode 100644
index 000000000..12e5d100d
Binary files /dev/null and b/F-Droid/res/drawable/ic_settings_white.png differ
diff --git a/F-Droid/res/drawable/ic_share_white.png b/F-Droid/res/drawable/ic_share_white.png
new file mode 100644
index 000000000..dd536bca2
Binary files /dev/null and b/F-Droid/res/drawable/ic_share_white.png differ
diff --git a/F-Droid/res/drawable/ic_view_headline_white.png b/F-Droid/res/drawable/ic_view_headline_white.png
new file mode 100644
index 000000000..e6ecf5a1d
Binary files /dev/null and b/F-Droid/res/drawable/ic_view_headline_white.png differ
diff --git a/F-Droid/res/menu/main.xml b/F-Droid/res/menu/main.xml
index e768a8152..b454adc54 100644
--- a/F-Droid/res/menu/main.xml
+++ b/F-Droid/res/menu/main.xml
@@ -4,12 +4,12 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="@android:drawable/ic_menu_search"
+        android:icon="@drawable/ic_search_white"
         android:title="@string/menu_search"
         app:showAsAction="always"/>
     <item
         android:id="@+id/action_update_repo"
-        android:icon="@drawable/ic_menu_refresh"
+        android:icon="@drawable/ic_refresh_white"
         android:title="@string/menu_update_repo"
         app:showAsAction="ifRoom"/>
     <item
@@ -18,22 +18,22 @@
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_manage_repos"
-        android:icon="@android:drawable/ic_menu_agenda"
+        android:icon="@drawable/ic_view_headline_white"
         android:title="@string/menu_manage"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_bluetooth_apk"
-        android:icon="@android:drawable/stat_sys_data_bluetooth"
+        android:icon="@drawable/ic_bluetooth_white"
         android:title="@string/menu_send_apk_bt"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_settings"
-        android:icon="@android:drawable/ic_menu_preferences"
+        android:icon="@drawable/ic_settings_white"
         android:title="@string/menu_preferences"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_about"
-        android:icon="@android:drawable/ic_menu_help"
+        android:icon="@drawable/ic_help_white"
         android:title="@string/menu_about"
         app:showAsAction="ifRoom"/>
 
diff --git a/F-Droid/res/menu/manage_repo_context.xml b/F-Droid/res/menu/manage_repo_context.xml
index cef66b120..57506a395 100644
--- a/F-Droid/res/menu/manage_repo_context.xml
+++ b/F-Droid/res/menu/manage_repo_context.xml
@@ -5,11 +5,11 @@
     <item
         android:id="@+id/edit_repo"
         android:title="@string/edit"
-        android:icon="@android:drawable/ic_menu_edit" />
+        android:icon="@drawable/ic_edit_white" />
 
     <item
         android:id="@+id/delete_repo"
         android:title="@string/delete"
-        android:icon="@android:drawable/ic_menu_delete" />
+        android:icon="@drawable/ic_delete_white" />
 
 </menu>
\ No newline at end of file
diff --git a/F-Droid/res/menu/manage_repos.xml b/F-Droid/res/menu/manage_repos.xml
index 6fa0b699a..ef440e3dc 100644
--- a/F-Droid/res/menu/manage_repos.xml
+++ b/F-Droid/res/menu/manage_repos.xml
@@ -4,12 +4,12 @@
 
     <item
         android:id="@+id/action_update_repo"
-        android:icon="@drawable/ic_menu_refresh"
+        android:icon="@drawable/ic_refresh_white"
         android:title="@string/menu_update_repo"
         app:showAsAction="always|withText"/>
     <item
         android:id="@+id/action_add_repo"
-        android:icon="@android:drawable/ic_menu_add"
+        android:icon="@drawable/ic_add_white"
         android:title="@string/menu_add_repo"
         app:showAsAction="always|withText"/>
     <item
diff --git a/F-Droid/res/menu/swap_next_search.xml b/F-Droid/res/menu/swap_next_search.xml
index 0a048467f..2f2bd980c 100644
--- a/F-Droid/res/menu/swap_next_search.xml
+++ b/F-Droid/res/menu/swap_next_search.xml
@@ -7,7 +7,7 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="@android:drawable/ic_menu_search"
+        android:icon="@drawable/ic_search_white"
         android:title="@string/menu_search"
         android:titleCondensed="@string/menu_search"/>
 
diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml
index 7c783a394..bc1e3c317 100644
--- a/F-Droid/res/values/styles.xml
+++ b/F-Droid/res/values/styles.xml
@@ -104,7 +104,6 @@
         <item name="android:paddingRight">10dp</item>
         <item name="android:paddingTop">5dp</item>
         <item name="android:paddingBottom">5dp</item>
-        <item name="android:background">@drawable/swap_action_button_skin</item>
     </style>
 
     <style name="SwapTheme.Wizard.MainText" parent="@style/SwapTheme.Wizard.Text">
diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index cb833e8e9..e5e0b27db 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -633,7 +633,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
         if (app.canAndWantToUpdate()) {
             MenuItemCompat.setShowAsAction(menu.add(
                         Menu.NONE, INSTALL, 0, R.string.menu_upgrade)
-                        .setIcon(R.drawable.ic_menu_refresh),
+                        .setIcon(R.drawable.ic_refresh_white),
                     MenuItemCompat.SHOW_AS_ACTION_ALWAYS |
                     MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
         }
@@ -643,20 +643,20 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
                 adapter.getCount() > 0) {
             MenuItemCompat.setShowAsAction(menu.add(
                         Menu.NONE, INSTALL, 1, R.string.menu_install)
-                        .setIcon(android.R.drawable.ic_menu_add),
+                        .setIcon(R.drawable.ic_add_white),
                     MenuItemCompat.SHOW_AS_ACTION_ALWAYS |
                     MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
         } else if (app.isInstalled()) {
             MenuItemCompat.setShowAsAction(menu.add(
                         Menu.NONE, UNINSTALL, 1, R.string.menu_uninstall)
-                        .setIcon(android.R.drawable.ic_menu_delete),
+                        .setIcon(R.drawable.ic_delete_white),
                     MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
                     MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 
             if (mPm.getLaunchIntentForPackage(app.id) != null) {
                 MenuItemCompat.setShowAsAction(menu.add(
                             Menu.NONE, LAUNCH, 1, R.string.menu_launch)
-                            .setIcon(android.R.drawable.ic_media_play),
+                            .setIcon(R.drawable.ic_play_arrow_white),
                         MenuItemCompat.SHOW_AS_ACTION_ALWAYS |
                         MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
             }
@@ -664,32 +664,32 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
 
         MenuItemCompat.setShowAsAction(menu.add(
                     Menu.NONE, SHARE, 1, R.string.menu_share)
-                    .setIcon(android.R.drawable.ic_menu_share),
+                    .setIcon(R.drawable.ic_share_white),
                 MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
                 MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 
         menu.add(Menu.NONE, IGNOREALL, 2, R.string.menu_ignore_all)
-                    .setIcon(android.R.drawable.ic_menu_close_clear_cancel)
+                    .setIcon(R.drawable.ic_do_not_disturb_white)
                     .setCheckable(true)
                     .setChecked(app.ignoreAllUpdates);
 
         if (app.hasUpdates()) {
             menu.add(Menu.NONE, IGNORETHIS, 2, R.string.menu_ignore_this)
-                        .setIcon(android.R.drawable.ic_menu_close_clear_cancel)
+                        .setIcon(R.drawable.ic_do_not_disturb_white)
                         .setCheckable(true)
                         .setChecked(app.ignoreThisUpdate >= app.suggestedVercode);
         }
         if (app.webURL.length() > 0) {
             menu.add(Menu.NONE, WEBSITE, 3, R.string.menu_website).setIcon(
-                    android.R.drawable.ic_menu_view);
+                    R.drawable.ic_info_white);
         }
         if (app.trackerURL.length() > 0) {
             menu.add(Menu.NONE, ISSUES, 4, R.string.menu_issues).setIcon(
-                    android.R.drawable.ic_menu_view);
+                    R.drawable.ic_info_white);
         }
         if (app.sourceURL.length() > 0) {
             menu.add(Menu.NONE, SOURCE, 5, R.string.menu_source).setIcon(
-                    android.R.drawable.ic_menu_view);
+                    R.drawable.ic_info_white);
         }
 
         if (app.bitcoinAddr != null || app.litecoinAddr != null ||
@@ -697,7 +697,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
                 app.flattrID != null || app.donateURL != null) {
             SubMenu donate = menu.addSubMenu(Menu.NONE, DONATE, 7,
                     R.string.menu_donate).setIcon(
-                    android.R.drawable.ic_menu_send);
+                    R.drawable.ic_attach_money_white);
             if (app.bitcoinAddr != null)
                 donate.add(Menu.NONE, BITCOIN, 8, R.string.menu_bitcoin);
             if (app.litecoinAddr != null)
@@ -710,7 +710,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
                 donate.add(Menu.NONE, DONATE_URL, 10, R.string.menu_website);
         }
         if (app.isInstalled() && fdroidApp.bluetoothAdapter != null) { // ignore on devices without Bluetooth
-            menu.add(Menu.NONE, SEND_VIA_BLUETOOTH, 6, R.string.send_via_bluetooth);
+            menu.add(Menu.NONE, SEND_VIA_BLUETOOTH, 6, R.string.send_via_bluetooth).setIcon(R.drawable.ic_bluetooth_white);
         }
 
         return true;
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
index ecb61d9db..77a304ac7 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java
@@ -274,13 +274,13 @@ public class RepoDetailsFragment extends Fragment {
         menu.clear();
 
         MenuItem update = menu.add(Menu.NONE, UPDATE, 0, R.string.repo_update);
-        update.setIcon(R.drawable.ic_menu_refresh);
+        update.setIcon(R.drawable.ic_refresh_white);
         MenuItemCompat.setShowAsAction(update,
             MenuItemCompat.SHOW_AS_ACTION_ALWAYS |
             MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 
         MenuItem delete = menu.add(Menu.NONE, DELETE, 0, R.string.delete);
-        delete.setIcon(android.R.drawable.ic_menu_delete);
+        delete.setIcon(R.drawable.ic_delete_white);
         MenuItemCompat.setShowAsAction(delete,
             MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
             MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
@@ -307,7 +307,7 @@ public class RepoDetailsFragment extends Fragment {
             if (enableNfc != null)
                 return; // already created
             enableNfc = menu.add(Menu.NONE, ENABLE_NFC, 0, R.string.enable_nfc_send);
-            enableNfc.setIcon(android.R.drawable.ic_menu_preferences);
+            enableNfc.setIcon(R.drawable.ic_nfc_white);
             MenuItemCompat.setShowAsAction(enableNfc,
                 MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
                 MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
diff --git a/F-Droid/tools/download-material-icon.sh b/F-Droid/tools/download-material-icon.sh
new file mode 100755
index 000000000..fc5ce8639
--- /dev/null
+++ b/F-Droid/tools/download-material-icon.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+#
+# Helper script to download icons from https://github.com/google/material-design-icons and
+# put the in the relevant drawable-* directories.
+#
+
+function usage {
+	echo "USAGE: download-material-icon.sh res-directory category icon"
+	echo "  res-directory  Usually \"res\" in your android project"
+	echo "  category       the grouping seen in the URL below (e.g. action, alert, av, communication, content, etc)"
+	echo "  icon           is the name if the icon (see URL below for icons)"
+	echo ""
+	echo "To see available icons, visit http://google.github.io/material-design-icons/"
+}
+
+function download {
+	REMOTE_DRAWABLE_DIR=$1
+	LOCAL_DRAWABLE_DIR=$2
+	FILE="ic_${ICON}_48dp.png"
+	URL="$BASE_URL/$CATEGORY/$REMOTE_DRAWABLE_DIR/$FILE"
+	DIR="$RES_DIR/$LOCAL_DRAWABLE_DIR"
+
+	if [ ! -d $DIR ]
+	then
+		echo "Creating dir $DIR"
+		mkdir $DIR
+	fi
+
+	LOCAL_PATH="$DIR/ic_${ICON}.png"
+
+	echo "Downloading to $LOCAL_PATH"
+	wget --quiet --output-document=$LOCAL_PATH $URL
+
+	if [ ! -s $LOCAL_PATH ]
+	then
+		if [ -f $LOCAL_PATH ]
+		then
+			rm $LOCAL_PATH
+		fi
+
+		echo "ERROR: Could not download from $URL to $LOCAL_PATH failed."
+		echo ""
+		usage
+		exit
+	fi
+}
+
+RES_DIR=$1
+CATEGORY=$2
+ICON="${3}_white"
+BASE_URL="https://raw.githubusercontent.com/google/material-design-icons/master"
+SCREENS="mdpi hdpi xhdpi xxhdpi xxxhdpi"
+
+if [ ! -d $RES_DIR ]
+then
+	echo "ERROR: $RES_DIR is not a directory"
+	echo ""
+	usage
+	exit
+fi
+
+download drawable-mdpi drawable
+for SCREEN in $SCREENS
+do
+	download "drawable-$SCREEN" "drawable-$SCREEN"
+done
+
+echo ""
+echo "Please make sure you have the following attribution (or words to this effect) somewhere in your project:"
+echo ""
+echo "  Some icons are from the Material Design Icon set (https://github.com/google/material-design-icons)"
+echo "  released under an Attribution 4.0 International license (http://creativecommons.org/licenses/by/4.0/)"
+echo ""
diff --git a/README.md b/README.md
index ad2ac67c2..e1dd11242 100644
--- a/README.md
+++ b/README.md
@@ -133,3 +133,8 @@ will. Specifically you can redistribute and/or modify it under the terms of the
 [GNU General Public License](https://www.gnu.org/licenses/gpl.html) as
 published by the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
+
+Some icons are from the Material Design Icon set
+(https://github.com/google/material-design-icons) released under an
+Attribution 4.0 International license (http://creativecommons.org/licenses/by/4.0/)
+