diff --git a/res/drawable-xhdpi/background_hd_dark.jpg b/res/drawable-xhdpi/background_hd_dark.jpg
new file mode 100644
index 000000000..48ba9cbd0
Binary files /dev/null and b/res/drawable-xhdpi/background_hd_dark.jpg differ
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 80e5b8e47..580382f24 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -753,6 +753,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       Drawable image = Drawable.createFromPath(backgroundImagePath);
       getWindow().setBackgroundDrawable(image);
     }
+    else if(dynamicTheme.isDarkTheme(this)) {
+      getWindow().setBackgroundDrawableResource(R.drawable.background_hd_dark);
+    }
     else if(!dynamicTheme.isDarkTheme(this)) {
       getWindow().setBackgroundDrawableResource(R.drawable.background_hd);
     }
diff --git a/src/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java b/src/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
index 529e55b93..5ff8d49e0 100644
--- a/src/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
+++ b/src/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
@@ -169,8 +169,8 @@ public class ChatBackgroundActivity extends PassphraseRequiredActionBarActivity
 
     private void setDefaultLayoutBackgroundImage() {
         if(dynamicTheme.isDarkTheme(this)) {
-            preview.setImageDrawable(null);
-            preview.setBackgroundColor(Color.BLACK);
+            Drawable image = getResources().getDrawable(R.drawable.background_hd_dark);
+            preview.setImageDrawable(image);
         }
         else {
             Drawable image = getResources().getDrawable(R.drawable.background_hd);