diff --git a/artwork/ic_contact.svg b/artwork/ic_contact.svg
new file mode 100644
index 0000000000..d3ecca0e19
--- /dev/null
+++ b/artwork/ic_contact.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   sodipodi:docname="ic_contact.svg"
+   inkscape:version="0.91pre3 r13670"
+   x="0px"
+   y="0px"
+   width="48px"
+   height="48px"
+   viewBox="0 0 48 48"
+   enable-background="new 0 0 48 48"
+   xml:space="preserve"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="798"
+     inkscape:window-height="480"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" /><path
+     id="path4"
+     d="M38,6H10c-2.21,0-4,1.79-4,4v28c0,2.21,1.79,4,4,4h28c2.21,0,4-1.79,4-4V10C42,7.79,40.21,6,38,6z M24,12  c3.31,0,6,2.69,6,6c0,3.32-2.69,6-6,6s-6-2.68-6-6C18,14.69,20.69,12,24,12z M36,36H12v-2c0-4,8-6.2,12-6.2S36,30,36,34V36z"
+     style="opacity:1;fill:#000000" /></svg>
\ No newline at end of file
diff --git a/res/drawable-hdpi-v11/ic_attach_file.png b/res/drawable-hdpi-v11/ic_attach_file.png
new file mode 100644
index 0000000000..8fa4b1bedb
Binary files /dev/null and b/res/drawable-hdpi-v11/ic_attach_file.png differ
diff --git a/res/drawable-hdpi-v11/ic_dialog_attach.png b/res/drawable-hdpi-v11/ic_dialog_attach.png
deleted file mode 100644
index 7439169d95..0000000000
Binary files a/res/drawable-hdpi-v11/ic_dialog_attach.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_action_person.png b/res/drawable-hdpi/ic_action_person.png
deleted file mode 100644
index 9fd81097ba..0000000000
Binary files a/res/drawable-hdpi/ic_action_person.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_attach_audio_holo_light.png b/res/drawable-hdpi/ic_attach_audio_holo_light.png
deleted file mode 100644
index 050543a8a9..0000000000
Binary files a/res/drawable-hdpi/ic_attach_audio_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_attach_file.png b/res/drawable-hdpi/ic_attach_file.png
new file mode 100644
index 0000000000..bd61803f92
Binary files /dev/null and b/res/drawable-hdpi/ic_attach_file.png differ
diff --git a/res/drawable-hdpi/ic_attach_picture_holo_light.png b/res/drawable-hdpi/ic_attach_picture_holo_light.png
deleted file mode 100644
index 1b3593422c..0000000000
Binary files a/res/drawable-hdpi/ic_attach_picture_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_attach_video_holo_light.png b/res/drawable-hdpi/ic_attach_video_holo_light.png
deleted file mode 100644
index 3141d5e5af..0000000000
Binary files a/res/drawable-hdpi/ic_attach_video_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_contact.png b/res/drawable-hdpi/ic_contact.png
new file mode 100644
index 0000000000..042b0b8559
Binary files /dev/null and b/res/drawable-hdpi/ic_contact.png differ
diff --git a/res/drawable-hdpi/ic_dialog_attach.png b/res/drawable-hdpi/ic_dialog_attach.png
deleted file mode 100644
index 8a6a887a76..0000000000
Binary files a/res/drawable-hdpi/ic_dialog_attach.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_image.png b/res/drawable-hdpi/ic_image.png
new file mode 100644
index 0000000000..afce95a27b
Binary files /dev/null and b/res/drawable-hdpi/ic_image.png differ
diff --git a/res/drawable-hdpi/ic_movie_creation.png b/res/drawable-hdpi/ic_movie_creation.png
new file mode 100644
index 0000000000..dccabc292f
Binary files /dev/null and b/res/drawable-hdpi/ic_movie_creation.png differ
diff --git a/res/drawable-hdpi/ic_volume_up.png b/res/drawable-hdpi/ic_volume_up.png
new file mode 100644
index 0000000000..b020322df8
Binary files /dev/null and b/res/drawable-hdpi/ic_volume_up.png differ
diff --git a/res/drawable-mdpi-v11/ic_attach_file.png b/res/drawable-mdpi-v11/ic_attach_file.png
new file mode 100644
index 0000000000..3facb8a506
Binary files /dev/null and b/res/drawable-mdpi-v11/ic_attach_file.png differ
diff --git a/res/drawable-mdpi-v11/ic_dialog_attach.png b/res/drawable-mdpi-v11/ic_dialog_attach.png
deleted file mode 100644
index ecdcaabca8..0000000000
Binary files a/res/drawable-mdpi-v11/ic_dialog_attach.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_action_person.png b/res/drawable-mdpi/ic_action_person.png
deleted file mode 100644
index 359da1c124..0000000000
Binary files a/res/drawable-mdpi/ic_action_person.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_attach_audio_holo_light.png b/res/drawable-mdpi/ic_attach_audio_holo_light.png
deleted file mode 100644
index c5fd717aff..0000000000
Binary files a/res/drawable-mdpi/ic_attach_audio_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_attach_file.png b/res/drawable-mdpi/ic_attach_file.png
new file mode 100644
index 0000000000..39da9ef3ad
Binary files /dev/null and b/res/drawable-mdpi/ic_attach_file.png differ
diff --git a/res/drawable-mdpi/ic_attach_picture_holo_light.png b/res/drawable-mdpi/ic_attach_picture_holo_light.png
deleted file mode 100644
index 01f220c298..0000000000
Binary files a/res/drawable-mdpi/ic_attach_picture_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_attach_video_holo_light.png b/res/drawable-mdpi/ic_attach_video_holo_light.png
deleted file mode 100644
index 0ad2abeee3..0000000000
Binary files a/res/drawable-mdpi/ic_attach_video_holo_light.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_contact.png b/res/drawable-mdpi/ic_contact.png
new file mode 100644
index 0000000000..2d9417bd09
Binary files /dev/null and b/res/drawable-mdpi/ic_contact.png differ
diff --git a/res/drawable-mdpi/ic_dialog_attach.png b/res/drawable-mdpi/ic_dialog_attach.png
deleted file mode 100644
index 6be58699fa..0000000000
Binary files a/res/drawable-mdpi/ic_dialog_attach.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_image.png b/res/drawable-mdpi/ic_image.png
new file mode 100644
index 0000000000..3d57dd2b28
Binary files /dev/null and b/res/drawable-mdpi/ic_image.png differ
diff --git a/res/drawable-mdpi/ic_movie_creation.png b/res/drawable-mdpi/ic_movie_creation.png
new file mode 100644
index 0000000000..3506288f98
Binary files /dev/null and b/res/drawable-mdpi/ic_movie_creation.png differ
diff --git a/res/drawable-mdpi/ic_volume_up.png b/res/drawable-mdpi/ic_volume_up.png
new file mode 100644
index 0000000000..6de890621b
Binary files /dev/null and b/res/drawable-mdpi/ic_volume_up.png differ
diff --git a/res/drawable-xhdpi-v11/ic_attach_file.png b/res/drawable-xhdpi-v11/ic_attach_file.png
new file mode 100644
index 0000000000..b6d1e9673b
Binary files /dev/null and b/res/drawable-xhdpi-v11/ic_attach_file.png differ
diff --git a/res/drawable-xhdpi-v11/ic_dialog_attach.png b/res/drawable-xhdpi-v11/ic_dialog_attach.png
deleted file mode 100644
index fa471b73b3..0000000000
Binary files a/res/drawable-xhdpi-v11/ic_dialog_attach.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_action_person.png b/res/drawable-xhdpi/ic_action_person.png
deleted file mode 100644
index 03eeb8d6a6..0000000000
Binary files a/res/drawable-xhdpi/ic_action_person.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_attach_audio_holo_light.png b/res/drawable-xhdpi/ic_attach_audio_holo_light.png
deleted file mode 100644
index ed28c5ffe7..0000000000
Binary files a/res/drawable-xhdpi/ic_attach_audio_holo_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_attach_file.png b/res/drawable-xhdpi/ic_attach_file.png
new file mode 100644
index 0000000000..354e505837
Binary files /dev/null and b/res/drawable-xhdpi/ic_attach_file.png differ
diff --git a/res/drawable-xhdpi/ic_attach_picture_holo_light.png b/res/drawable-xhdpi/ic_attach_picture_holo_light.png
deleted file mode 100644
index e99d6a3d41..0000000000
Binary files a/res/drawable-xhdpi/ic_attach_picture_holo_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_attach_video_holo_light.png b/res/drawable-xhdpi/ic_attach_video_holo_light.png
deleted file mode 100644
index 5a8b395706..0000000000
Binary files a/res/drawable-xhdpi/ic_attach_video_holo_light.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_contact.png b/res/drawable-xhdpi/ic_contact.png
new file mode 100644
index 0000000000..ddd06d7487
Binary files /dev/null and b/res/drawable-xhdpi/ic_contact.png differ
diff --git a/res/drawable-xhdpi/ic_dialog_attach.png b/res/drawable-xhdpi/ic_dialog_attach.png
deleted file mode 100644
index 6946fa98fb..0000000000
Binary files a/res/drawable-xhdpi/ic_dialog_attach.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_image.png b/res/drawable-xhdpi/ic_image.png
new file mode 100644
index 0000000000..5521a654cf
Binary files /dev/null and b/res/drawable-xhdpi/ic_image.png differ
diff --git a/res/drawable-xhdpi/ic_movie_creation.png b/res/drawable-xhdpi/ic_movie_creation.png
new file mode 100644
index 0000000000..5683744ed5
Binary files /dev/null and b/res/drawable-xhdpi/ic_movie_creation.png differ
diff --git a/res/drawable-xhdpi/ic_volume_up.png b/res/drawable-xhdpi/ic_volume_up.png
new file mode 100644
index 0000000000..d62b97730c
Binary files /dev/null and b/res/drawable-xhdpi/ic_volume_up.png differ
diff --git a/res/drawable-xxhdpi-v11/ic_attach_file.png b/res/drawable-xxhdpi-v11/ic_attach_file.png
new file mode 100644
index 0000000000..67613cc6e6
Binary files /dev/null and b/res/drawable-xxhdpi-v11/ic_attach_file.png differ
diff --git a/res/drawable-xxhdpi-v11/ic_dialog_attach.png b/res/drawable-xxhdpi-v11/ic_dialog_attach.png
deleted file mode 100644
index 756f7b1827..0000000000
Binary files a/res/drawable-xxhdpi-v11/ic_dialog_attach.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_action_person.png b/res/drawable-xxhdpi/ic_action_person.png
deleted file mode 100644
index fd1bcdd453..0000000000
Binary files a/res/drawable-xxhdpi/ic_action_person.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_attach_file.png b/res/drawable-xxhdpi/ic_attach_file.png
new file mode 100644
index 0000000000..72820e3111
Binary files /dev/null and b/res/drawable-xxhdpi/ic_attach_file.png differ
diff --git a/res/drawable-xxhdpi/ic_contact.png b/res/drawable-xxhdpi/ic_contact.png
new file mode 100644
index 0000000000..67716eff3b
Binary files /dev/null and b/res/drawable-xxhdpi/ic_contact.png differ
diff --git a/res/drawable-xxhdpi/ic_dialog_attach.png b/res/drawable-xxhdpi/ic_dialog_attach.png
deleted file mode 100644
index c4eda5d8e9..0000000000
Binary files a/res/drawable-xxhdpi/ic_dialog_attach.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_image.png b/res/drawable-xxhdpi/ic_image.png
new file mode 100644
index 0000000000..1614d5a5d1
Binary files /dev/null and b/res/drawable-xxhdpi/ic_image.png differ
diff --git a/res/drawable-xxhdpi/ic_movie_creation.png b/res/drawable-xxhdpi/ic_movie_creation.png
new file mode 100644
index 0000000000..65d596e157
Binary files /dev/null and b/res/drawable-xxhdpi/ic_movie_creation.png differ
diff --git a/res/drawable-xxhdpi/ic_volume_up.png b/res/drawable-xxhdpi/ic_volume_up.png
new file mode 100644
index 0000000000..ab2186867f
Binary files /dev/null and b/res/drawable-xxhdpi/ic_volume_up.png differ
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 5cb271335e..6d5c74de4f 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -561,7 +561,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void handleAddAttachment() {
     if (this.isMmsEnabled || DirectoryHelper.isPushDestination(this, getRecipients())) {
       AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(this, R.style.TextSecure_Light_Dialog));
-      builder.setIcon(R.drawable.ic_dialog_attach);
+      builder.setIcon(R.drawable.ic_attach_file);
       builder.setTitle(R.string.ConversationActivity_add_attachment);
       builder.setAdapter(attachmentAdapter, new AttachmentTypeListener());
       builder.show();
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java b/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java
index 0ff18a1db8..3e271d786f 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java
@@ -70,10 +70,10 @@ public class AttachmentTypeSelectorAdapter extends ArrayAdapter<AttachmentTypeSe
 
   private static List<IconListItem> getItemList(Context context) {
     List<IconListItem> data = new ArrayList<>(4);
-    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_picture), R.drawable.ic_attach_picture_holo_light, ADD_IMAGE);
-    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_video), R.drawable.ic_attach_video_holo_light, ADD_VIDEO);
-    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_audio), R.drawable.ic_attach_audio_holo_light, ADD_SOUND);
-    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_contact), R.drawable.ic_action_person, ADD_CONTACT_INFO);
+    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_picture), R.drawable.ic_image, ADD_IMAGE);
+    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_video), R.drawable.ic_movie_creation, ADD_VIDEO);
+    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_audio), R.drawable.ic_volume_up, ADD_SOUND);
+    addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_contact), R.drawable.ic_contact, ADD_CONTACT_INFO);
 
     return data;
   }