diff --git a/res/drawable-hdpi/encrypted_backup_dark.png b/res/drawable-hdpi/encrypted_backup_dark.png
deleted file mode 100755
index cd4f04aa1d..0000000000
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 de50295914..0000000000
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 0000000000..c736dded8b
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 0000000000..c62e371007
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 0000000000..bf65c7622d
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 0000000000..76d7993694
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 21a3484c9f..0246115939 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 0000000000..a8ffb92e8e
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 70eb073788..0000000000
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 9a9e5706fe..0000000000
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 d2cfdf1f6b..0000000000
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 fa4d2c14d5..0000000000
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 1127f87f70..0000000000
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 3a4a1586e5..0000000000
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 0000000000..c0c21dc034
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 0000000000..fed820d7e6
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 0000000000..cb391ef1ea
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 0000000000..66d72959f0
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 5d08ca89b9..3e4053c608 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 0000000000..c20829465b
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 70eb073788..0000000000
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 9a9e5706fe..0000000000
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 dac4cb9fc4..0000000000
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 d239cfa099..0000000000
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 ad8d91a99f..0000000000
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 2a166945a2..0000000000
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 0000000000..9871d41db8
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 0000000000..6602424909
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 0000000000..7189679a76
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 0000000000..b7faa1dd73
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 cafb791232..8a51d0937b 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 0000000000..10bcddde8a
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 70eb073788..0000000000
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 9a9e5706fe..0000000000
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 ace0bef32e..0000000000
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 e9e92e5f80..0000000000
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 0e52c7c75e..0000000000
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 a7caa2db8b..0000000000
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 0000000000..81e2d01aeb
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 0000000000..e78ac3bffa
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 0000000000..a45b3e4471
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 0000000000..238bab2880
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 0000000000..aa81868213
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 70eb073788..0000000000
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 9a9e5706fe..0000000000
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 4245090551..0000000000
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 9102f25dfd..0000000000
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 d473f95f11..f4cc575788 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 d88f3706ba..703f2eeccb 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 f73e52a8db..42a0949cc6 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>