diff --git a/res/drawable-hdpi/card.9.png b/res/drawable-hdpi/card.9.png
deleted file mode 100644
index b306db67c6..0000000000
Binary files a/res/drawable-hdpi/card.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/encrypted_backup.png b/res/drawable-hdpi/encrypted_backup.png
deleted file mode 100644
index 160ff08a04..0000000000
Binary files a/res/drawable-hdpi/encrypted_backup.png and /dev/null differ
diff --git a/res/drawable-hdpi/encrypted_backup_dark.png b/res/drawable-hdpi/encrypted_backup_dark.png
new file mode 100755
index 0000000000..b94735ecbb
Binary files /dev/null and b/res/drawable-hdpi/encrypted_backup_dark.png differ
diff --git a/res/drawable-hdpi/encrypted_backup_light.png b/res/drawable-hdpi/encrypted_backup_light.png
new file mode 100755
index 0000000000..0888c6173d
Binary files /dev/null and b/res/drawable-hdpi/encrypted_backup_light.png differ
diff --git a/res/drawable-hdpi/plaintext_backup.png b/res/drawable-hdpi/plaintext_backup.png
deleted file mode 100644
index f6dd4cdf1d..0000000000
Binary files a/res/drawable-hdpi/plaintext_backup.png and /dev/null differ
diff --git a/res/drawable-hdpi/plaintext_backup_dark.png b/res/drawable-hdpi/plaintext_backup_dark.png
new file mode 100755
index 0000000000..03b1aac4e0
Binary files /dev/null and b/res/drawable-hdpi/plaintext_backup_dark.png differ
diff --git a/res/drawable-hdpi/plaintext_backup_light.png b/res/drawable-hdpi/plaintext_backup_light.png
new file mode 100755
index 0000000000..dc8c85cceb
Binary files /dev/null and b/res/drawable-hdpi/plaintext_backup_light.png differ
diff --git a/res/drawable-hdpi/stock_sms.png b/res/drawable-hdpi/stock_sms.png
deleted file mode 100644
index 65d643c89b..0000000000
Binary files a/res/drawable-hdpi/stock_sms.png and /dev/null differ
diff --git a/res/drawable-hdpi/stock_sms_dark.png b/res/drawable-hdpi/stock_sms_dark.png
new file mode 100755
index 0000000000..f39c380e56
Binary files /dev/null and b/res/drawable-hdpi/stock_sms_dark.png differ
diff --git a/res/drawable-hdpi/stock_sms_light.png b/res/drawable-hdpi/stock_sms_light.png
new file mode 100755
index 0000000000..578e5ea2e0
Binary files /dev/null and b/res/drawable-hdpi/stock_sms_light.png differ
diff --git a/res/drawable-mdpi/card.9.png b/res/drawable-mdpi/card.9.png
deleted file mode 100644
index b306db67c6..0000000000
Binary files a/res/drawable-mdpi/card.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/encrypted_backup.png b/res/drawable-mdpi/encrypted_backup.png
deleted file mode 100644
index bd3e4f1d8e..0000000000
Binary files a/res/drawable-mdpi/encrypted_backup.png and /dev/null differ
diff --git a/res/drawable-mdpi/encrypted_backup_dark.png b/res/drawable-mdpi/encrypted_backup_dark.png
new file mode 100755
index 0000000000..381b6a1181
Binary files /dev/null and b/res/drawable-mdpi/encrypted_backup_dark.png differ
diff --git a/res/drawable-mdpi/encrypted_backup_light.png b/res/drawable-mdpi/encrypted_backup_light.png
new file mode 100755
index 0000000000..d18d4b6674
Binary files /dev/null and b/res/drawable-mdpi/encrypted_backup_light.png differ
diff --git a/res/drawable-mdpi/plaintext_backup.png b/res/drawable-mdpi/plaintext_backup.png
deleted file mode 100644
index 6c8e6777f5..0000000000
Binary files a/res/drawable-mdpi/plaintext_backup.png and /dev/null differ
diff --git a/res/drawable-mdpi/plaintext_backup_dark.png b/res/drawable-mdpi/plaintext_backup_dark.png
new file mode 100755
index 0000000000..03b1aac4e0
Binary files /dev/null and b/res/drawable-mdpi/plaintext_backup_dark.png differ
diff --git a/res/drawable-mdpi/plaintext_backup_light.png b/res/drawable-mdpi/plaintext_backup_light.png
new file mode 100755
index 0000000000..dc8c85cceb
Binary files /dev/null and b/res/drawable-mdpi/plaintext_backup_light.png differ
diff --git a/res/drawable-mdpi/stock_sms.png b/res/drawable-mdpi/stock_sms.png
deleted file mode 100644
index 1b83a7f206..0000000000
Binary files a/res/drawable-mdpi/stock_sms.png and /dev/null differ
diff --git a/res/drawable-mdpi/stock_sms_dark.png b/res/drawable-mdpi/stock_sms_dark.png
new file mode 100755
index 0000000000..7b98ee3eec
Binary files /dev/null and b/res/drawable-mdpi/stock_sms_dark.png differ
diff --git a/res/drawable-mdpi/stock_sms_light.png b/res/drawable-mdpi/stock_sms_light.png
new file mode 100755
index 0000000000..beac4a30c0
Binary files /dev/null and b/res/drawable-mdpi/stock_sms_light.png differ
diff --git a/res/drawable-xhdpi/card.9.png b/res/drawable-xhdpi/card.9.png
deleted file mode 100644
index bd540900c2..0000000000
Binary files a/res/drawable-xhdpi/card.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/encrypted_backup.png b/res/drawable-xhdpi/encrypted_backup.png
deleted file mode 100644
index ad3bf14fb8..0000000000
Binary files a/res/drawable-xhdpi/encrypted_backup.png and /dev/null differ
diff --git a/res/drawable-xhdpi/encrypted_backup_dark.png b/res/drawable-xhdpi/encrypted_backup_dark.png
new file mode 100755
index 0000000000..c5e9d0b498
Binary files /dev/null and b/res/drawable-xhdpi/encrypted_backup_dark.png differ
diff --git a/res/drawable-xhdpi/encrypted_backup_light.png b/res/drawable-xhdpi/encrypted_backup_light.png
new file mode 100755
index 0000000000..8856c70df3
Binary files /dev/null and b/res/drawable-xhdpi/encrypted_backup_light.png differ
diff --git a/res/drawable-xhdpi/plaintext_backup.png b/res/drawable-xhdpi/plaintext_backup.png
deleted file mode 100644
index a9a6c0a2c7..0000000000
Binary files a/res/drawable-xhdpi/plaintext_backup.png and /dev/null differ
diff --git a/res/drawable-xhdpi/plaintext_backup_dark.png b/res/drawable-xhdpi/plaintext_backup_dark.png
new file mode 100755
index 0000000000..03b1aac4e0
Binary files /dev/null and b/res/drawable-xhdpi/plaintext_backup_dark.png differ
diff --git a/res/drawable-xhdpi/plaintext_backup_light.png b/res/drawable-xhdpi/plaintext_backup_light.png
new file mode 100755
index 0000000000..dc8c85cceb
Binary files /dev/null and b/res/drawable-xhdpi/plaintext_backup_light.png differ
diff --git a/res/drawable-xhdpi/stock_sms.png b/res/drawable-xhdpi/stock_sms.png
deleted file mode 100644
index e986815509..0000000000
Binary files a/res/drawable-xhdpi/stock_sms.png and /dev/null differ
diff --git a/res/drawable-xhdpi/stock_sms_dark.png b/res/drawable-xhdpi/stock_sms_dark.png
new file mode 100755
index 0000000000..526ebec6df
Binary files /dev/null and b/res/drawable-xhdpi/stock_sms_dark.png differ
diff --git a/res/drawable-xhdpi/stock_sms_light.png b/res/drawable-xhdpi/stock_sms_light.png
new file mode 100755
index 0000000000..2eecf0016a
Binary files /dev/null and b/res/drawable-xhdpi/stock_sms_light.png differ
diff --git a/res/drawable-xxhdpi/encrypted_backup_dark.png b/res/drawable-xxhdpi/encrypted_backup_dark.png
new file mode 100755
index 0000000000..0dcada814e
Binary files /dev/null and b/res/drawable-xxhdpi/encrypted_backup_dark.png differ
diff --git a/res/drawable-xxhdpi/encrypted_backup_light.png b/res/drawable-xxhdpi/encrypted_backup_light.png
new file mode 100755
index 0000000000..c49d420e0b
Binary files /dev/null and b/res/drawable-xxhdpi/encrypted_backup_light.png differ
diff --git a/res/drawable-xxhdpi/plaintext_backup_dark.png b/res/drawable-xxhdpi/plaintext_backup_dark.png
new file mode 100755
index 0000000000..03b1aac4e0
Binary files /dev/null and b/res/drawable-xxhdpi/plaintext_backup_dark.png differ
diff --git a/res/drawable-xxhdpi/plaintext_backup_light.png b/res/drawable-xxhdpi/plaintext_backup_light.png
new file mode 100755
index 0000000000..dc8c85cceb
Binary files /dev/null and b/res/drawable-xxhdpi/plaintext_backup_light.png differ
diff --git a/res/drawable-xxhdpi/stock_sms_dark.png b/res/drawable-xxhdpi/stock_sms_dark.png
new file mode 100755
index 0000000000..71cac75afd
Binary files /dev/null and b/res/drawable-xxhdpi/stock_sms_dark.png differ
diff --git a/res/drawable-xxhdpi/stock_sms_light.png b/res/drawable-xxhdpi/stock_sms_light.png
new file mode 100755
index 0000000000..62bf00e9f9
Binary files /dev/null and b/res/drawable-xxhdpi/stock_sms_light.png differ
diff --git a/res/drawable/clickable_card.xml b/res/drawable/clickable_card.xml
deleted file mode 100644
index 23b7c7f831..0000000000
--- a/res/drawable/clickable_card.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/drawable/clickable_card_dark.xml b/res/drawable/clickable_card_dark.xml
new file mode 100644
index 0000000000..2fad92295a
--- /dev/null
+++ b/res/drawable/clickable_card_dark.xml
@@ -0,0 +1,11 @@
+
+
+ -
+
+
+
+
+
+
+
+
diff --git a/res/drawable/clickable_card_light.xml b/res/drawable/clickable_card_light.xml
new file mode 100644
index 0000000000..20f576a4b7
--- /dev/null
+++ b/res/drawable/clickable_card_light.xml
@@ -0,0 +1,11 @@
+
+
+ -
+
+
+
+
+
+
+
+
diff --git a/res/drawable/import_export_item_background_dark.xml b/res/drawable/import_export_item_background_dark.xml
new file mode 100644
index 0000000000..e8bfee57c4
--- /dev/null
+++ b/res/drawable/import_export_item_background_dark.xml
@@ -0,0 +1,19 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
diff --git a/res/drawable/import_export_item_background_light.xml b/res/drawable/import_export_item_background_light.xml
new file mode 100644
index 0000000000..906c055c5e
--- /dev/null
+++ b/res/drawable/import_export_item_background_light.xml
@@ -0,0 +1,19 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
diff --git a/res/layout/export_fragment.xml b/res/layout/export_fragment.xml
index 38dff972cf..80049204a5 100644
--- a/res/layout/export_fragment.xml
+++ b/res/layout/export_fragment.xml
@@ -2,7 +2,6 @@
@@ -11,8 +10,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
- android:padding="8dip"
- android:background="#ffeaeaea">
+ android:padding="8dip">