diff --git a/res/drawable-hdpi/card.9.png b/res/drawable-hdpi/card.9.png
deleted file mode 100644
index b306db67c..000000000
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 160ff08a0..000000000
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 000000000..cd4f04aa1
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 000000000..de5029591
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 f6dd4cdf1..000000000
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 000000000..70eb07378
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 000000000..9a9e5706f
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 65d643c89..000000000
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 000000000..d2cfdf1f6
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 000000000..fa4d2c14d
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 b306db67c..000000000
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 bd3e4f1d8..000000000
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 000000000..1127f87f7
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 000000000..3a4a1586e
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 6c8e6777f..000000000
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 000000000..70eb07378
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 000000000..9a9e5706f
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 1b83a7f20..000000000
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 000000000..dac4cb9fc
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 000000000..d239cfa09
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 bd540900c..000000000
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 ad3bf14fb..000000000
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 000000000..ad8d91a99
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 000000000..2a166945a
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 a9a6c0a2c..000000000
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 000000000..70eb07378
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 000000000..9a9e5706f
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 e98681550..000000000
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 000000000..ace0bef32
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 000000000..e9e92e5f8
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 000000000..0e52c7c75
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 000000000..a7caa2db8
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 000000000..70eb07378
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 000000000..9a9e5706f
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 000000000..424509055
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 000000000..9102f25df
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 23b7c7f83..000000000
--- a/res/drawable/clickable_card.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape>
-            <solid android:color="@color/touch_highlight" />
-        </shape>
-        <bitmap android:src="@drawable/card" />
-    </item>
-    <item android:drawable="@drawable/card" />
-</selector>
\ 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 000000000..567ce86c3
--- /dev/null
+++ b/res/drawable/clickable_card_dark.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/import_export_touch_highlight_dark" />
+        </shape>
+        <layer-list android:src="@drawable/import_export_item_background_dark" />
+    </item>
+    <item android:drawable="@drawable/import_export_item_background_dark" />
+</selector>
diff --git a/res/drawable/clickable_card_light.xml b/res/drawable/clickable_card_light.xml
new file mode 100644
index 000000000..68374a0b8
--- /dev/null
+++ b/res/drawable/clickable_card_light.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/import_export_touch_highlight_light" />
+        </shape>
+        <layer-list android:src="@drawable/import_export_item_background_light" />
+    </item>
+    <item android:drawable="@drawable/import_export_item_background_light" />
+</selector>
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 000000000..5f2de2d75
--- /dev/null
+++ b/res/drawable/import_export_item_background_dark.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/import_export_item_background_shadow_dark" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
+        <shape>
+            <solid android:color="@color/import_export_item_background_dark" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+</layer-list>
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 000000000..97c2b3ee3
--- /dev/null
+++ b/res/drawable/import_export_item_background_light.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/import_export_item_background_shadow_light" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+    <item android:bottom="@dimen/conversation_item_drop_shadow_dist">
+        <shape>
+            <solid android:color="@color/import_export_item_background_light" />
+            <corners android:radius="@dimen/conversation_item_corner_radius" />
+        </shape>
+    </item>
+
+</layer-list>
diff --git a/res/layout/export_fragment.xml b/res/layout/export_fragment.xml
index 38dff972c..b16a0a822 100644
--- a/res/layout/export_fragment.xml
+++ b/res/layout/export_fragment.xml
@@ -2,7 +2,6 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="#ffeaeaea"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical">
 
@@ -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">
 
 
         <!--LinearLayout android:id="@+id/export_encrypted_backup"
@@ -20,7 +18,7 @@
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:layout_marginTop="10dip"
-                      android:background="@drawable/clickable_card"
+                      android:background="@drawable/clickable_card_light"
                       android:orientation="vertical">
 
             <LinearLayout android:orientation="horizontal"
@@ -61,7 +59,7 @@
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:layout_marginTop="10dip"
-                      android:background="@drawable/clickable_card"
+                      android:background="?import_export_item_card_background"
                       android:orientation="vertical">
 
             <LinearLayout android:orientation="horizontal"
@@ -76,7 +74,7 @@
                 <ImageView android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_marginRight="10dip"
-                           android:src="@drawable/plaintext_backup"/>
+                           android:src="?plaintext_backup"/>
 
                 <LinearLayout android:orientation="vertical"
                               android:layout_width="wrap_content"
diff --git a/res/layout/import_fragment.xml b/res/layout/import_fragment.xml
index f405a2948..d473f95f1 100644
--- a/res/layout/import_fragment.xml
+++ b/res/layout/import_fragment.xml
@@ -2,7 +2,6 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="#ffeaeaea"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical">
 
@@ -11,14 +10,13 @@
               android:layout_height="wrap_content"
               android:gravity="center_vertical"
               android:layout_gravity="center_vertical"
-              android:padding="8dip"
-              android:background="#ffeaeaea">
+              android:padding="8dip">
 
     <LinearLayout android:id="@+id/import_sms"
                   android:clickable="true"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:background="@drawable/clickable_card"
+                  android:background="?import_export_item_card_background"
                   android:orientation="vertical">
 
         <LinearLayout android:orientation="horizontal"
@@ -33,7 +31,7 @@
             <ImageView android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginRight="10dip"
-                       android:src="@drawable/stock_sms"/>
+                       android:src="?stock_sms"/>
 
             <LinearLayout android:orientation="vertical"
                           android:layout_width="wrap_content"
@@ -58,7 +56,7 @@
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:layout_marginTop="10dip"
-                  android:background="@drawable/clickable_card"
+                  android:background="?import_export_item_card_background"
                   android:orientation="vertical">
 
         <LinearLayout android:orientation="horizontal"
@@ -73,7 +71,7 @@
             <ImageView android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginRight="10dip"
-                       android:src="@drawable/encrypted_backup"/>
+                       android:src="?encrypted_backup"/>
 
             <LinearLayout android:orientation="vertical"
                           android:layout_width="wrap_content"
@@ -99,7 +97,7 @@
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:layout_marginTop="10dip"
-                  android:background="@drawable/clickable_card"
+                  android:background="?import_export_item_card_background"
                   android:orientation="vertical">
 
         <LinearLayout android:orientation="horizontal"
@@ -114,7 +112,7 @@
             <ImageView android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginRight="10dip"
-                       android:src="@drawable/plaintext_backup"/>
+                       android:src="?plaintext_backup"/>
 
             <LinearLayout android:orientation="vertical"
                           android:layout_width="wrap_content"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 8ad1b43a6..c66c8dc3e 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -54,6 +54,13 @@
     <attr name="contact_selection_label_text" format="reference|color" />
     <attr name="conversation_selection_header_text" format="reference|color" />
 
+    <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="encrypted_backup" format="reference" />
+    <attr name="plaintext_backup" format="reference" />
+
     <attr name="reminder_header_background" format="color"/>
 
     <attr name="menu_new_conversation_icon" format="reference" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index bc847446a..f6f4a2e29 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -39,6 +39,12 @@
     <color name="conversation_item_received_background_dark">#ff333333</color>
     <color name="conversation_item_received_shadow_light">#ffd5d5d5</color>
     <color name="conversation_item_received_shadow_dark">#ff222222</color>
+    <color name="import_export_item_background_light">#ffeeeeee</color>
+    <color name="import_export_item_background_dark">#ff333333</color>
+    <color name="import_export_item_background_shadow_light">#ffd5d5d5</color>
+    <color name="import_export_item_background_shadow_dark">#ff222222</color>
+    <color name="import_export_touch_highlight_light">#400099cc</color>
+    <color name="import_export_touch_highlight_dark">#40ffffff</color>
 
     <color name="emoji_tab_indicator">#66ffffff</color>
     <color name="emoji_tab_underline">#11ffffff</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bc53a0f72..8c2e5ee81 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -38,6 +38,18 @@
         <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
     </style>
 
+    <style name="TextSecure.DarkActionBar.TabBar"
+        parent="@style/Widget.AppCompat.ActionBar.TabBar">
+        <item name="background">@color/gray95</item>
+        <item name="android:background">@color/gray95</item>
+    </style>
+
+    <style name="TextSecure.LightActionBar.TabBar"
+        parent="@style/Widget.AppCompat.ActionBar.TabBar">
+        <item name="android:background">@color/gray5</item>
+        <item name="background">@color/gray5</item>
+    </style>
+
     <style name="TextSecure.ClearTitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">@android:color/transparent</item>
     </style>
@@ -82,7 +94,6 @@
         <item name="android:textSize">16.0sp</item>
         <item name="android:typeface">sans</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:textColor">#ff333333</item>
         <item name="android:gravity">left</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:shadowColor">#ffffff</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 919446e66..6ec9fca6e 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -11,6 +11,7 @@
         <item name="android:logo">@drawable/actionbar_icon_holo_light</item>
         <item name="android:actionBarStyle">@style/TextSecure.LightActionBar</item>
         <item name="actionBarStyle">@style/TextSecure.LightActionBar</item>
+        <item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
         <item name="android:textColor">@color/text_color_light_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light_theme</item>
         <item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_light</item>
@@ -65,6 +66,13 @@
         <item name="conversation_item_sent_push_pending_background">@drawable/conversation_item_sent_push_pending_shape</item>
         <item name="conversation_item_sent_push_pending_triangle_background">@drawable/conversation_item_sent_push_pending_triangle_shape</item>
 
+        <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="menu_new_conversation_icon">@drawable/ic_action_new_holo_light</item>
         <item name="menu_new_group_icon">@drawable/ic_action_add_group_holo_light</item>
         <item name="menu_group_icon">@drawable/ic_menu_groups_holo_light</item>
@@ -92,6 +100,7 @@
 
         <item name="android:actionBarStyle">@style/TextSecure.DarkActionBar</item>
         <item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
+        <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
         <item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_dark</item>
@@ -131,6 +140,13 @@
         <item name="conversation_item_sent_push_pending_background">@drawable/conversation_item_sent_push_pending_shape_dark</item>
         <item name="conversation_item_sent_push_pending_triangle_background">@drawable/conversation_item_sent_push_pending_triangle_shape_dark</item>
 
+        <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="actionbar_icon">@drawable/actionbar_icon_holo_dark</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
 
diff --git a/src/org/thoughtcrime/securesms/ImportExportActivity.java b/src/org/thoughtcrime/securesms/ImportExportActivity.java
index 7c96655b1..7f4fee383 100644
--- a/src/org/thoughtcrime/securesms/ImportExportActivity.java
+++ b/src/org/thoughtcrime/securesms/ImportExportActivity.java
@@ -10,6 +10,7 @@ import android.support.v7.app.ActionBar;
 import android.view.MenuItem;
 
 import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.util.DynamicTheme;
 
 
 public class ImportExportActivity extends PassphraseRequiredActionBarActivity {
@@ -18,8 +19,11 @@ public class ImportExportActivity extends PassphraseRequiredActionBarActivity {
   private ViewPager viewPager;
   private MasterSecret masterSecret;
 
+  private DynamicTheme dynamicTheme = new DynamicTheme();
+
   @Override
   public void onCreate(Bundle savedInstanceState) {
+    dynamicTheme.onCreate(this);
     super.onCreate(savedInstanceState);
     setContentView(R.layout.import_export_activity);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -29,6 +33,12 @@ public class ImportExportActivity extends PassphraseRequiredActionBarActivity {
     initializeTabs();
   }
 
+  @Override
+  public void onResume() {
+      dynamicTheme.onResume(this);
+      super.onResume();
+  }
+
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     super.onOptionsItemSelected(item);