diff --git a/res/drawable-hdpi/ic_content_copy_dark.png b/res/drawable-hdpi/ic_content_copy_dark.png
deleted file mode 100644
index c736dded8b..0000000000
Binary files a/res/drawable-hdpi/ic_content_copy_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_content_copy_light.png b/res/drawable-hdpi/ic_content_copy_light.png
deleted file mode 100644
index c62e371007..0000000000
Binary files a/res/drawable-hdpi/ic_content_copy_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_content_copy_white_24dp.png b/res/drawable-hdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 0000000000..aecd68fb57
Binary files /dev/null and b/res/drawable-hdpi/ic_content_copy_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_lock_light.png b/res/drawable-hdpi/ic_lock_light.png
deleted file mode 100644
index 76d7993694..0000000000
Binary files a/res/drawable-hdpi/ic_lock_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_lock_dark.png b/res/drawable-hdpi/ic_lock_white_32dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_lock_dark.png
rename to res/drawable-hdpi/ic_lock_white_32dp.png
diff --git a/res/drawable-hdpi/ic_message_black.png b/res/drawable-hdpi/ic_message_black.png
deleted file mode 100644
index 0246115939..0000000000
Binary files a/res/drawable-hdpi/ic_message_black.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_message_white.png b/res/drawable-hdpi/ic_message_white.png
deleted file mode 100644
index a8ffb92e8e..0000000000
Binary files a/res/drawable-hdpi/ic_message_white.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_message_white_24dp.png b/res/drawable-hdpi/ic_message_white_24dp.png
new file mode 100644
index 0000000000..dc9341cea4
Binary files /dev/null and b/res/drawable-hdpi/ic_message_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_content_copy_dark.png b/res/drawable-mdpi/ic_content_copy_dark.png
deleted file mode 100644
index c0c21dc034..0000000000
Binary files a/res/drawable-mdpi/ic_content_copy_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_content_copy_light.png b/res/drawable-mdpi/ic_content_copy_light.png
deleted file mode 100644
index fed820d7e6..0000000000
Binary files a/res/drawable-mdpi/ic_content_copy_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_content_copy_white_24dp.png b/res/drawable-mdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 0000000000..66a0a250b9
Binary files /dev/null and b/res/drawable-mdpi/ic_content_copy_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_lock_light.png b/res/drawable-mdpi/ic_lock_light.png
deleted file mode 100644
index 66d72959f0..0000000000
Binary files a/res/drawable-mdpi/ic_lock_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_lock_dark.png b/res/drawable-mdpi/ic_lock_white_32dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_lock_dark.png
rename to res/drawable-mdpi/ic_lock_white_32dp.png
diff --git a/res/drawable-mdpi/ic_message_black.png b/res/drawable-mdpi/ic_message_black.png
deleted file mode 100644
index 3e4053c608..0000000000
Binary files a/res/drawable-mdpi/ic_message_black.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_message_white.png b/res/drawable-mdpi/ic_message_white.png
deleted file mode 100644
index c20829465b..0000000000
Binary files a/res/drawable-mdpi/ic_message_white.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_message_white_24dp.png b/res/drawable-mdpi/ic_message_white_24dp.png
new file mode 100644
index 0000000000..6979bbe5b1
Binary files /dev/null and b/res/drawable-mdpi/ic_message_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_content_copy_dark.png b/res/drawable-xhdpi/ic_content_copy_dark.png
deleted file mode 100644
index 9871d41db8..0000000000
Binary files a/res/drawable-xhdpi/ic_content_copy_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_content_copy_light.png b/res/drawable-xhdpi/ic_content_copy_light.png
deleted file mode 100644
index 6602424909..0000000000
Binary files a/res/drawable-xhdpi/ic_content_copy_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_content_copy_white_24dp.png b/res/drawable-xhdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 0000000000..b0b3718738
Binary files /dev/null and b/res/drawable-xhdpi/ic_content_copy_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_lock_light.png b/res/drawable-xhdpi/ic_lock_light.png
deleted file mode 100644
index b7faa1dd73..0000000000
Binary files a/res/drawable-xhdpi/ic_lock_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_lock_dark.png b/res/drawable-xhdpi/ic_lock_white_32dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_lock_dark.png
rename to res/drawable-xhdpi/ic_lock_white_32dp.png
diff --git a/res/drawable-xhdpi/ic_message_black.png b/res/drawable-xhdpi/ic_message_black.png
deleted file mode 100644
index 8a51d0937b..0000000000
Binary files a/res/drawable-xhdpi/ic_message_black.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_message_white.png b/res/drawable-xhdpi/ic_message_white.png
deleted file mode 100644
index 10bcddde8a..0000000000
Binary files a/res/drawable-xhdpi/ic_message_white.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_message_white_24dp.png b/res/drawable-xhdpi/ic_message_white_24dp.png
new file mode 100644
index 0000000000..8eedc8a387
Binary files /dev/null and b/res/drawable-xhdpi/ic_message_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_content_copy_dark.png b/res/drawable-xxhdpi/ic_content_copy_dark.png
deleted file mode 100644
index 81e2d01aeb..0000000000
Binary files a/res/drawable-xxhdpi/ic_content_copy_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_content_copy_light.png b/res/drawable-xxhdpi/ic_content_copy_light.png
deleted file mode 100644
index e78ac3bffa..0000000000
Binary files a/res/drawable-xxhdpi/ic_content_copy_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_content_copy_white_24dp.png b/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
index 5fc17a4d13..6f8c7a1dc9 100644
Binary files a/res/drawable-xxhdpi/ic_content_copy_white_24dp.png and b/res/drawable-xxhdpi/ic_content_copy_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_lock_light.png b/res/drawable-xxhdpi/ic_lock_light.png
deleted file mode 100644
index 238bab2880..0000000000
Binary files a/res/drawable-xxhdpi/ic_lock_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_lock_dark.png b/res/drawable-xxhdpi/ic_lock_white_32dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_lock_dark.png
rename to res/drawable-xxhdpi/ic_lock_white_32dp.png
diff --git a/res/drawable-xxhdpi/ic_message_black.png b/res/drawable-xxhdpi/ic_message_black.png
deleted file mode 100644
index 2bd629d9bb..0000000000
Binary files a/res/drawable-xxhdpi/ic_message_black.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_message_white.png b/res/drawable-xxhdpi/ic_message_white.png
deleted file mode 100644
index aa81868213..0000000000
Binary files a/res/drawable-xxhdpi/ic_message_white.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_message_white_24dp.png b/res/drawable-xxhdpi/ic_message_white_24dp.png
new file mode 100644
index 0000000000..e1d812bb58
Binary files /dev/null and b/res/drawable-xxhdpi/ic_message_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png b/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 0000000000..ff65f6d247
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_message_white_24dp.png b/res/drawable-xxxhdpi/ic_message_white_24dp.png
new file mode 100644
index 0000000000..494b8bf531
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_message_white_24dp.png differ
diff --git a/res/layout/import_export_fragment.xml b/res/layout/import_export_fragment.xml
index 16f49e36c8..0d6f29cb0e 100644
--- a/res/layout/import_export_fragment.xml
+++ b/res/layout/import_export_fragment.xml
@@ -38,7 +38,8 @@
                        android:layout_marginStart="16dp"
                        android:layout_marginRight="32dp"
                        android:layout_marginEnd="32dp"
-                       android:src="?import_sms"/>
+                       android:src="@drawable/ic_message_white_24dp"
+                       android:tint="?attr/pref_icon_tint"/>
 
             <LinearLayout android:orientation="vertical"
                           android:layout_width="wrap_content"
@@ -80,7 +81,8 @@
                        android:layout_marginStart="16dp"
                        android:layout_marginRight="32dip"
                        android:layout_marginEnd="32dip"
-                       android:src="?plaintext_backup"/>
+                       android:src="@drawable/ic_content_copy_white_24dp"
+                       android:tint="?attr/pref_icon_tint"/>
 
             <LinearLayout android:orientation="vertical"
                           android:layout_width="wrap_content"
@@ -135,7 +137,8 @@
                        android:layout_marginStart="16dp"
                        android:layout_marginRight="32dp"
                        android:layout_marginEnd="32dp"
-                       android:src="?plaintext_backup"/>
+                       android:src="@drawable/ic_content_copy_white_24dp"
+                       android:tint="?attr/pref_icon_tint"/>
 
             <LinearLayout android:orientation="vertical"
                           android:layout_width="wrap_content"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 17b0ad3010..d678189289 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -92,9 +92,6 @@
     <attr name="import_export_item_background_color" format="reference|color" />
     <attr name="import_export_item_background_shadow_color" format="reference|color" />
     <attr name="import_export_item_card_background" format="reference" />
-    <attr name="import_sms" format="reference" />
-    <attr name="encrypted_backup" format="reference" />
-    <attr name="plaintext_backup" format="reference" />
 
     <attr name="reminder_header_background" format="color"/>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c380d57d01..a3888ca472 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -181,9 +181,6 @@
         <item name="import_export_item_background_color">@color/import_export_item_background_light</item>
         <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_light</item>
         <item name="import_export_item_card_background">@drawable/clickable_card_light</item>
-        <item name="import_sms">@drawable/ic_message_black</item>
-        <item name="encrypted_backup">@drawable/ic_lock_light</item>
-        <item name="plaintext_backup">@drawable/ic_content_copy_light</item>
 
         <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
         <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
@@ -266,9 +263,6 @@
         <item name="import_export_item_background_color">@color/import_export_item_background_dark</item>
         <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_dark</item>
         <item name="import_export_item_card_background">@drawable/clickable_card_dark</item>
-        <item name="import_sms">@drawable/ic_message_white</item>
-        <item name="encrypted_backup">@drawable/ic_lock_dark</item>
-        <item name="plaintext_backup">@drawable/ic_content_copy_dark</item>
 
         <item name="fab_color">@color/textsecure_primary_dark</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_light</item>