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/res/drawable/conversation_list_divider_shape.xml b/res/drawable/conversation_list_divider_shape.xml
index 726ef9eae..459e9420a 100644
--- a/res/drawable/conversation_list_divider_shape.xml
+++ b/res/drawable/conversation_list_divider_shape.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:left="83dp">
+    <item android:left="0dp">
         <shape android:shape="rectangle">
             <solid android:color="@color/gray12" />
             <size android:height="1px" />
diff --git a/res/drawable/conversation_list_divider_shape_dark.xml b/res/drawable/conversation_list_divider_shape_dark.xml
index 425c92605..0ca1786e2 100644
--- a/res/drawable/conversation_list_divider_shape_dark.xml
+++ b/res/drawable/conversation_list_divider_shape_dark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:left="83dp">
+    <item android:left="0dp">
         <shape android:shape="rectangle">
             <solid android:color="#33ffffff" />
             <size android:height="1px" />
diff --git a/res/layout/activity_select_chat_background.xml b/res/layout/activity_select_chat_background.xml
index 7fe8e662b..9a7b0ada7 100644
--- a/res/layout/activity_select_chat_background.xml
+++ b/res/layout/activity_select_chat_background.xml
@@ -18,26 +18,29 @@
         android:layout_gravity="center">
 
         <Button
-            style="@style/ButtonPrimary"
-            android:background="@color/universal_overlay"
             android:id="@+id/set_default_button"
-            android:layout_gravity="fill_vertical"
+            style="@style/ButtonPrimary"
             android:layout_width="wrap_content"
             android:layout_height="40dp"
+            android:layout_gravity="center_horizontal"
             android:layout_margin="15dp"
+            android:background="@color/universal_overlay"
             android:minWidth="200dp"
-            android:text="Set default" />
+            android:text="@string/pref_background_btn_default"
+            android:textAllCaps="false" />
 
         <Button
-            style="@style/ButtonPrimary"
-            android:background="@color/universal_overlay"
             android:id="@+id/from_gallery_button"
-            android:layout_gravity="fill_vertical"
+            style="@style/ButtonPrimary"
             android:layout_width="wrap_content"
             android:layout_height="40dp"
+            android:layout_gravity="center_horizontal"
             android:layout_margin="15dp"
+            android:background="@color/universal_overlay"
             android:minWidth="200dp"
-            android:text="From gallery" />
+            android:text="@string/pref_background_btn_gallery"
+            android:textAllCaps="false" />
+
     </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index 836c2d2d6..89e8ca79f 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -137,6 +137,6 @@
     <View android:layout_width="match_parent"
           android:layout_height="1dp"
           android:layout_alignParentBottom="true"
-          android:background="@drawable/attachment_selector_shadow"/>
+          android:background="?attr/conversation_list_item_divider"/>
 
 </org.thoughtcrime.securesms.ConversationListItem>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e22e180d8..6d0eb8bc1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -395,6 +395,8 @@
     <string name="pref_managekeys_secret_keys_exported_to_x">Secret keys written successfully to \"%1$s\".</string>
     <string name="pref_managekeys_secret_keys_imported_from_x">Secret keys imported from \"%1$s\".</string>
     <string name="pref_background">Background</string>
+    <string name="pref_background_btn_default">Use default image</string>
+    <string name="pref_background_btn_gallery">Select from gallery</string>
     <string name="pref_imap_folder_handling">IMAP folder handling</string>
     <string name="pref_imap_folder_warn_disable_defaults">If you disable this option, make sure, your server and your other clients are configured accordingly.\n\nOtherwise things may not work at all.</string>
     <string name="pref_watch_inbox_folder">Watch Inbox folder</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 2454f7a34..b6d07b853 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -289,7 +289,7 @@
         <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="fab_color">@color/gray95</item>
+        <item name="fab_color">@color/gray78</item>
         <item name="input_panel_bg_color">@color/gray95</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
 
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 80e5b8e47..d6ba6601a 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -753,7 +753,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       Drawable image = Drawable.createFromPath(backgroundImagePath);
       getWindow().setBackgroundDrawable(image);
     }
-    else if(!dynamicTheme.isDarkTheme(this)) {
+    else if(dynamicTheme.isDarkTheme(this)) {
+      getWindow().setBackgroundDrawableResource(R.drawable.background_hd_dark);
+    }
+    else {
       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);