diff --git a/res/drawable-hdpi/received_bubble.9.png b/res/drawable-hdpi/received_bubble.9.png
index fb716dcbac..ef8ce1e3d7 100644
Binary files a/res/drawable-hdpi/received_bubble.9.png and b/res/drawable-hdpi/received_bubble.9.png differ
diff --git a/res/drawable-hdpi/sent_bubble.9.png b/res/drawable-hdpi/sent_bubble.9.png
index e5c0b542f8..803d27693b 100644
Binary files a/res/drawable-hdpi/sent_bubble.9.png and b/res/drawable-hdpi/sent_bubble.9.png differ
diff --git a/res/drawable-mdpi/received_bubble.9.png b/res/drawable-mdpi/received_bubble.9.png
index f9806a42d6..178cb588c9 100644
Binary files a/res/drawable-mdpi/received_bubble.9.png and b/res/drawable-mdpi/received_bubble.9.png differ
diff --git a/res/drawable-mdpi/sent_bubble.9.png b/res/drawable-mdpi/sent_bubble.9.png
index 6409e09e52..dcf271c864 100644
Binary files a/res/drawable-mdpi/sent_bubble.9.png and b/res/drawable-mdpi/sent_bubble.9.png differ
diff --git a/res/drawable-xhdpi/received_bubble.9.png b/res/drawable-xhdpi/received_bubble.9.png
index 4fa023312a..76d8de2cf7 100644
Binary files a/res/drawable-xhdpi/received_bubble.9.png and b/res/drawable-xhdpi/received_bubble.9.png differ
diff --git a/res/drawable-xhdpi/sent_bubble.9.png b/res/drawable-xhdpi/sent_bubble.9.png
index 34fa54d504..cbcf0930a8 100644
Binary files a/res/drawable-xhdpi/sent_bubble.9.png and b/res/drawable-xhdpi/sent_bubble.9.png differ
diff --git a/res/drawable-xxhdpi/received_bubble.9.png b/res/drawable-xxhdpi/received_bubble.9.png
index f4042ace78..cb8e72d02a 100644
Binary files a/res/drawable-xxhdpi/received_bubble.9.png and b/res/drawable-xxhdpi/received_bubble.9.png differ
diff --git a/res/drawable-xxhdpi/sent_bubble.9.png b/res/drawable-xxhdpi/sent_bubble.9.png
index ffaface323..2c5716625e 100644
Binary files a/res/drawable-xxhdpi/sent_bubble.9.png and b/res/drawable-xxhdpi/sent_bubble.9.png differ
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 98220bfe0f..9ea1c0be50 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -47,12 +47,8 @@
 
             <org.thoughtcrime.securesms.components.ThumbnailView
                     android:id="@+id/image_view"
-                    android:layout_width="wrap_content"
+                    android:layout_width="@dimen/media_bubble_height"
                     android:layout_height="@dimen/media_bubble_height"
-                    android:layout_marginLeft="4dip"
-                    android:layout_marginTop="4dip"
-                    android:layout_marginRight="4dip"
-                    android:layout_gravity="center"
                     android:scaleType="centerCrop"
                     android:adjustViewBounds="true"
                     android:contentDescription="@string/conversation_item__mms_image_description"
@@ -66,9 +62,8 @@
                     android:id="@+id/conversation_item_body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingTop="5dip"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="?conversation_received_text_primary_color"
                     android:textSize="16sp"
@@ -101,9 +96,8 @@
             <LinearLayout android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:paddingTop="2dip"
-                          android:paddingLeft="8dp"
-                          android:paddingRight="5dp"
-                          android:paddingBottom="5dp"
+                          android:paddingLeft="4dp"
+                          android:paddingRight="4dp"
                           android:orientation="horizontal"
                           android:gravity="left">
 
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index bec59cb68f..6d31d52ce0 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -50,18 +50,16 @@
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:layout_alignParentRight="true"
-                      android:paddingRight="15dip"
-                      android:paddingLeft="5dip"
                       android:layout_marginLeft="50dp"
-                      android:layout_marginRight="12dp"
+                      android:layout_marginRight="5dp"
                       android:background="@drawable/sent_bubble"
                       android:orientation="vertical">
 
             <org.thoughtcrime.securesms.components.ThumbnailView
                     android:id="@+id/image_view"
-                    android:layout_width="wrap_content"
+                    android:layout_width="@dimen/media_bubble_height"
                     android:layout_height="@dimen/media_bubble_height"
-                    android:layout_marginTop="4dip"
+                    android:layout_marginBottom="5dp"
                     android:layout_gravity="center"
                     android:scaleType="centerCrop"
                     android:adjustViewBounds="true"
@@ -77,7 +75,8 @@
                     android:autoLink="all"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingTop="5dip"
+                    android:paddingLeft="4dp"
+                    android:paddingRight="4dp"
                     android:linksClickable="true"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="?conversation_item_sent_text_primary_color"
@@ -111,7 +110,8 @@
             <LinearLayout android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:orientation="horizontal"
-                          android:paddingTop="0dip"
+                          android:paddingLeft="4dp"
+                          android:paddingRight="4dp"
                           android:layout_gravity="right">
 
                 <TextView android:id="@+id/group_message_status"
@@ -137,7 +137,6 @@
                           android:textColor="?conversation_item_sent_text_secondary_color"
                           android:textSize="@dimen/conversation_item_date_text_size"
                           android:paddingTop="1dip"
-                          android:paddingBottom="5dp"
                           tools:text="30 mins" />
 
                 <FrameLayout android:id="@+id/pending_indicator_stub"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 3c7fc3d7ce..fc33a7e24e 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="TextSecure.LightNoActionBar" parent="@style/Theme.AppCompat.Light.NoActionBar">
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index d22b80b5c9..827bc62d95 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -191,7 +191,7 @@ public class ConversationItem extends LinearLayout {
     int[]      attributes = new int[]{R.attr.conversation_item_bubble_background};
     TypedArray colors     = context.obtainStyledAttributes(attributes);
 
-    bodyBubble.getBackground().setColorFilter(colors.getColor(0, 0xFFFFFF), PorterDuff.Mode.SRC_ATOP);
+    bodyBubble.getBackground().setColorFilter(colors.getColor(0, 0xFFFFFFFF), PorterDuff.Mode.MULTIPLY);
 
     colors.recycle();
   }
diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index bf3a875b83..3f58cf7ac4 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -99,13 +99,6 @@ public class ThumbnailView extends RoundedImageView {
     if (isContextValid()) Glide.clear(this);
   }
 
-  @Override
-  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    View dv = ((Activity) this.getContext()).getWindow().getDecorView();
-    int size = Math.min(dv.getWidth(), dv.getHeight()) * 55 / 100;
-    setMeasuredDimension(size, size);
-  }
-
   @TargetApi(VERSION_CODES.JELLY_BEAN_MR1)
   private boolean isContextValid() {
     return !(getContext() instanceof Activity)            ||