diff --git a/res/drawable-hdpi/encrypted_backup_dark.png b/res/drawable-hdpi/encrypted_backup_dark.png
deleted file mode 100755
index cd4f04aa1..000000000
Binary files a/res/drawable-hdpi/encrypted_backup_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/encrypted_backup_light.png b/res/drawable-hdpi/encrypted_backup_light.png
deleted file mode 100755
index de5029591..000000000
Binary files a/res/drawable-hdpi/encrypted_backup_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_content_copy_dark.png b/res/drawable-hdpi/ic_content_copy_dark.png
new file mode 100644
index 000000000..c736dded8
Binary files /dev/null and b/res/drawable-hdpi/ic_content_copy_dark.png differ
diff --git a/res/drawable-hdpi/ic_content_copy_light.png b/res/drawable-hdpi/ic_content_copy_light.png
new file mode 100644
index 000000000..c62e37100
Binary files /dev/null and b/res/drawable-hdpi/ic_content_copy_light.png differ
diff --git a/res/drawable-hdpi/ic_lock_dark.png b/res/drawable-hdpi/ic_lock_dark.png
new file mode 100644
index 000000000..bf65c7622
Binary files /dev/null and b/res/drawable-hdpi/ic_lock_dark.png differ
diff --git a/res/drawable-hdpi/ic_lock_light.png b/res/drawable-hdpi/ic_lock_light.png
new file mode 100644
index 000000000..76d799369
Binary files /dev/null and b/res/drawable-hdpi/ic_lock_light.png differ
diff --git a/res/drawable-hdpi/ic_message_black.png b/res/drawable-hdpi/ic_message_black.png
index 21a3484c9..024611593 100644
Binary files a/res/drawable-hdpi/ic_message_black.png and b/res/drawable-hdpi/ic_message_black.png differ
diff --git a/res/drawable-hdpi/ic_message_white.png b/res/drawable-hdpi/ic_message_white.png
new file mode 100644
index 000000000..a8ffb92e8
Binary files /dev/null and b/res/drawable-hdpi/ic_message_white.png differ
diff --git a/res/drawable-hdpi/plaintext_backup_dark.png b/res/drawable-hdpi/plaintext_backup_dark.png
deleted file mode 100755
index 70eb07378..000000000
Binary files a/res/drawable-hdpi/plaintext_backup_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/plaintext_backup_light.png b/res/drawable-hdpi/plaintext_backup_light.png
deleted file mode 100755
index 9a9e5706f..000000000
Binary files a/res/drawable-hdpi/plaintext_backup_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/stock_sms_dark.png b/res/drawable-hdpi/stock_sms_dark.png
deleted file mode 100755
index d2cfdf1f6..000000000
Binary files a/res/drawable-hdpi/stock_sms_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/stock_sms_light.png b/res/drawable-hdpi/stock_sms_light.png
deleted file mode 100755
index fa4d2c14d..000000000
Binary files a/res/drawable-hdpi/stock_sms_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/encrypted_backup_dark.png b/res/drawable-mdpi/encrypted_backup_dark.png
deleted file mode 100755
index 1127f87f7..000000000
Binary files a/res/drawable-mdpi/encrypted_backup_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/encrypted_backup_light.png b/res/drawable-mdpi/encrypted_backup_light.png
deleted file mode 100755
index 3a4a1586e..000000000
Binary files a/res/drawable-mdpi/encrypted_backup_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_content_copy_dark.png b/res/drawable-mdpi/ic_content_copy_dark.png
new file mode 100644
index 000000000..c0c21dc03
Binary files /dev/null and b/res/drawable-mdpi/ic_content_copy_dark.png differ
diff --git a/res/drawable-mdpi/ic_content_copy_light.png b/res/drawable-mdpi/ic_content_copy_light.png
new file mode 100644
index 000000000..fed820d7e
Binary files /dev/null and b/res/drawable-mdpi/ic_content_copy_light.png differ
diff --git a/res/drawable-mdpi/ic_lock_dark.png b/res/drawable-mdpi/ic_lock_dark.png
new file mode 100644
index 000000000..cb391ef1e
Binary files /dev/null and b/res/drawable-mdpi/ic_lock_dark.png differ
diff --git a/res/drawable-mdpi/ic_lock_light.png b/res/drawable-mdpi/ic_lock_light.png
new file mode 100644
index 000000000..66d72959f
Binary files /dev/null and b/res/drawable-mdpi/ic_lock_light.png differ
diff --git a/res/drawable-mdpi/ic_message_black.png b/res/drawable-mdpi/ic_message_black.png
index 5d08ca89b..3e4053c60 100644
Binary files a/res/drawable-mdpi/ic_message_black.png and b/res/drawable-mdpi/ic_message_black.png differ
diff --git a/res/drawable-mdpi/ic_message_white.png b/res/drawable-mdpi/ic_message_white.png
new file mode 100644
index 000000000..c20829465
Binary files /dev/null and b/res/drawable-mdpi/ic_message_white.png differ
diff --git a/res/drawable-mdpi/plaintext_backup_dark.png b/res/drawable-mdpi/plaintext_backup_dark.png
deleted file mode 100755
index 70eb07378..000000000
Binary files a/res/drawable-mdpi/plaintext_backup_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/plaintext_backup_light.png b/res/drawable-mdpi/plaintext_backup_light.png
deleted file mode 100755
index 9a9e5706f..000000000
Binary files a/res/drawable-mdpi/plaintext_backup_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/stock_sms_dark.png b/res/drawable-mdpi/stock_sms_dark.png
deleted file mode 100755
index dac4cb9fc..000000000
Binary files a/res/drawable-mdpi/stock_sms_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/stock_sms_light.png b/res/drawable-mdpi/stock_sms_light.png
deleted file mode 100755
index d239cfa09..000000000
Binary files a/res/drawable-mdpi/stock_sms_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/encrypted_backup_dark.png b/res/drawable-xhdpi/encrypted_backup_dark.png
deleted file mode 100755
index ad8d91a99..000000000
Binary files a/res/drawable-xhdpi/encrypted_backup_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/encrypted_backup_light.png b/res/drawable-xhdpi/encrypted_backup_light.png
deleted file mode 100755
index 2a166945a..000000000
Binary files a/res/drawable-xhdpi/encrypted_backup_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_content_copy_dark.png b/res/drawable-xhdpi/ic_content_copy_dark.png
new file mode 100644
index 000000000..9871d41db
Binary files /dev/null and b/res/drawable-xhdpi/ic_content_copy_dark.png differ
diff --git a/res/drawable-xhdpi/ic_content_copy_light.png b/res/drawable-xhdpi/ic_content_copy_light.png
new file mode 100644
index 000000000..660242490
Binary files /dev/null and b/res/drawable-xhdpi/ic_content_copy_light.png differ
diff --git a/res/drawable-xhdpi/ic_lock_dark.png b/res/drawable-xhdpi/ic_lock_dark.png
new file mode 100644
index 000000000..7189679a7
Binary files /dev/null and b/res/drawable-xhdpi/ic_lock_dark.png differ
diff --git a/res/drawable-xhdpi/ic_lock_light.png b/res/drawable-xhdpi/ic_lock_light.png
new file mode 100644
index 000000000..b7faa1dd7
Binary files /dev/null and b/res/drawable-xhdpi/ic_lock_light.png differ
diff --git a/res/drawable-xhdpi/ic_message_black.png b/res/drawable-xhdpi/ic_message_black.png
index cafb79123..8a51d0937 100644
Binary files a/res/drawable-xhdpi/ic_message_black.png and b/res/drawable-xhdpi/ic_message_black.png differ
diff --git a/res/drawable-xhdpi/ic_message_white.png b/res/drawable-xhdpi/ic_message_white.png
new file mode 100644
index 000000000..10bcddde8
Binary files /dev/null and b/res/drawable-xhdpi/ic_message_white.png differ
diff --git a/res/drawable-xhdpi/plaintext_backup_dark.png b/res/drawable-xhdpi/plaintext_backup_dark.png
deleted file mode 100755
index 70eb07378..000000000
Binary files a/res/drawable-xhdpi/plaintext_backup_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/plaintext_backup_light.png b/res/drawable-xhdpi/plaintext_backup_light.png
deleted file mode 100755
index 9a9e5706f..000000000
Binary files a/res/drawable-xhdpi/plaintext_backup_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/stock_sms_dark.png b/res/drawable-xhdpi/stock_sms_dark.png
deleted file mode 100755
index ace0bef32..000000000
Binary files a/res/drawable-xhdpi/stock_sms_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/stock_sms_light.png b/res/drawable-xhdpi/stock_sms_light.png
deleted file mode 100755
index e9e92e5f8..000000000
Binary files a/res/drawable-xhdpi/stock_sms_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/encrypted_backup_dark.png b/res/drawable-xxhdpi/encrypted_backup_dark.png
deleted file mode 100755
index 0e52c7c75..000000000
Binary files a/res/drawable-xxhdpi/encrypted_backup_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/encrypted_backup_light.png b/res/drawable-xxhdpi/encrypted_backup_light.png
deleted file mode 100755
index a7caa2db8..000000000
Binary files a/res/drawable-xxhdpi/encrypted_backup_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_content_copy_dark.png b/res/drawable-xxhdpi/ic_content_copy_dark.png
new file mode 100644
index 000000000..81e2d01ae
Binary files /dev/null and b/res/drawable-xxhdpi/ic_content_copy_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_content_copy_light.png b/res/drawable-xxhdpi/ic_content_copy_light.png
new file mode 100644
index 000000000..e78ac3bff
Binary files /dev/null and b/res/drawable-xxhdpi/ic_content_copy_light.png differ
diff --git a/res/drawable-xxhdpi/ic_lock_dark.png b/res/drawable-xxhdpi/ic_lock_dark.png
new file mode 100644
index 000000000..a45b3e447
Binary files /dev/null and b/res/drawable-xxhdpi/ic_lock_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_lock_light.png b/res/drawable-xxhdpi/ic_lock_light.png
new file mode 100644
index 000000000..238bab288
Binary files /dev/null and b/res/drawable-xxhdpi/ic_lock_light.png differ
diff --git a/res/drawable-xxhdpi/ic_message_white.png b/res/drawable-xxhdpi/ic_message_white.png
new file mode 100644
index 000000000..aa8186821
Binary files /dev/null and b/res/drawable-xxhdpi/ic_message_white.png differ
diff --git a/res/drawable-xxhdpi/plaintext_backup_dark.png b/res/drawable-xxhdpi/plaintext_backup_dark.png
deleted file mode 100755
index 70eb07378..000000000
Binary files a/res/drawable-xxhdpi/plaintext_backup_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/plaintext_backup_light.png b/res/drawable-xxhdpi/plaintext_backup_light.png
deleted file mode 100755
index 9a9e5706f..000000000
Binary files a/res/drawable-xxhdpi/plaintext_backup_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/stock_sms_dark.png b/res/drawable-xxhdpi/stock_sms_dark.png
deleted file mode 100755
index 424509055..000000000
Binary files a/res/drawable-xxhdpi/stock_sms_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/stock_sms_light.png b/res/drawable-xxhdpi/stock_sms_light.png
deleted file mode 100755
index 9102f25df..000000000
Binary files a/res/drawable-xxhdpi/stock_sms_light.png and /dev/null differ
diff --git a/res/layout/import_fragment.xml b/res/layout/import_fragment.xml
index d473f95f1..f4cc57578 100644
--- a/res/layout/import_fragment.xml
+++ b/res/layout/import_fragment.xml
@@ -31,7 +31,7 @@
             <ImageView android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginRight="10dip"
-                       android:src="?stock_sms"/>
+                       android:src="?import_sms"/>
 
             <LinearLayout android:orientation="vertical"
                           android:layout_width="wrap_content"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index d88f3706b..703f2eecc 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -62,7 +62,7 @@
     <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="stock_sms" format="reference" />
+    <attr name="import_sms" format="reference" />
     <attr name="encrypted_backup" format="reference" />
     <attr name="plaintext_backup" format="reference" />
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f73e52a8d..42a0949cc 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -72,9 +72,9 @@
         <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="stock_sms">@drawable/stock_sms_light</item>
-        <item name="encrypted_backup">@drawable/encrypted_backup_light</item>
-        <item name="plaintext_backup">@drawable/plaintext_backup_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>
@@ -158,9 +158,9 @@
         <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="stock_sms">@drawable/stock_sms_dark</item>
-        <item name="encrypted_backup">@drawable/encrypted_backup_dark</item>
-        <item name="plaintext_backup">@drawable/plaintext_backup_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="actionbar_icon">@drawable/actionbar_icon_holo_dark</item>