diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index a5688f0b2..ed93b8a0d 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent" android:layout_width="match_parent">
-    <ImageView
-        android:id="@+id/background_imageview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"/>
     <org.thoughtcrime.securesms.components.InputAwareLayout
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index aabcd0dba..f6819c62f 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -15,7 +15,7 @@
         android:paddingBottom="6dp"
         android:clipChildren="false"
         android:clipToPadding="false"
-        android:background="?emoji_tab_strip_background">
+        android:background="?attr/colorBackgroundFloating">
 
     <FrameLayout
         android:layout_width="0dp"
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 28e32c238..dee602fb3 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -219,7 +219,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   protected HidingLinearLayout     quickAttachmentToggle;
   private   QuickAttachmentDrawer  quickAttachmentDrawer;
   private   InputPanel             inputPanel;
-  private   ImageView              imageView;
 
   private Recipient  recipient;
   private ApplicationDcContext dcContext;
@@ -810,7 +809,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     quickAttachmentDrawer = ViewUtil.findById(this, R.id.quick_attachment_drawer);
     quickAttachmentToggle = ViewUtil.findById(this, R.id.quick_attachment_toggle);
     inputPanel            = ViewUtil.findById(this, R.id.bottom_panel);
-    imageView             = ViewUtil.findById(this, R.id.background_imageview);
 
     ImageButton quickCameraToggle = ViewUtil.findById(this, R.id.quick_camera_toggle);
 
@@ -857,7 +855,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     String backgroundImagePath = TextSecurePreferences.getBackgroundImagePath(this);
     Drawable image = Drawable.createFromPath(backgroundImagePath);
-    imageView.setImageDrawable(image);
+    getWindow().setBackgroundDrawable(image);
   }
 
   protected void initializeActionBar() {