diff --git a/res/drawable-hdpi/ic_clear_white_24dp.png b/res/drawable-hdpi/ic_clear_white_24dp.png
index 0fd15563a2..a33d87a911 100644
Binary files a/res/drawable-hdpi/ic_clear_white_24dp.png and b/res/drawable-hdpi/ic_clear_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_clear_white_24dp.png b/res/drawable-mdpi/ic_clear_white_24dp.png
index e80681aeb7..00b0f17dfc 100644
Binary files a/res/drawable-mdpi/ic_clear_white_24dp.png and b/res/drawable-mdpi/ic_clear_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_clear_white_24dp.png b/res/drawable-xhdpi/ic_clear_white_24dp.png
index 76e07f0970..c0d62194e0 100644
Binary files a/res/drawable-xhdpi/ic_clear_white_24dp.png and b/res/drawable-xhdpi/ic_clear_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_clear_white_24dp.png b/res/drawable-xxhdpi/ic_clear_white_24dp.png
index f54f4f9d11..85424b8f63 100644
Binary files a/res/drawable-xxhdpi/ic_clear_white_24dp.png and b/res/drawable-xxhdpi/ic_clear_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_clear_white_24dp.png b/res/drawable-xxxhdpi/ic_clear_white_24dp.png
index 7b2a480a02..583f52c74c 100644
Binary files a/res/drawable-xxxhdpi/ic_clear_white_24dp.png and b/res/drawable-xxxhdpi/ic_clear_white_24dp.png differ
diff --git a/res/drawable/conversation_attachment_close_circle.xml b/res/drawable/conversation_attachment_close_circle.xml
index 6231cb8fb3..86741f86e3 100644
--- a/res/drawable/conversation_attachment_close_circle.xml
+++ b/res/drawable/conversation_attachment_close_circle.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:height="24dp" android:width="24dp"/>
-            <solid android:color="@color/white"/>
-        </shape>
-    </item>
     <item>
         <shape android:shape="oval">
             <size android:height="21dp" android:width="21dp"/>
diff --git a/res/layout/thumbnail_view.xml b/res/layout/thumbnail_view.xml
index 58b8325d10..e11b923267 100644
--- a/res/layout/thumbnail_view.xml
+++ b/res/layout/thumbnail_view.xml
@@ -6,8 +6,7 @@
                android:layout_height="match_parent"
                android:adjustViewBounds="true"
                android:scaleType="fitCenter"
-               android:contentDescription="@string/conversation_item__mms_image_description"
-               android:layout_margin="@dimen/media_bubble_border_width" />
+               android:contentDescription="@string/conversation_item__mms_image_description" />
 
     <ViewStub android:id="@+id/transfer_controls_stub"
               android:layout_width="70dp"
diff --git a/res/layout/thumbnail_view_remove_button.xml b/res/layout/thumbnail_view_remove_button.xml
index 2ef239b575..9c40b31397 100644
--- a/res/layout/thumbnail_view_remove_button.xml
+++ b/res/layout/thumbnail_view_remove_button.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
            android:id="@+id/remove_image_button"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
+           android:layout_width="@dimen/media_bubble_remove_button_size"
+           android:layout_height="@dimen/media_bubble_remove_button_size"
            android:src="@drawable/conversation_attachment_close_circle" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6fb7404c4e..a4666889bf 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -24,6 +24,7 @@
     <dimen name="message_bubble_shadow_distance">1.5dp</dimen>
     <dimen name="media_bubble_height">210dp</dimen>
     <dimen name="media_bubble_border_width">3dp</dimen>
+    <dimen name="media_bubble_remove_button_size">24dp</dimen>
 
     <integer name="media_overview_cols">3</integer>
     <dimen name="message_details_table_row_pad">10dp</dimen>
diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index 6d647f02fa..33d5f41d30 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -155,6 +155,8 @@ public class ThumbnailView extends FrameLayout {
 
   public void setRemoveClickListener(OnClickListener listener) {
     getRemoveButton().setOnClickListener(listener);
+    final int pad = getResources().getDimensionPixelSize(R.dimen.media_bubble_remove_button_size);
+    image.setPadding(pad, pad, pad, 0);
   }
 
   public void setDownloadClickListener(ThumbnailClickListener listener) {
@@ -324,11 +326,15 @@ public class ThumbnailView extends FrameLayout {
         Log.w(TAG, "onResourceReady() for a Bitmap. Saving.");
         part.setThumbnail(((GlideBitmapDrawable)resource).getBitmap());
       }
-      if (resource.getIntrinsicWidth() < resource.getIntrinsicHeight()) {
-        getRemoveButton().setPadding(0, 0, (getWidth() - resource.getIntrinsicWidth()) / 2, 0);
+      LayoutParams layoutParams = (LayoutParams) getRemoveButton().getLayoutParams();
+      if (resource.getIntrinsicWidth() < getWidth()) {
+        layoutParams.topMargin   = 0;
+        layoutParams.rightMargin = Math.max(0, (getWidth() - image.getPaddingRight() - resource.getIntrinsicWidth()) / 2);
       } else {
-        getRemoveButton().setPadding(0, (getHeight() - resource.getIntrinsicHeight()) / 2, 0, 0);
+        layoutParams.topMargin   = Math.max(0, (getHeight() - image.getPaddingTop() - resource.getIntrinsicHeight()) / 2);
+        layoutParams.rightMargin = 0;
       }
+      getRemoveButton().setLayoutParams(layoutParams);
       return false;
     }
   }