diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 14acf17963..250901350a 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -12,13 +12,11 @@
         android:id="@+id/quick_attachment_drawer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="@color/black">
+        android:orientation="vertical">
 
     <LinearLayout android:layout_width="match_parent"
                   android:layout_height="match_parent"
                   android:orientation="vertical"
-                  android:background="?conversation_background"
                   android:paddingTop="?attr/actionBarSize"
                   android:gravity="bottom">
 
@@ -28,16 +26,18 @@
                      android:layout_weight="1" />
 
         <FrameLayout android:id="@+id/attachment_editor"
-                     android:layout_width="wrap_content"
+                     android:layout_width="match_parent"
                      android:layout_height="wrap_content"
-                     android:layout_gravity="center_horizontal"
+                     android:gravity="center_horizontal"
                      android:paddingTop="10dp"
+                     android:background="?android:windowBackground"
                      android:visibility="gone">
 
             <org.thoughtcrime.securesms.components.ThumbnailView
                 android:id="@+id/attachment_thumbnail"
                 android:layout_width="230dp"
                 android:layout_height="150dp"
+                android:layout_gravity="center_horizontal"
                 android:contentDescription="@string/conversation_activity__attachment_thumbnail"
                 app:backgroundColorHint="?conversation_background" />
 
@@ -45,7 +45,8 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:src="@drawable/conversation_attachment_close_circle"
-                       android:layout_gravity="top|left"/>
+                       android:layout_marginRight="115dp"
+                       android:layout_gravity="top|center_horizontal"/>
 
         </FrameLayout>
 
@@ -55,6 +56,7 @@
                       android:gravity="center_vertical"
                       android:orientation="horizontal"
                       android:clickable="true"
+                      android:background="?android:windowBackground"
                       android:padding="5dp">
 
             <LinearLayout android:id="@+id/compose_bubble"
@@ -135,6 +137,7 @@
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:visibility="gone"
+                  android:background="?android:windowBackground"
                   android:text="160/160 (1)" />
 
 
diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index dae0be1cd2..8cd2df13d6 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -17,7 +17,6 @@
               android:fadingEdge="none"
               android:divider="@android:color/transparent"
               android:dividerHeight="0dp"
-              android:layout_marginBottom="1dip"
               android:cacheColorHint="?conversation_background" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/emoji_drawer.xml b/res/layout/emoji_drawer.xml
index 09afc8ef67..71984493dc 100644
--- a/res/layout/emoji_drawer.xml
+++ b/res/layout/emoji_drawer.xml
@@ -40,7 +40,6 @@
             android:id="@+id/emoji_pager"
             android:visibility="visible"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?emoji_background" />
+            android:layout_height="match_parent" />
 
 </merge>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 43a2617b7a..e2c4394ab2 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -76,7 +76,7 @@
         <item name="colorPrimary">@color/textsecure_primary</item>
         <item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
         <item name="colorAccent">@color/textsecure_primary_dark</item>
-        <item name="android:windowBackground">@color/white</item>
+        <item name="android:windowBackground">@color/gray5</item>
         <!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>-->
         <item name="conversation_list_item_background_selected">@drawable/list_selected_holo_light</item>
         <item name="conversation_list_item_count_color">#66333333</item>
@@ -111,7 +111,6 @@
         <item name="emoji_tab_indicator">#66555555</item>
         <item name="emoji_tab_underline">#44555555</item>
         <item name="emoji_tab_seperator">@color/gray20</item>
-        <item name="emoji_background">@color/gray5</item>
         <item name="emoji_text_color">@color/black</item>
 
         <item name="emoji_category_recent">@drawable/emoji_category_recent_light</item>
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 2cd4bfd632..f7e1a95b64 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -49,7 +49,6 @@ import com.melnykov.fab.FloatingActionButton;
 
 import org.thoughtcrime.securesms.ConversationListAdapter.ItemClickListener;
 import org.thoughtcrime.securesms.components.DefaultSmsReminder;
-import org.thoughtcrime.securesms.components.DividerItemDecoration;
 import org.thoughtcrime.securesms.components.ExpiredBuildReminder;
 import org.thoughtcrime.securesms.components.PushRegistrationReminder;
 import org.thoughtcrime.securesms.components.Reminder;
@@ -92,7 +91,6 @@ public class ConversationListFragment extends Fragment
     fab          = (FloatingActionButton) view.findViewById(R.id.fab);
     list.setHasFixedSize(true);
     list.setLayoutManager(new LinearLayoutManager(getActivity()));
-    list.addItemDecoration(new DividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL, R.attr.conversation_list_item_divider));
     return view;
   }
 
diff --git a/src/org/thoughtcrime/securesms/components/DividerItemDecoration.java b/src/org/thoughtcrime/securesms/components/DividerItemDecoration.java
deleted file mode 100644
index a28727e5e9..0000000000
--- a/src/org/thoughtcrime/securesms/components/DividerItemDecoration.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thoughtcrime.securesms.components;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.AttrRes;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-public class DividerItemDecoration extends RecyclerView.ItemDecoration {
-
-  private static final int DEFAULT_ATTR = android.R.attr.listDivider;
-
-  private Drawable mDivider;
-  private int      mOrientation;
-
-  public DividerItemDecoration(Context context, int orientation) {
-    this(context, orientation, DEFAULT_ATTR);
-  }
-
-  public DividerItemDecoration(Context context, int orientation, @AttrRes int attr) {
-    final TypedArray a = context.obtainStyledAttributes(new int[]{attr});
-    mDivider = a.getDrawable(0);
-    a.recycle();
-    setOrientation(orientation);
-  }
-
-  public void setOrientation(int orientation) {
-    if (orientation != LinearLayoutManager.HORIZONTAL && orientation != LinearLayoutManager.VERTICAL) {
-      throw new IllegalArgumentException("invalid orientation");
-    }
-    mOrientation = orientation;
-  }
-
-  @Override
-  public void onDraw(Canvas c, RecyclerView parent) {
-    if (mOrientation == LinearLayoutManager.VERTICAL) {
-      drawVertical(c, parent);
-    } else {
-      drawHorizontal(c, parent);
-    }
-  }
-
-  public void drawVertical(Canvas c, RecyclerView parent) {
-    final int left = parent.getPaddingLeft();
-    final int right = parent.getWidth() - parent.getPaddingRight();
-
-    final int childCount = parent.getChildCount();
-    for (int i = 0; i < childCount; i++) {
-      final View child = parent.getChildAt(i);
-      final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
-          .getLayoutParams();
-      final int top = child.getBottom() + params.bottomMargin;
-      final int bottom = top + mDivider.getIntrinsicHeight();
-      mDivider.setBounds(left, top, right, bottom);
-      mDivider.draw(c);
-    }
-  }
-
-  public void drawHorizontal(Canvas c, RecyclerView parent) {
-    final int top = parent.getPaddingTop();
-    final int bottom = parent.getHeight() - parent.getPaddingBottom();
-
-    final int childCount = parent.getChildCount();
-    for (int i = 0; i < childCount; i++) {
-      final View child = parent.getChildAt(i);
-      final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
-          .getLayoutParams();
-      final int left = child.getRight() + params.rightMargin;
-      final int right = left + mDivider.getIntrinsicHeight();
-      mDivider.setBounds(left, top, right, bottom);
-      mDivider.draw(c);
-    }
-  }
-
-  @Override
-  public void getItemOffsets(Rect outRect, int itemPosition, RecyclerView parent) {
-    if (mOrientation == LinearLayoutManager.VERTICAL) {
-      outRect.set(0, 0, 0, mDivider.getIntrinsicHeight());
-    } else {
-      outRect.set(0, 0, mDivider.getIntrinsicWidth(), 0);
-    }
-  }
-}
diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraView.java b/src/org/thoughtcrime/securesms/components/camera/CameraView.java
index d83d776353..194a46091e 100644
--- a/src/org/thoughtcrime/securesms/components/camera/CameraView.java
+++ b/src/org/thoughtcrime/securesms/components/camera/CameraView.java
@@ -19,6 +19,7 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
+import android.graphics.Color;
 import android.hardware.Camera;
 import android.hardware.Camera.PreviewCallback;
 import android.os.Build;
@@ -68,6 +69,7 @@ public class CameraView extends FrameLayout {
 
   public CameraView(Context context, AttributeSet attrs, int defStyle) {
     super(context, attrs, defStyle);
+    setBackgroundColor(Color.BLACK);
 
     onOrientationChange = new OnOrientationChange(context.getApplicationContext());
   }
diff --git a/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java b/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java
index c3ce1f00fc..d62e272d70 100644
--- a/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java
+++ b/src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java
@@ -78,6 +78,8 @@ public class QuickAttachmentDrawer extends ViewGroup implements InputView {
     updateControlsView();
 
     coverViewPosition = getChildCount();
+    controls.setVisibility(GONE);
+    quickCamera.setVisibility(GONE);
   }
 
   public static boolean isDeviceSupported(Context context) {
@@ -271,8 +273,8 @@ public class QuickAttachmentDrawer extends ViewGroup implements InputView {
 
     if (slideOffset == 0 && quickCamera.isStarted()) {
       quickCamera.onPause();
-      controls.setVisibility(INVISIBLE);
-      quickCamera.setVisibility(INVISIBLE);
+      controls.setVisibility(GONE);
+      quickCamera.setVisibility(GONE);
     } else if (slideOffset != 0 && !quickCamera.isStarted() & !paused) {
       controls.setVisibility(VISIBLE);
       quickCamera.setVisibility(VISIBLE);