diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
index cd74255c7..784996c0d 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
@@ -21,7 +21,7 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentTop="true"
             android:layout_marginRight="6dp"
-            android:src="@drawable/ic_action_person" />
+            android:src="@drawable/ic_person_grey_24dp" />
 
         <TextView
             android:id="@+id/api_account_settings_acc_name"
diff --git a/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml
index d31ae52d7..39d87ee25 100644
--- a/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml
@@ -14,7 +14,7 @@
         android:paddingTop="4dp"
         android:paddingBottom="4dp"
         android:id="@+id/imageView"
-        android:src="@drawable/ic_action_person" />
+        android:src="@drawable/ic_person_grey_24dp" />
 
     <TextView
         android:id="@+id/api_accounts_adapter_item_name"
diff --git a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
index c4ea46d43..9166f958e 100644
--- a/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml
@@ -17,7 +17,7 @@
         android:id="@+id/api_apps_adapter_install_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_action_download"
+        android:src="@drawable/ic_file_download_grey_24dp"
         android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index f678825aa..d817f9269 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -135,7 +135,7 @@
             android:layout_weight="1"
             android:text="@string/btn_next"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_play"
+            android:drawableRight="@drawable/ic_play_arrow_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index 394ef10f4..a5646dc26 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -50,7 +50,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:hint="@string/filemanager_title_open"
-                    android:drawableRight="@drawable/ic_action_collection"
+                    android:drawableRight="@drawable/ic_folder_grey_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical" />
             </LinearLayout>
@@ -82,7 +82,7 @@
                     android:text="@string/btn_decrypt_verify_file"
                     android:clickable="true"
                     style="@style/SelectableItem"
-                    android:drawableRight="@drawable/ic_action_save"
+                    android:drawableRight="@drawable/ic_save_grey_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:layout_alignParentBottom="true"
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
index cbe03056c..0f341b2d6 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
@@ -59,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/btn_add_share_decrypted_text"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:layout_weight="1" />
@@ -77,7 +77,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
index 2ffbc66f4..9bd4e61c0 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml
@@ -26,7 +26,7 @@
             android:layout_height="match_parent"
             android:text="@string/edit_key_action_change_passphrase"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_edit"
+            android:drawableRight="@drawable/ic_mode_edit_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
@@ -69,7 +69,7 @@
             android:layout_height="match_parent"
             android:text="@string/edit_key_action_add_identity"
             android:minHeight="?android:attr/listPreferredItemHeight"
-            android:drawableRight="@drawable/ic_action_add_person"
+            android:drawableRight="@drawable/ic_person_add_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
index d62c9f32b..6f822148e 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
@@ -25,7 +25,7 @@
         android:clickable="true"
         style="@style/SelectableItem"
         android:text="@string/btn_encrypt_files"
-        android:drawableRight="@drawable/ic_action_collection"
+        android:drawableRight="@drawable/ic_folder_grey_24dp"
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
@@ -45,7 +45,7 @@
         android:clickable="true"
         style="@style/SelectableItem"
         android:text="@string/btn_encrypt_text"
-        android:drawableRight="@drawable/ic_action_copy"
+        android:drawableRight="@drawable/ic_content_copy_grey_24dp"
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
@@ -72,7 +72,7 @@
         android:clickable="true"
         style="@style/SelectableItem"
         android:text="@string/btn_decrypt_files"
-        android:drawableRight="@drawable/ic_action_collection"
+        android:drawableRight="@drawable/ic_folder_grey_24dp"
         android:drawablePadding="8dp"
         android:gravity="center_vertical" />
 
@@ -121,7 +121,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_paste"
+            android:src="@drawable/ic_content_paste_grey_24dp"
             android:layout_gravity="center_vertical" />
 
     </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
index f4c479ee9..26b1d809d 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_files_fragment.xml
@@ -46,7 +46,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/btn_encrypt_share_file"
                 android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
@@ -63,7 +63,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_save"
+                android:src="@drawable/ic_save_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
index 83e2cf9ee..6f7b636e1 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
@@ -42,7 +42,7 @@
                 android:layout_height="wrap_content"
                 android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/btn_share_encrypted_signed"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:layout_weight="1" />
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/file_dialog.xml b/OpenKeychain/src/main/res/layout/file_dialog.xml
index deefd0428..3a559c71c 100644
--- a/OpenKeychain/src/main/res/layout/file_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/file_dialog.xml
@@ -41,7 +41,7 @@
             android:layout_margin="4dp"
             android:contentDescription="@string/filemanager_title_open"
             android:background="@drawable/button_rounded"
-            android:src="@drawable/ic_action_collection"/>
+            android:src="@drawable/ic_folder_grey_24dp"/>
     </LinearLayout>
 
     <CheckBox
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry.xml b/OpenKeychain/src/main/res/layout/file_list_entry.xml
index f6fde2447..fafdd1713 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry.xml
@@ -53,7 +53,7 @@
             android:layout_alignParentRight="true"
             android:paddingRight="16dip"
             android:paddingLeft="16dip"
-            android:src="@drawable/ic_action_cancel"
+            android:src="@drawable/ic_close_grey_24dp"
             android:clickable="true"
             android:layout_centerVertical="true"
             style="@style/SelectableItem"/>
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
index f2caab653..f2ee4079e 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
@@ -15,7 +15,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:text="@string/btn_add_files"
-            android:drawableLeft="@drawable/ic_action_collection"
+            android:drawableLeft="@drawable/ic_folder_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml
index ba80214a6..443a7cde4 100644
--- a/OpenKeychain/src/main/res/layout/first_time_activity.xml
+++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml
@@ -38,7 +38,7 @@
                 android:layout_weight="1"
                 android:text="@string/first_time_import_key"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_collection"
+                android:drawableRight="@drawable/ic_folder_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
index dcdd9a31a..4af173409 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml
@@ -73,7 +73,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/import_import"
                 android:minHeight="?android:attr/listPreferredItemHeight"
-                android:drawableRight="@drawable/ic_action_download"
+                android:drawableRight="@drawable/ic_file_download_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
index 6f52e1938..a7234d848 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml
@@ -29,7 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_search"
+            android:src="@drawable/ic_search_grey_24dp"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
@@ -46,7 +46,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_settings"
+            android:src="@drawable/ic_settings_grey_24dp"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
index b1056dab3..bde4dafc0 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml
@@ -21,7 +21,7 @@
             android:layout_height="match_parent"
             android:text="@string/filemanager_title_open"
             android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_collection"
+            android:drawableRight="@drawable/ic_folder_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
@@ -38,7 +38,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:src="@drawable/ic_action_paste"
+            android:src="@drawable/ic_content_paste_grey_24dp"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/layout/log_display_item.xml b/OpenKeychain/src/main/res/layout/log_display_item.xml
index d3938aaf0..d35413185 100644
--- a/OpenKeychain/src/main/res/layout/log_display_item.xml
+++ b/OpenKeychain/src/main/res/layout/log_display_item.xml
@@ -32,7 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/log_sub"
-            android:src="@drawable/ic_action_view_as_list"
+            android:src="@drawable/ic_view_list_grey_24dp"
             android:layout_marginBottom="4dp"
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
index 19e37783b..6b7390b27 100644
--- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml
@@ -59,7 +59,7 @@
                     android:layout_height="match_parent"
                     android:text="@string/btn_export_to_server"
                     android:minHeight="?android:attr/listPreferredItemHeight"
-                    android:drawableRight="@drawable/ic_action_upload"
+                    android:drawableRight="@drawable/ic_file_upload_grey_24dp"
                     android:drawablePadding="8dp"
                     android:gravity="center_vertical"
                     android:clickable="true"
diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
index 0a6b46a93..08be4ab05 100644
--- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml
@@ -214,7 +214,7 @@
                 style="@style/SelectableItem"
                 android:text="@string/btn_view_cert_key"
                 android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_person"
+                android:drawableRight="@drawable/ic_person_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
index a6224a8d1..ec26b4a76 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
@@ -40,7 +40,7 @@
                 android:text=""
                 android:layout_weight="1"
                 android:typeface="monospace"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
@@ -114,7 +114,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/key_view_action_share_with"
                 android:layout_weight="1"
-                android:drawableRight="@drawable/ic_action_share"
+                android:drawableRight="@drawable/ic_share_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical" />
 
@@ -131,7 +131,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:padding="8dp"
-                android:src="@drawable/ic_action_copy"
+                android:src="@drawable/ic_content_copy_grey_24dp"
                 android:layout_gravity="center_vertical"
                 style="@style/SelectableItem" />
 
@@ -171,7 +171,7 @@
             style="@style/SelectableItem"
             android:text="@string/key_view_action_upload"
             android:layout_weight="1"
-            android:drawableRight="@drawable/ic_action_upload"
+            android:drawableRight="@drawable/ic_file_upload_grey_24dp"
             android:drawablePadding="8dp"
             android:gravity="center_vertical" />
 
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
index f41109d84..1062d0727 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml
@@ -26,7 +26,7 @@
 
         <ImageView
             android:id="@+id/subkey_item_edit_image"
-            android:src="@drawable/ic_action_edit"
+            android:src="@drawable/ic_mode_edit_grey_24dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="8dp" />
@@ -36,7 +36,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="8dp"
-            android:src="@drawable/ic_action_cancel"
+            android:src="@drawable/ic_close_grey_24dp"
             style="@style/SelectableItem" />
 
     </FrameLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
index 63c1ee70f..ff485cd48 100644
--- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml
@@ -61,7 +61,7 @@
         android:id="@+id/user_id_item_edit_image"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:src="@drawable/ic_action_edit"
+        android:src="@drawable/ic_mode_edit_grey_24dp"
         android:padding="8dp"
         android:layout_gravity="center_vertical" />
 
@@ -70,7 +70,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:padding="8dp"
-        android:src="@drawable/ic_action_cancel"
+        android:src="@drawable/ic_close_grey_24dp"
         android:layout_gravity="center_vertical"
         style="@style/SelectableItem" />
 
diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml
index c724c46a5..4a9fe16c7 100644
--- a/OpenKeychain/src/main/res/menu/key_view.xml
+++ b/OpenKeychain/src/main/res/menu/key_view.xml
@@ -22,7 +22,7 @@
 
     <item
         android:id="@+id/menu_key_view_delete"
-        android:icon="@drawable/ic_action_discard"
+        android:icon="@drawable/ic_delete_grey_24dp"
         app:showAsAction="never"
         android:title="@string/menu_delete_key" />