diff --git a/res/drawable-hdpi/ic_clear_white_24dp.png b/res/drawable-hdpi/ic_clear_white_24dp.png
new file mode 100644
index 0000000000..0fd15563a2
Binary files /dev/null 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
new file mode 100644
index 0000000000..e80681aeb7
Binary files /dev/null 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
new file mode 100644
index 0000000000..76e07f0970
Binary files /dev/null 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
new file mode 100644
index 0000000000..f54f4f9d11
Binary files /dev/null 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
new file mode 100644
index 0000000000..7b2a480a02
Binary files /dev/null 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
new file mode 100644
index 0000000000..2b799c02db
--- /dev/null
+++ b/res/drawable/conversation_attachment_close_circle.xml
@@ -0,0 +1,21 @@
+<?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"/>
+            <solid android:color="@color/textsecure_primary_dark"/>
+            <stroke android:color="@android:color/transparent"
+                    android:width="3dp"/>
+        </shape>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/ic_clear_white_24dp"
+                android:gravity="center" />
+    </item>
+</layer-list>
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 27e8c839e1..59d5ff1083 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:orientation="vertical">
 
     <RelativeLayout
             android:id="@+id/layout_container"
@@ -28,35 +29,34 @@
             <ScrollView android:layout_width="fill_parent"
                         android:layout_height="0dp"
                         android:layout_weight="1">
-                <LinearLayout
+                <FrameLayout
                         android:id="@+id/attachment_editor"
-                        android:layout_width="fill_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
+                        android:layout_gravity="center_horizontal"
                         android:visibility="gone">
 
-                    <org.thoughtcrime.securesms.components.ThumbnailView
-                            android:id="@+id/attachment_thumbnail"
-                            android:layout_width="0dp"
-                            android:layout_height="150dip"
-                            android:layout_weight="1"
-                            android:contentDescription="@string/conversation_activity__attachment_thumbnail"/>
+                    <FrameLayout
+                            android:paddingLeft="10dp"
+                            android:paddingTop="10dp"
+                            android:layout_width="fill_parent"
+                            android:layout_height="fill_parent">
 
-                    <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="wrap_content"
-                            android:layout_height="fill_parent"
-                            android:gravity="center_vertical">
+                        <org.thoughtcrime.securesms.components.ThumbnailView
+                                android:id="@+id/attachment_thumbnail"
+                                android:layout_width="wrap_content"
+                                android:layout_height="150dip"
+                                app:riv_corner_radius="3dp"
+                                android:contentDescription="@string/conversation_activity__attachment_thumbnail"/>
+                    </FrameLayout>
 
-                        <Button
-                                android:id="@+id/remove_image_button"
-                                style="?android:attr/buttonStyleSmall"
-                                android:layout_width="100dip"
-                                android:layout_height="50dip"
-                                android:text="@string/conversation_activity__remove" />
+                    <ImageView android:id="@+id/remove_image_button"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:src="@drawable/conversation_attachment_close_circle"
+                               android:layout_gravity="top|left"/>
 
-                    </LinearLayout>
-               </LinearLayout>
+               </FrameLayout>
             </ScrollView>
 
             <View android:layout_width="match_parent"
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 2c48461def..f1dc5871a2 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -26,7 +26,12 @@ import android.provider.ContactsContract;
 import android.provider.MediaStore;
 import android.util.Log;
 import android.view.View;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.ScaleAnimation;
 import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.R;
@@ -42,7 +47,7 @@ public class AttachmentManager {
   private final Context            context;
   private final View               attachmentView;
   private final ThumbnailView      thumbnail;
-  private final Button             removeButton;
+  private final ImageView          removeButton;
   private final SlideDeck          slideDeck;
   private final AttachmentListener attachmentListener;
 
@@ -51,7 +56,7 @@ public class AttachmentManager {
   public AttachmentManager(Activity view, AttachmentListener listener) {
     this.attachmentView     = view.findViewById(R.id.attachment_editor);
     this.thumbnail          = (ThumbnailView)view.findViewById(R.id.attachment_thumbnail);
-    this.removeButton       = (Button)view.findViewById(R.id.remove_image_button);
+    this.removeButton       = (ImageView)view.findViewById(R.id.remove_image_button);
     this.slideDeck          = new SlideDeck();
     this.context            = view;
     this.attachmentListener = listener;
@@ -60,9 +65,28 @@ public class AttachmentManager {
   }
 
   public void clear() {
-    slideDeck.clear();
-    attachmentView.setVisibility(View.GONE);
-    attachmentListener.onAttachmentChanged();
+    AlphaAnimation animation = new AlphaAnimation(1.0f, 0.0f);
+    animation.setDuration(200);
+    animation.setAnimationListener(new Animation.AnimationListener() {
+      @Override
+      public void onAnimationStart(Animation animation) {
+
+      }
+
+      @Override
+      public void onAnimationEnd(Animation animation) {
+        slideDeck.clear();
+        attachmentView.setVisibility(View.GONE);
+        attachmentListener.onAttachmentChanged();
+      }
+
+      @Override
+      public void onAnimationRepeat(Animation animation) {
+
+      }
+    });
+
+    attachmentView.startAnimation(animation);
   }
 
   public void cleanup() {