diff --git a/res/drawable-hdpi/ic_attach_file_dark.png b/res/drawable-hdpi/ic_attach_file_dark.png
deleted file mode 100644
index bd61803f9..000000000
Binary files a/res/drawable-hdpi/ic_attach_file_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_attach_file_light.png b/res/drawable-hdpi/ic_attach_file_light.png
deleted file mode 100644
index 8fa4b1bed..000000000
Binary files a/res/drawable-hdpi/ic_attach_file_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_attach_file_dark.png b/res/drawable-mdpi/ic_attach_file_dark.png
deleted file mode 100644
index 39da9ef3a..000000000
Binary files a/res/drawable-mdpi/ic_attach_file_dark.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_attach_file_light.png b/res/drawable-mdpi/ic_attach_file_light.png
deleted file mode 100644
index 3facb8a50..000000000
Binary files a/res/drawable-mdpi/ic_attach_file_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_attach_file_dark.png b/res/drawable-xhdpi/ic_attach_file_dark.png
deleted file mode 100644
index 354e50583..000000000
Binary files a/res/drawable-xhdpi/ic_attach_file_dark.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_attach_file_light.png b/res/drawable-xhdpi/ic_attach_file_light.png
deleted file mode 100644
index b6d1e9673..000000000
Binary files a/res/drawable-xhdpi/ic_attach_file_light.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_attach_file_dark.png b/res/drawable-xxhdpi/ic_attach_file_dark.png
deleted file mode 100644
index 72820e311..000000000
Binary files a/res/drawable-xxhdpi/ic_attach_file_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_attach_file_light.png b/res/drawable-xxhdpi/ic_attach_file_light.png
deleted file mode 100644
index 67613cc6e..000000000
Binary files a/res/drawable-xxhdpi/ic_attach_file_light.png and /dev/null differ
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index fba2a92c8..00c61f7d1 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -32,7 +32,6 @@
     <attr name="conversation_transport_popup_background" format="reference"/>
     <attr name="conversation_emoji_toggle" format="reference"/>
     <attr name="conversation_keyboard_toggle" format="reference"/>
-    <attr name="conversation_attach_file" format="reference"/>
     <attr name="conversation_attach_image" format="reference"/>
     <attr name="conversation_attach_video" format="reference"/>
     <attr name="conversation_attach_sound" format="reference"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 70672c03e..f528fbc27 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -48,7 +48,6 @@
         <item name="conversation_transport_popup_background">@color/white</item>
         <item name="conversation_emoji_toggle">@drawable/ic_mood_grey600_24dp</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_grey600_24dp</item>
-        <item name="conversation_attach_file">@drawable/ic_attach_file_light</item>
         <item name="conversation_attach_image">@drawable/ic_image_light</item>
         <item name="conversation_attach_video">@drawable/ic_movie_creation_light</item>
         <item name="conversation_attach_sound">@drawable/ic_volume_up_light</item>
@@ -185,7 +184,6 @@
         <item name="conversation_transport_popup_background">@color/black</item>
         <item name="conversation_emoji_toggle">@drawable/ic_mood_white_24dp</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_keyboard_white_24dp</item>
-        <item name="conversation_attach_file">@drawable/ic_attach_file_dark</item>
         <item name="conversation_attach_image">@drawable/ic_image_dark</item>
         <item name="conversation_attach_video">@drawable/ic_movie_creation_dark</item>
         <item name="conversation_attach_sound">@drawable/ic_volume_up_dark</item>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 11ddd2618..296631d60 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -533,11 +533,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void handleAddAttachment() {
     if (this.isMmsEnabled || DirectoryHelper.isPushDestination(this, getRecipients())) {
-      AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(this);
-      builder.setIconAttribute(R.attr.conversation_attach_file);
-      builder.setTitle(R.string.ConversationActivity_add_attachment);
-      builder.setAdapter(attachmentAdapter, new AttachmentTypeListener());
-      builder.show();
+      new AlertDialogWrapper.Builder(this).setAdapter(attachmentAdapter, new AttachmentTypeListener())
+                                          .show();
     } else {
       handleManualMmsRequired();
     }