diff --git a/app/build.gradle b/app/build.gradle
index b60c57a7c..fff9e57e1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -207,6 +207,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
+    aaptOptions {
+        cruncherEnabled = false
+    }
+
     defaultConfig {
         versionCode 1000001
         versionName getVersionName()
diff --git a/app/src/main/assets/swap-icon.png b/app/src/main/assets/swap-icon.png
index 7aa123db4..963407787 100644
Binary files a/app/src/main/assets/swap-icon.png and b/app/src/main/assets/swap-icon.png differ
diff --git a/app/src/main/assets/swap-tick-done.png b/app/src/main/assets/swap-tick-done.png
index be70d2deb..54169c3ab 100644
Binary files a/app/src/main/assets/swap-tick-done.png and b/app/src/main/assets/swap-tick-done.png differ
diff --git a/app/src/main/assets/swap-tick-not-done.png b/app/src/main/assets/swap-tick-not-done.png
index 18b9c29a2..54f192bba 100644
Binary files a/app/src/main/assets/swap-tick-not-done.png and b/app/src/main/assets/swap-tick-not-done.png differ
diff --git a/app/src/main/res/drawable-hdpi/circle.png b/app/src/main/res/drawable-hdpi/circle.png
index 2cad3645b..e9e6f7843 100644
Binary files a/app/src/main/res/drawable-hdpi/circle.png and b/app/src/main/res/drawable-hdpi/circle.png differ
diff --git a/app/src/main/res/drawable-hdpi/hotspot.png b/app/src/main/res/drawable-hdpi/hotspot.png
index b33a40116..3e37aaafc 100644
Binary files a/app/src/main/res/drawable-hdpi/hotspot.png and b/app/src/main/res/drawable-hdpi/hotspot.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_access_time_24dp_grey600.png b/app/src/main/res/drawable-hdpi/ic_access_time_24dp_grey600.png
index df0f4a599..c983471fe 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_access_time_24dp_grey600.png and b/app/src/main/res/drawable-hdpi/ic_access_time_24dp_grey600.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_add_circle_outline_white.png b/app/src/main/res/drawable-hdpi/ic_add_circle_outline_white.png
index fdad9ba4d..693f8b330 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_add_circle_outline_white.png and b/app/src/main/res/drawable-hdpi/ic_add_circle_outline_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_add_white.png b/app/src/main/res/drawable-hdpi/ic_add_white.png
index 694179bd4..1569edb08 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_add_white.png and b/app/src/main/res/drawable-hdpi/ic_add_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png
index 8c4c394e4..fc928d423 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png and b/app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_bluetooth_white.png b/app/src/main/res/drawable-hdpi/ic_bluetooth_white.png
index fce188400..c03d29801 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_bluetooth_white.png and b/app/src/main/res/drawable-hdpi/ic_bluetooth_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_cancel.png b/app/src/main/res/drawable-hdpi/ic_cancel.png
index e18c7aef9..44807fb43 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_cancel.png and b/app/src/main/res/drawable-hdpi/ic_cancel.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_changelog.png b/app/src/main/res/drawable-hdpi/ic_changelog.png
index a05ebc87a..ebd78b573 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_changelog.png and b/app/src/main/res/drawable-hdpi/ic_changelog.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_check_circle_white.png b/app/src/main/res/drawable-hdpi/ic_check_circle_white.png
index 542a64b31..b38ea4286 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_check_circle_white.png and b/app/src/main/res/drawable-hdpi/ic_check_circle_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_close_white.png b/app/src/main/res/drawable-hdpi/ic_close_white.png
index a7486ae4f..d67500d35 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_close_white.png and b/app/src/main/res/drawable-hdpi/ic_close_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_coins_s.png b/app/src/main/res/drawable-hdpi/ic_coins_s.png
index 0ada1d008..7d9ec3de8 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_coins_s.png and b/app/src/main/res/drawable-hdpi/ic_coins_s.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_delete_white.png b/app/src/main/res/drawable-hdpi/ic_delete_white.png
index 4a9f76947..daef4bf43 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_delete_white.png and b/app/src/main/res/drawable-hdpi/ic_delete_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-hdpi/ic_do_not_disturb_white.png
index 34ccc229d..654e12466 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_do_not_disturb_white.png and b/app/src/main/res/drawable-hdpi/ic_do_not_disturb_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_donate.png b/app/src/main/res/drawable-hdpi/ic_donate.png
index fa5989baa..d7d606024 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_donate.png and b/app/src/main/res/drawable-hdpi/ic_donate.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_email.png b/app/src/main/res/drawable-hdpi/ic_email.png
index 0f27fd0c4..d7be505ea 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_email.png and b/app/src/main/res/drawable-hdpi/ic_email.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png
index 96758c875..cafe7c103 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png and b/app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png
index 00b9f645c..18d9cbc32 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png and b/app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_fdroid_grey.png b/app/src/main/res/drawable-hdpi/ic_fdroid_grey.png
index 96d140510..b3ad07e10 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_fdroid_grey.png and b/app/src/main/res/drawable-hdpi/ic_fdroid_grey.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_file_download.png b/app/src/main/res/drawable-hdpi/ic_file_download.png
index 52fa71dc4..1ea10c8f6 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_file_download.png and b/app/src/main/res/drawable-hdpi/ic_file_download.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_file_install.png b/app/src/main/res/drawable-hdpi/ic_file_install.png
index 81ca22780..66dd62a76 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_file_install.png and b/app/src/main/res/drawable-hdpi/ic_file_install.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_issues.png b/app/src/main/res/drawable-hdpi/ic_issues.png
index 46eac7b6e..e4a3546b4 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_issues.png and b/app/src/main/res/drawable-hdpi/ic_issues.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
index cf3c69370..7b31436b9 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-hdpi/ic_lock_24dp_grey600.png
index 96f66452b..d04237328 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_lock_24dp_grey600.png and b/app/src/main/res/drawable-hdpi/ic_lock_24dp_grey600.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_network_wifi_white.png b/app/src/main/res/drawable-hdpi/ic_network_wifi_white.png
index 75469cd85..0817a5c1c 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_network_wifi_white.png and b/app/src/main/res/drawable-hdpi/ic_network_wifi_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_nfc_white.png b/app/src/main/res/drawable-hdpi/ic_nfc_white.png
index 8aea57d31..f2a78d188 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_nfc_white.png and b/app/src/main/res/drawable-hdpi/ic_nfc_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_qr_grey.png b/app/src/main/res/drawable-hdpi/ic_qr_grey.png
index 8ffb76ac9..2de8a235b 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_qr_grey.png and b/app/src/main/res/drawable-hdpi/ic_qr_grey.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_refresh_white.png b/app/src/main/res/drawable-hdpi/ic_refresh_white.png
index ffa7be933..19bea38ef 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_refresh_white.png and b/app/src/main/res/drawable-hdpi/ic_refresh_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_repo_app_default.png b/app/src/main/res/drawable-hdpi/ic_repo_app_default.png
index 54e4b4d50..fb7a8b953 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_repo_app_default.png and b/app/src/main/res/drawable-hdpi/ic_repo_app_default.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_search_white.png b/app/src/main/res/drawable-hdpi/ic_search_white.png
index bbfbc96cb..5f83b9821 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_search_white.png and b/app/src/main/res/drawable-hdpi/ic_search_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_share_white.png b/app/src/main/res/drawable-hdpi/ic_share_white.png
index b09a6926d..1fad9b151 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_share_white.png and b/app/src/main/res/drawable-hdpi/ic_share_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_source_code.png b/app/src/main/res/drawable-hdpi/ic_source_code.png
index 0f557cd6a..bcff51900 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_source_code.png and b/app/src/main/res/drawable-hdpi/ic_source_code.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_swap.png b/app/src/main/res/drawable-hdpi/ic_swap.png
index 067ec2844..4f155215a 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_swap.png and b/app/src/main/res/drawable-hdpi/ic_swap.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_website.png b/app/src/main/res/drawable-hdpi/ic_website.png
index d842d7fb8..1c225e34c 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_website.png and b/app/src/main/res/drawable-hdpi/ic_website.png differ
diff --git a/app/src/main/res/drawable-hdpi/nfc_touch.png b/app/src/main/res/drawable-hdpi/nfc_touch.png
index f5daf8468..1d6b0c3af 100644
Binary files a/app/src/main/res/drawable-hdpi/nfc_touch.png and b/app/src/main/res/drawable-hdpi/nfc_touch.png differ
diff --git a/app/src/main/res/drawable-hdpi/swap_start_header.png b/app/src/main/res/drawable-hdpi/swap_start_header.png
index 7990689fe..d1e0f3b52 100644
Binary files a/app/src/main/res/drawable-hdpi/swap_start_header.png and b/app/src/main/res/drawable-hdpi/swap_start_header.png differ
diff --git a/app/src/main/res/drawable-hdpi/wifi.png b/app/src/main/res/drawable-hdpi/wifi.png
index 2ab338770..ccda33d9b 100644
Binary files a/app/src/main/res/drawable-hdpi/wifi.png and b/app/src/main/res/drawable-hdpi/wifi.png differ
diff --git a/app/src/main/res/drawable-ldpi/circle.png b/app/src/main/res/drawable-ldpi/circle.png
index ff147a8b8..afb8d90bc 100644
Binary files a/app/src/main/res/drawable-ldpi/circle.png and b/app/src/main/res/drawable-ldpi/circle.png differ
diff --git a/app/src/main/res/drawable-ldpi/hotspot.png b/app/src/main/res/drawable-ldpi/hotspot.png
index e8d4769b8..cdcb4f4c5 100644
Binary files a/app/src/main/res/drawable-ldpi/hotspot.png and b/app/src/main/res/drawable-ldpi/hotspot.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_fdroid_grey.png b/app/src/main/res/drawable-ldpi/ic_fdroid_grey.png
index 548925e82..1aa0c5646 100644
Binary files a/app/src/main/res/drawable-ldpi/ic_fdroid_grey.png and b/app/src/main/res/drawable-ldpi/ic_fdroid_grey.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png
index e332ba360..9dfd30476 100644
Binary files a/app/src/main/res/drawable-ldpi/ic_launcher.png and b/app/src/main/res/drawable-ldpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_qr_grey.png b/app/src/main/res/drawable-ldpi/ic_qr_grey.png
index 90f942ae6..99be9399f 100644
Binary files a/app/src/main/res/drawable-ldpi/ic_qr_grey.png and b/app/src/main/res/drawable-ldpi/ic_qr_grey.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_repo_app_default.png b/app/src/main/res/drawable-ldpi/ic_repo_app_default.png
index 606040941..1af5c6467 100644
Binary files a/app/src/main/res/drawable-ldpi/ic_repo_app_default.png and b/app/src/main/res/drawable-ldpi/ic_repo_app_default.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_swap.png b/app/src/main/res/drawable-ldpi/ic_swap.png
index 16f8f13b6..3920e0a80 100644
Binary files a/app/src/main/res/drawable-ldpi/ic_swap.png and b/app/src/main/res/drawable-ldpi/ic_swap.png differ
diff --git a/app/src/main/res/drawable-ldpi/nfc_touch.png b/app/src/main/res/drawable-ldpi/nfc_touch.png
index 9345383ba..7c1fa6d2b 100644
Binary files a/app/src/main/res/drawable-ldpi/nfc_touch.png and b/app/src/main/res/drawable-ldpi/nfc_touch.png differ
diff --git a/app/src/main/res/drawable-ldpi/swap_start_header.png b/app/src/main/res/drawable-ldpi/swap_start_header.png
index 2619852ff..0e17d2d9d 100644
Binary files a/app/src/main/res/drawable-ldpi/swap_start_header.png and b/app/src/main/res/drawable-ldpi/swap_start_header.png differ
diff --git a/app/src/main/res/drawable-ldpi/wifi.png b/app/src/main/res/drawable-ldpi/wifi.png
index 9ebb4501b..6bc2a99e9 100644
Binary files a/app/src/main/res/drawable-ldpi/wifi.png and b/app/src/main/res/drawable-ldpi/wifi.png differ
diff --git a/app/src/main/res/drawable-mdpi/circle.png b/app/src/main/res/drawable-mdpi/circle.png
index 30d6fa9d5..1f32b5621 100644
Binary files a/app/src/main/res/drawable-mdpi/circle.png and b/app/src/main/res/drawable-mdpi/circle.png differ
diff --git a/app/src/main/res/drawable-mdpi/hotspot.png b/app/src/main/res/drawable-mdpi/hotspot.png
index c580d2b67..4141ee25f 100644
Binary files a/app/src/main/res/drawable-mdpi/hotspot.png and b/app/src/main/res/drawable-mdpi/hotspot.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_access_time_24dp_grey600.png b/app/src/main/res/drawable-mdpi/ic_access_time_24dp_grey600.png
index a92484fbe..0ae1503d7 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_access_time_24dp_grey600.png and b/app/src/main/res/drawable-mdpi/ic_access_time_24dp_grey600.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add_circle_outline_white.png b/app/src/main/res/drawable-mdpi/ic_add_circle_outline_white.png
index ac9427430..e8c196635 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_add_circle_outline_white.png and b/app/src/main/res/drawable-mdpi/ic_add_circle_outline_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add_white.png b/app/src/main/res/drawable-mdpi/ic_add_white.png
index 3856041d7..9e5e12d92 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_add_white.png and b/app/src/main/res/drawable-mdpi/ic_add_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png
index 878b6e5e8..2a44c948f 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png and b/app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_back.png b/app/src/main/res/drawable-mdpi/ic_back.png
index 53d6d9277..5b6146270 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_back.png and b/app/src/main/res/drawable-mdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bluetooth_white.png b/app/src/main/res/drawable-mdpi/ic_bluetooth_white.png
index 27a8a719f..88be41a48 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_bluetooth_white.png and b/app/src/main/res/drawable-mdpi/ic_bluetooth_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_cancel.png b/app/src/main/res/drawable-mdpi/ic_cancel.png
index 418410737..1f7dcf805 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_cancel.png and b/app/src/main/res/drawable-mdpi/ic_cancel.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_changelog.png b/app/src/main/res/drawable-mdpi/ic_changelog.png
index ae612f057..d1adef9a3 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_changelog.png and b/app/src/main/res/drawable-mdpi/ic_changelog.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_check_circle_white.png b/app/src/main/res/drawable-mdpi/ic_check_circle_white.png
index 4c233ae9f..24a7c5495 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_check_circle_white.png and b/app/src/main/res/drawable-mdpi/ic_check_circle_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_white.png b/app/src/main/res/drawable-mdpi/ic_close_white.png
index 24b2e4d2d..dd663c5b1 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_close_white.png and b/app/src/main/res/drawable-mdpi/ic_close_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_coins_s.png b/app/src/main/res/drawable-mdpi/ic_coins_s.png
index 3b8fd8abd..1708844ad 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_coins_s.png and b/app/src/main/res/drawable-mdpi/ic_coins_s.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete_white.png b/app/src/main/res/drawable-mdpi/ic_delete_white.png
index e2f5f3555..2e4d54a91 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_delete_white.png and b/app/src/main/res/drawable-mdpi/ic_delete_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-mdpi/ic_do_not_disturb_white.png
index 3e87dde72..25a27e23b 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_do_not_disturb_white.png and b/app/src/main/res/drawable-mdpi/ic_do_not_disturb_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_donate.png b/app/src/main/res/drawable-mdpi/ic_donate.png
index 546ff44b9..0bcf6da10 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_donate.png and b/app/src/main/res/drawable-mdpi/ic_donate.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_email.png b/app/src/main/res/drawable-mdpi/ic_email.png
index af6cc2a9b..9be09fca6 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_email.png and b/app/src/main/res/drawable-mdpi/ic_email.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png
index d83b2e103..a173d9cde 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png and b/app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png
index b2c6b766c..b48adc432 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png and b/app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_fdroid_grey.png b/app/src/main/res/drawable-mdpi/ic_fdroid_grey.png
index 23f9cc03b..ace4bf8c9 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_fdroid_grey.png and b/app/src/main/res/drawable-mdpi/ic_fdroid_grey.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_file_download.png b/app/src/main/res/drawable-mdpi/ic_file_download.png
index 7c65d4c76..80cdfef99 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_file_download.png and b/app/src/main/res/drawable-mdpi/ic_file_download.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_file_install.png b/app/src/main/res/drawable-mdpi/ic_file_install.png
index 4cc23747a..edf1f324b 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_file_install.png and b/app/src/main/res/drawable-mdpi/ic_file_install.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_issues.png b/app/src/main/res/drawable-mdpi/ic_issues.png
index 0bbf6c0aa..8de37e40e 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_issues.png and b/app/src/main/res/drawable-mdpi/ic_issues.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png
index bdeb402f7..18571760c 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-mdpi/ic_lock_24dp_grey600.png
index 656fdbda7..5ded2cae4 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_lock_24dp_grey600.png and b/app/src/main/res/drawable-mdpi/ic_lock_24dp_grey600.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_more.png b/app/src/main/res/drawable-mdpi/ic_more.png
index c0769c7e4..3523a36e9 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_more.png and b/app/src/main/res/drawable-mdpi/ic_more.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_network_wifi_white.png b/app/src/main/res/drawable-mdpi/ic_network_wifi_white.png
index ca927f3de..22b65c566 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_network_wifi_white.png and b/app/src/main/res/drawable-mdpi/ic_network_wifi_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_nfc_white.png b/app/src/main/res/drawable-mdpi/ic_nfc_white.png
index cdadd9eef..9acec30eb 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_nfc_white.png and b/app/src/main/res/drawable-mdpi/ic_nfc_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_qr_grey.png b/app/src/main/res/drawable-mdpi/ic_qr_grey.png
index cc3748c34..13aeeaf88 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_qr_grey.png and b/app/src/main/res/drawable-mdpi/ic_qr_grey.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_refresh_white.png b/app/src/main/res/drawable-mdpi/ic_refresh_white.png
index 97e42b525..99233274a 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_refresh_white.png and b/app/src/main/res/drawable-mdpi/ic_refresh_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_repo_app_default.png b/app/src/main/res/drawable-mdpi/ic_repo_app_default.png
index 99cea3f00..c8dc0a83c 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_repo_app_default.png and b/app/src/main/res/drawable-mdpi/ic_repo_app_default.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_search_white.png b/app/src/main/res/drawable-mdpi/ic_search_white.png
index faefc59c8..5af456279 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_search_white.png and b/app/src/main/res/drawable-mdpi/ic_search_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_share_white.png b/app/src/main/res/drawable-mdpi/ic_share_white.png
index 6c29d7c5c..c4111a81b 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_share_white.png and b/app/src/main/res/drawable-mdpi/ic_share_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_source_code.png b/app/src/main/res/drawable-mdpi/ic_source_code.png
index 29169f7a3..54b0fc329 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_source_code.png and b/app/src/main/res/drawable-mdpi/ic_source_code.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_swap.png b/app/src/main/res/drawable-mdpi/ic_swap.png
index 7aadbf8b8..ba66d65d7 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_swap.png and b/app/src/main/res/drawable-mdpi/ic_swap.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_website.png b/app/src/main/res/drawable-mdpi/ic_website.png
index 6d8ec502f..9d251e0ad 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_website.png and b/app/src/main/res/drawable-mdpi/ic_website.png differ
diff --git a/app/src/main/res/drawable-mdpi/nfc_touch.png b/app/src/main/res/drawable-mdpi/nfc_touch.png
index 94d78ff93..09dc32485 100644
Binary files a/app/src/main/res/drawable-mdpi/nfc_touch.png and b/app/src/main/res/drawable-mdpi/nfc_touch.png differ
diff --git a/app/src/main/res/drawable-mdpi/swap_start_header.png b/app/src/main/res/drawable-mdpi/swap_start_header.png
index 45405c65d..cb244c1f7 100644
Binary files a/app/src/main/res/drawable-mdpi/swap_start_header.png and b/app/src/main/res/drawable-mdpi/swap_start_header.png differ
diff --git a/app/src/main/res/drawable-mdpi/wifi.png b/app/src/main/res/drawable-mdpi/wifi.png
index 484b4a14c..f369c14c0 100644
Binary files a/app/src/main/res/drawable-mdpi/wifi.png and b/app/src/main/res/drawable-mdpi/wifi.png differ
diff --git a/app/src/main/res/drawable-xhdpi/circle.png b/app/src/main/res/drawable-xhdpi/circle.png
index bdb13ba71..0389099b7 100644
Binary files a/app/src/main/res/drawable-xhdpi/circle.png and b/app/src/main/res/drawable-xhdpi/circle.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_access_time_24dp_grey600.png b/app/src/main/res/drawable-xhdpi/ic_access_time_24dp_grey600.png
index cb1c81d7a..c76b15866 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_access_time_24dp_grey600.png and b/app/src/main/res/drawable-xhdpi/ic_access_time_24dp_grey600.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_circle_outline_white.png b/app/src/main/res/drawable-xhdpi/ic_add_circle_outline_white.png
index 573aefe2b..b5ac817ac 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_add_circle_outline_white.png and b/app/src/main/res/drawable-xhdpi/ic_add_circle_outline_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_white.png b/app/src/main/res/drawable-xhdpi/ic_add_white.png
index 67bb598e5..684520fc1 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_add_white.png and b/app/src/main/res/drawable-xhdpi/ic_add_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png
index 5e93f8862..e45530041 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png and b/app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_back.png b/app/src/main/res/drawable-xhdpi/ic_back.png
index 997e69162..a2d389424 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_back.png and b/app/src/main/res/drawable-xhdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bluetooth_white.png b/app/src/main/res/drawable-xhdpi/ic_bluetooth_white.png
index 920f5cae7..8584c2b16 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_bluetooth_white.png and b/app/src/main/res/drawable-xhdpi/ic_bluetooth_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cancel.png b/app/src/main/res/drawable-xhdpi/ic_cancel.png
index 3e85c8a97..82ccadf30 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_cancel.png and b/app/src/main/res/drawable-xhdpi/ic_cancel.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_changelog.png b/app/src/main/res/drawable-xhdpi/ic_changelog.png
index 456a2e8e4..81ecb2611 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_changelog.png and b/app/src/main/res/drawable-xhdpi/ic_changelog.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_check_circle_white.png b/app/src/main/res/drawable-xhdpi/ic_check_circle_white.png
index 816c59095..43995d4f5 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_check_circle_white.png and b/app/src/main/res/drawable-xhdpi/ic_check_circle_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white.png b/app/src/main/res/drawable-xhdpi/ic_close_white.png
index 04fa6efe6..cea8dc1e7 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_close_white.png and b/app/src/main/res/drawable-xhdpi/ic_close_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_coins_s.png b/app/src/main/res/drawable-xhdpi/ic_coins_s.png
index 13d134e6b..50b1e201e 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_coins_s.png and b/app/src/main/res/drawable-xhdpi/ic_coins_s.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_white.png b/app/src/main/res/drawable-xhdpi/ic_delete_white.png
index 388b5b060..f0ee14168 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_delete_white.png and b/app/src/main/res/drawable-xhdpi/ic_delete_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-xhdpi/ic_do_not_disturb_white.png
index dc5e1ac59..01b07978f 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_do_not_disturb_white.png and b/app/src/main/res/drawable-xhdpi/ic_do_not_disturb_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_donate.png b/app/src/main/res/drawable-xhdpi/ic_donate.png
index b30e51d96..17c28cbc2 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_donate.png and b/app/src/main/res/drawable-xhdpi/ic_donate.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_email.png b/app/src/main/res/drawable-xhdpi/ic_email.png
index 69febc0bf..de94498dd 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_email.png and b/app/src/main/res/drawable-xhdpi/ic_email.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png
index f117dc673..61a9e6a00 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png and b/app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png
index 8702c9a26..b7fbdee46 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png and b/app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_fdroid_grey.png b/app/src/main/res/drawable-xhdpi/ic_fdroid_grey.png
index 5d32c2c77..d0607846f 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_fdroid_grey.png and b/app/src/main/res/drawable-xhdpi/ic_fdroid_grey.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download.png b/app/src/main/res/drawable-xhdpi/ic_file_download.png
index 2923dd893..50dbd1fea 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_file_download.png and b/app/src/main/res/drawable-xhdpi/ic_file_download.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_install.png b/app/src/main/res/drawable-xhdpi/ic_file_install.png
index 1de323ce1..491de1b38 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_file_install.png and b/app/src/main/res/drawable-xhdpi/ic_file_install.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_issues.png b/app/src/main/res/drawable-xhdpi/ic_issues.png
index 5d7369af3..c9aa7ba3c 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_issues.png and b/app/src/main/res/drawable-xhdpi/ic_issues.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
index ada878738..aa7c08cd6 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-xhdpi/ic_lock_24dp_grey600.png
index 3fec2b5db..d3ec620b9 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_lock_24dp_grey600.png and b/app/src/main/res/drawable-xhdpi/ic_lock_24dp_grey600.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_more.png b/app/src/main/res/drawable-xhdpi/ic_more.png
index 0b2f5d65c..7f3118f91 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_more.png and b/app/src/main/res/drawable-xhdpi/ic_more.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_network_wifi_white.png b/app/src/main/res/drawable-xhdpi/ic_network_wifi_white.png
index eb284e383..e0a54e078 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_network_wifi_white.png and b/app/src/main/res/drawable-xhdpi/ic_network_wifi_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_nfc_white.png b/app/src/main/res/drawable-xhdpi/ic_nfc_white.png
index 454a95024..929493c76 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_nfc_white.png and b/app/src/main/res/drawable-xhdpi/ic_nfc_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_qr_grey.png b/app/src/main/res/drawable-xhdpi/ic_qr_grey.png
index 8c424e959..a3c030cca 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_qr_grey.png and b/app/src/main/res/drawable-xhdpi/ic_qr_grey.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh_white.png b/app/src/main/res/drawable-xhdpi/ic_refresh_white.png
index 1989184b1..91d695d2b 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_refresh_white.png and b/app/src/main/res/drawable-xhdpi/ic_refresh_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_repo_app_default.png b/app/src/main/res/drawable-xhdpi/ic_repo_app_default.png
index 774f62abe..ef4043b13 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_repo_app_default.png and b/app/src/main/res/drawable-xhdpi/ic_repo_app_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_search_white.png b/app/src/main/res/drawable-xhdpi/ic_search_white.png
index bfc3e3939..df38ea27e 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_search_white.png and b/app/src/main/res/drawable-xhdpi/ic_search_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white.png b/app/src/main/res/drawable-xhdpi/ic_share_white.png
index d4c6683bb..26262197a 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_share_white.png and b/app/src/main/res/drawable-xhdpi/ic_share_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_source_code.png b/app/src/main/res/drawable-xhdpi/ic_source_code.png
index 0deb2b40c..1f2b3404a 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_source_code.png and b/app/src/main/res/drawable-xhdpi/ic_source_code.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_swap.png b/app/src/main/res/drawable-xhdpi/ic_swap.png
index ddb32abc7..00b028953 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_swap.png and b/app/src/main/res/drawable-xhdpi/ic_swap.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_website.png b/app/src/main/res/drawable-xhdpi/ic_website.png
index 253c1e712..9e3589937 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_website.png and b/app/src/main/res/drawable-xhdpi/ic_website.png differ
diff --git a/app/src/main/res/drawable-xhdpi/nfc_touch.png b/app/src/main/res/drawable-xhdpi/nfc_touch.png
index d24a29e1c..90b157e19 100644
Binary files a/app/src/main/res/drawable-xhdpi/nfc_touch.png and b/app/src/main/res/drawable-xhdpi/nfc_touch.png differ
diff --git a/app/src/main/res/drawable-xhdpi/swap_start_header.png b/app/src/main/res/drawable-xhdpi/swap_start_header.png
index 3b3534eb1..07815a1f2 100644
Binary files a/app/src/main/res/drawable-xhdpi/swap_start_header.png and b/app/src/main/res/drawable-xhdpi/swap_start_header.png differ
diff --git a/app/src/main/res/drawable-xhdpi/wifi.png b/app/src/main/res/drawable-xhdpi/wifi.png
index c51b47b9a..7303dba4f 100644
Binary files a/app/src/main/res/drawable-xhdpi/wifi.png and b/app/src/main/res/drawable-xhdpi/wifi.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/circle.png b/app/src/main/res/drawable-xxhdpi/circle.png
index ecf3ed94f..2b2403ca2 100644
Binary files a/app/src/main/res/drawable-xxhdpi/circle.png and b/app/src/main/res/drawable-xxhdpi/circle.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_access_time_24dp_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_access_time_24dp_grey600.png
index 46842ea0c..cc8acab7c 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_access_time_24dp_grey600.png and b/app/src/main/res/drawable-xxhdpi/ic_access_time_24dp_grey600.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white.png b/app/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white.png
index 2a83748df..b3a86faee 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white.png and b/app/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_white.png b/app/src/main/res/drawable-xxhdpi/ic_add_white.png
index 0fdced8fc..3f1a792e5 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_white.png and b/app/src/main/res/drawable-xxhdpi/ic_add_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png
index f8cf79f9d..cde697445 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png and b/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_back.png b/app/src/main/res/drawable-xxhdpi/ic_back.png
index 5daf7676d..89f5c8dbb 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_back.png and b/app/src/main/res/drawable-xxhdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bluetooth_white.png b/app/src/main/res/drawable-xxhdpi/ic_bluetooth_white.png
index 860c75864..efc67a4a8 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_bluetooth_white.png and b/app/src/main/res/drawable-xxhdpi/ic_bluetooth_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cancel.png b/app/src/main/res/drawable-xxhdpi/ic_cancel.png
index 155ddbc59..ef5d06395 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_cancel.png and b/app/src/main/res/drawable-xxhdpi/ic_cancel.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_changelog.png b/app/src/main/res/drawable-xxhdpi/ic_changelog.png
index 1a11a729e..2947fdff6 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_changelog.png and b/app/src/main/res/drawable-xxhdpi/ic_changelog.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_check_circle_white.png b/app/src/main/res/drawable-xxhdpi/ic_check_circle_white.png
index d8f900f3c..bf4f95a79 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_check_circle_white.png and b/app/src/main/res/drawable-xxhdpi/ic_check_circle_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_white.png b/app/src/main/res/drawable-xxhdpi/ic_close_white.png
index e8e923b28..d55633b59 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_close_white.png and b/app/src/main/res/drawable-xxhdpi/ic_close_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_white.png b/app/src/main/res/drawable-xxhdpi/ic_delete_white.png
index 3fcdfdb55..029a6bf70 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete_white.png and b/app/src/main/res/drawable-xxhdpi/ic_delete_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-xxhdpi/ic_do_not_disturb_white.png
index 349b03f6c..842e6d782 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_do_not_disturb_white.png and b/app/src/main/res/drawable-xxhdpi/ic_do_not_disturb_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_donate.png b/app/src/main/res/drawable-xxhdpi/ic_donate.png
index d3d33bfa7..aad7cb8a4 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_donate.png and b/app/src/main/res/drawable-xxhdpi/ic_donate.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_email.png b/app/src/main/res/drawable-xxhdpi/ic_email.png
index b9aac4c3c..98b882d68 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_email.png and b/app/src/main/res/drawable-xxhdpi/ic_email.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png
index a12d9d53e..dabd9e00e 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png and b/app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png
index 8f201672c..78afc9d1a 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png and b/app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_fdroid_grey.png b/app/src/main/res/drawable-xxhdpi/ic_fdroid_grey.png
index 89a0602f4..470c2f150 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_fdroid_grey.png and b/app/src/main/res/drawable-xxhdpi/ic_fdroid_grey.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download.png b/app/src/main/res/drawable-xxhdpi/ic_file_download.png
index afe04b6d4..8039016f5 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_file_download.png and b/app/src/main/res/drawable-xxhdpi/ic_file_download.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_install.png b/app/src/main/res/drawable-xxhdpi/ic_file_install.png
index c9f7923c8..7a1d4b193 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_file_install.png and b/app/src/main/res/drawable-xxhdpi/ic_file_install.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_issues.png b/app/src/main/res/drawable-xxhdpi/ic_issues.png
index 6c83d0fba..a8e6a8488 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_issues.png and b/app/src/main/res/drawable-xxhdpi/ic_issues.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
index 1742f8605..39dad4bd8 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_lock_24dp_grey600.png
index 7889d3b12..6fa7ecdc2 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock_24dp_grey600.png and b/app/src/main/res/drawable-xxhdpi/ic_lock_24dp_grey600.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_more.png b/app/src/main/res/drawable-xxhdpi/ic_more.png
index 4a69e0605..56b5c3332 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_more.png and b/app/src/main/res/drawable-xxhdpi/ic_more.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_network_wifi_white.png b/app/src/main/res/drawable-xxhdpi/ic_network_wifi_white.png
index fb9821e49..c05a1a429 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_network_wifi_white.png and b/app/src/main/res/drawable-xxhdpi/ic_network_wifi_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_nfc_white.png b/app/src/main/res/drawable-xxhdpi/ic_nfc_white.png
index 48d8e11f6..de4c4efd1 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_nfc_white.png and b/app/src/main/res/drawable-xxhdpi/ic_nfc_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_qr_grey.png b/app/src/main/res/drawable-xxhdpi/ic_qr_grey.png
index c6d063305..acfb176d0 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_qr_grey.png and b/app/src/main/res/drawable-xxhdpi/ic_qr_grey.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_refresh_white.png b/app/src/main/res/drawable-xxhdpi/ic_refresh_white.png
index 1692d8a24..535f3f013 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_refresh_white.png and b/app/src/main/res/drawable-xxhdpi/ic_refresh_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_repo_app_default.png b/app/src/main/res/drawable-xxhdpi/ic_repo_app_default.png
index f4f01e62b..0d02d378b 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_repo_app_default.png and b/app/src/main/res/drawable-xxhdpi/ic_repo_app_default.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_white.png b/app/src/main/res/drawable-xxhdpi/ic_search_white.png
index abbb98951..e2ed6c59f 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_search_white.png and b/app/src/main/res/drawable-xxhdpi/ic_search_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white.png b/app/src/main/res/drawable-xxhdpi/ic_share_white.png
index cd78cefce..321f4b87d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_share_white.png and b/app/src/main/res/drawable-xxhdpi/ic_share_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_source_code.png b/app/src/main/res/drawable-xxhdpi/ic_source_code.png
index 9ea7a6d44..341e438ec 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_source_code.png and b/app/src/main/res/drawable-xxhdpi/ic_source_code.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_website.png b/app/src/main/res/drawable-xxhdpi/ic_website.png
index f48bd157d..ffac19919 100644
Binary files a/app/src/main/res/drawable-xxhdpi/ic_website.png and b/app/src/main/res/drawable-xxhdpi/ic_website.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/swap_start_header.png b/app/src/main/res/drawable-xxhdpi/swap_start_header.png
index 4277bf98c..bb47ce0cd 100644
Binary files a/app/src/main/res/drawable-xxhdpi/swap_start_header.png and b/app/src/main/res/drawable-xxhdpi/swap_start_header.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/circle.png b/app/src/main/res/drawable-xxxhdpi/circle.png
index 11a766be0..40ff1f7b0 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/circle.png and b/app/src/main/res/drawable-xxxhdpi/circle.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_access_time_24dp_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_access_time_24dp_grey600.png
index 48d681580..91536550e 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_access_time_24dp_grey600.png and b/app/src/main/res/drawable-xxxhdpi/ic_access_time_24dp_grey600.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white.png b/app/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white.png
index cebba168e..dcdabfcd3 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_white.png b/app/src/main/res/drawable-xxxhdpi/ic_add_white.png
index d64c22e9e..781d69b8d 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_add_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white.png
index c619b9a89..b060bba11 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_white.png b/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_white.png
index 90d8a3413..470503ade 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cancel.png b/app/src/main/res/drawable-xxxhdpi/ic_cancel.png
index 67d8ea595..18d3e6638 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_cancel.png and b/app/src/main/res/drawable-xxxhdpi/ic_cancel.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_changelog.png b/app/src/main/res/drawable-xxxhdpi/ic_changelog.png
index 54451fb0a..18c4dcc4e 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_changelog.png and b/app/src/main/res/drawable-xxxhdpi/ic_changelog.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_check_circle_white.png b/app/src/main/res/drawable-xxxhdpi/ic_check_circle_white.png
index 5078aa2d6..853093f8c 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_check_circle_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_check_circle_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_white.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white.png
index f7f7de8c7..4198dabd5 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_close_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_close_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_white.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_white.png
index 8d322aa9b..25118caa3 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_delete_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_delete_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-xxxhdpi/ic_do_not_disturb_white.png
index 144695ec0..78557278e 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_do_not_disturb_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_do_not_disturb_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_donate.png b/app/src/main/res/drawable-xxxhdpi/ic_donate.png
index 86ee414ae..64cc9fc1d 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_donate.png and b/app/src/main/res/drawable-xxxhdpi/ic_donate.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_email.png b/app/src/main/res/drawable-xxxhdpi/ic_email.png
index c99f356d5..349177763 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_email.png and b/app/src/main/res/drawable-xxxhdpi/ic_email.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png
index cab4ca8b1..70fce81ce 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png and b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png
index ecc5abddc..44037e7cf 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png and b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_fdroid_grey.png b/app/src/main/res/drawable-xxxhdpi/ic_fdroid_grey.png
index 999bb3965..4b1a7f586 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_fdroid_grey.png and b/app/src/main/res/drawable-xxxhdpi/ic_fdroid_grey.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download.png
index 025407ad2..4d507bae8 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_file_download.png and b/app/src/main/res/drawable-xxxhdpi/ic_file_download.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_install.png b/app/src/main/res/drawable-xxxhdpi/ic_file_install.png
index c38be0310..8bd2f2d70 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_file_install.png and b/app/src/main/res/drawable-xxxhdpi/ic_file_install.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_issues.png b/app/src/main/res/drawable-xxxhdpi/ic_issues.png
index d1b999e9e..a95dd18dc 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_issues.png and b/app/src/main/res/drawable-xxxhdpi/ic_issues.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png
index ba7ef1217..a9fed619c 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png and b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png
index 884decbe3..9f084ffb3 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png and b/app/src/main/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_network_wifi_white.png b/app/src/main/res/drawable-xxxhdpi/ic_network_wifi_white.png
index 57f4dcc9b..017137ce0 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_network_wifi_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_network_wifi_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_nfc_white.png b/app/src/main/res/drawable-xxxhdpi/ic_nfc_white.png
index 7051d7bd6..021beb3d5 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_nfc_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_nfc_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_qr_grey.png b/app/src/main/res/drawable-xxxhdpi/ic_qr_grey.png
index b210fba05..b958578d1 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_qr_grey.png and b/app/src/main/res/drawable-xxxhdpi/ic_qr_grey.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_refresh_white.png b/app/src/main/res/drawable-xxxhdpi/ic_refresh_white.png
index f5beca251..a9db32db0 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_refresh_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_refresh_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png b/app/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png
index f4d5b82f1..970624ae9 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png and b/app/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_search_white.png b/app/src/main/res/drawable-xxxhdpi/ic_search_white.png
index dd5adfc7f..b4dc63845 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_search_white.png and b/app/src/main/res/drawable-xxxhdpi/ic_search_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_source_code.png b/app/src/main/res/drawable-xxxhdpi/ic_source_code.png
index 818c749b9..ac57c3927 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_source_code.png and b/app/src/main/res/drawable-xxxhdpi/ic_source_code.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_website.png b/app/src/main/res/drawable-xxxhdpi/ic_website.png
index b2c9bf3c9..2a3a628f7 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_website.png and b/app/src/main/res/drawable-xxxhdpi/ic_website.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/swap_start_header.png b/app/src/main/res/drawable-xxxhdpi/swap_start_header.png
index 25b970d9f..0ac840262 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/swap_start_header.png and b/app/src/main/res/drawable-xxxhdpi/swap_start_header.png differ
diff --git a/app/src/main/res/drawable/category_connectivity.png b/app/src/main/res/drawable/category_connectivity.png
index 716b40123..11a765864 100644
Binary files a/app/src/main/res/drawable/category_connectivity.png and b/app/src/main/res/drawable/category_connectivity.png differ
diff --git a/app/src/main/res/drawable/category_development.png b/app/src/main/res/drawable/category_development.png
index 1090030ad..ee586a63a 100644
Binary files a/app/src/main/res/drawable/category_development.png and b/app/src/main/res/drawable/category_development.png differ
diff --git a/app/src/main/res/drawable/category_games.png b/app/src/main/res/drawable/category_games.png
index 90879cc5b..2c38e0712 100644
Binary files a/app/src/main/res/drawable/category_games.png and b/app/src/main/res/drawable/category_games.png differ
diff --git a/app/src/main/res/drawable/category_graphics.png b/app/src/main/res/drawable/category_graphics.png
index f434775d0..40359ec7d 100644
Binary files a/app/src/main/res/drawable/category_graphics.png and b/app/src/main/res/drawable/category_graphics.png differ
diff --git a/app/src/main/res/drawable/category_internet.png b/app/src/main/res/drawable/category_internet.png
index 716b40123..11a765864 100644
Binary files a/app/src/main/res/drawable/category_internet.png and b/app/src/main/res/drawable/category_internet.png differ
diff --git a/app/src/main/res/drawable/category_money.png b/app/src/main/res/drawable/category_money.png
index c28c26ddf..e94a2c2d5 100644
Binary files a/app/src/main/res/drawable/category_money.png and b/app/src/main/res/drawable/category_money.png differ
diff --git a/app/src/main/res/drawable/category_navigation.png b/app/src/main/res/drawable/category_navigation.png
index 0aabe7b29..81b7a7ae8 100644
Binary files a/app/src/main/res/drawable/category_navigation.png and b/app/src/main/res/drawable/category_navigation.png differ
diff --git a/app/src/main/res/drawable/category_reading.png b/app/src/main/res/drawable/category_reading.png
index 6b34b55e2..fed4f213b 100644
Binary files a/app/src/main/res/drawable/category_reading.png and b/app/src/main/res/drawable/category_reading.png differ
diff --git a/app/src/main/res/drawable/category_science_education.png b/app/src/main/res/drawable/category_science_education.png
index 0895f1b5a..69d5c7c67 100644
Binary files a/app/src/main/res/drawable/category_science_education.png and b/app/src/main/res/drawable/category_science_education.png differ
diff --git a/app/src/main/res/drawable/category_security.png b/app/src/main/res/drawable/category_security.png
index e9b3941d3..4726f6215 100644
Binary files a/app/src/main/res/drawable/category_security.png and b/app/src/main/res/drawable/category_security.png differ
diff --git a/app/src/main/res/drawable/category_system.png b/app/src/main/res/drawable/category_system.png
index 6eba35151..ee959428e 100644
Binary files a/app/src/main/res/drawable/category_system.png and b/app/src/main/res/drawable/category_system.png differ
diff --git a/app/src/main/res/drawable/category_theming.png b/app/src/main/res/drawable/category_theming.png
index afa70277f..2a6ccda71 100644
Binary files a/app/src/main/res/drawable/category_theming.png and b/app/src/main/res/drawable/category_theming.png differ
diff --git a/app/src/main/res/drawable/category_writing.png b/app/src/main/res/drawable/category_writing.png
index 7f143cb69..f1e0858f9 100644
Binary files a/app/src/main/res/drawable/category_writing.png and b/app/src/main/res/drawable/category_writing.png differ
diff --git a/app/src/main/res/drawable/swap_qr_example.png b/app/src/main/res/drawable/swap_qr_example.png
index 6552dcc8f..1c9315abf 100644
Binary files a/app/src/main/res/drawable/swap_qr_example.png and b/app/src/main/res/drawable/swap_qr_example.png differ
diff --git a/tools/png-pre-compress b/tools/png-pre-compress
new file mode 100755
index 000000000..3edb26db9
--- /dev/null
+++ b/tools/png-pre-compress
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+set -e
+set -x
+
+for f in `find $(dirname $0)/../app/src/ -type f -name \*.png`; do
+    echo $f | grep -Eo '\.9\.png$' && continue  # do not optimized 9-patch, it breaks them
+    tmpfile=$(mktemp)
+    aapt singleCrunch -v -i $f -o $tmpfile
+    mv $tmpfile $f
+done