diff --git a/artwork/ic_contact.svg b/artwork/ic_contact.svg
new file mode 100644
index 000000000..d3ecca0e1
--- /dev/null
+++ b/artwork/ic_contact.svg
@@ -0,0 +1,48 @@
+
+
+
+
\ 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 000000000..8fa4b1bed
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 7439169d9..000000000
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 9fd81097b..000000000
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 050543a8a..000000000
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 000000000..bd61803f9
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 1b3593422..000000000
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 3141d5e5a..000000000
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 000000000..042b0b855
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 8a6a887a7..000000000
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 000000000..afce95a27
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 000000000..dccabc292
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 000000000..b020322df
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 000000000..3facb8a50
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 ecdcaabca..000000000
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 359da1c12..000000000
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 c5fd717af..000000000
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 000000000..39da9ef3a
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 01f220c29..000000000
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 0ad2abeee..000000000
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 000000000..2d9417bd0
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 6be58699f..000000000
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 000000000..3d57dd2b2
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 000000000..3506288f9
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 000000000..6de890621
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 000000000..b6d1e9673
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 fa471b73b..000000000
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 03eeb8d6a..000000000
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 ed28c5ffe..000000000
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 000000000..354e50583
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 e99d6a3d4..000000000
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 5a8b39570..000000000
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 000000000..ddd06d748
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 6946fa98f..000000000
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 000000000..5521a654c
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 000000000..5683744ed
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 000000000..d62b97730
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 000000000..67613cc6e
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 756f7b182..000000000
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 fd1bcdd45..000000000
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 000000000..72820e311
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 000000000..67716eff3
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 c4eda5d8e..000000000
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 000000000..1614d5a5d
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 000000000..65d596e15
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 000000000..ab2186867
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 5cb271335..6d5c74de4 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 0ff18a1db..3e271d786 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 getItemList(Context context) {
List 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;
}