diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java
index fd729aac8..109a3b7d9 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java
@@ -62,8 +62,19 @@ public class MediaPreviewAdapter extends RecyclerView.Adapter<MediaPreviewAdapte
             } else if (attachment.getType() == Attachment.Type.RECORDING) {
                 attr = R.attr.media_preview_recording;
             } else {
-                if (attachment.getMime() != null && attachment.getMime().startsWith("audio/")) {
+                final String mime = attachment.getMime();
+                if (mime == null) {
+                    attr = R.attr.media_preview_file;
+                } else if (mime.startsWith("audio/")) {
                     attr = R.attr.media_preview_audio;
+                } else if (mime.equals("text/calendar") || (mime.equals("text/x-vcalendar"))) {
+                    attr = R.attr.media_preview_calendar;
+                } else if (mime.equals("text/x-vcard")) {
+                    attr = R.attr.media_preview_contact;
+                } else if (mime.equals("application/vnd.android.package-archive")) {
+                    attr = R.attr.media_preview_app;
+                } else if (mime.equals("application/zip") || mime.equals("application/rar")) {
+                    attr = R.attr.media_preview_archive;
                 } else {
                     attr = R.attr.media_preview_file;
                 }
diff --git a/src/main/res/drawable-hdpi/ic_android_black_48dp.png b/src/main/res/drawable-hdpi/ic_android_black_48dp.png
new file mode 100644
index 000000000..6006b1207
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_android_black_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_android_white_48dp.png b/src/main/res/drawable-hdpi/ic_android_white_48dp.png
new file mode 100644
index 000000000..01e43a39d
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_android_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_archive_black_48dp.png b/src/main/res/drawable-hdpi/ic_archive_black_48dp.png
new file mode 100644
index 000000000..d6d60f679
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_archive_black_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_archive_white_48dp.png b/src/main/res/drawable-hdpi/ic_archive_white_48dp.png
new file mode 100644
index 000000000..00e04e42b
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_archive_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_event_black_48dp.png b/src/main/res/drawable-hdpi/ic_event_black_48dp.png
new file mode 100644
index 000000000..2f5815d2d
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_event_black_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_event_white_48dp.png b/src/main/res/drawable-hdpi/ic_event_white_48dp.png
new file mode 100644
index 000000000..0bcfe5b68
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_event_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_person_black_48dp.png b/src/main/res/drawable-hdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..f1e148490
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_person_black_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_person_white_48dp.png b/src/main/res/drawable-hdpi/ic_person_white_48dp.png
new file mode 100644
index 000000000..184f7418d
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_person_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_android_black_48dp.png b/src/main/res/drawable-mdpi/ic_android_black_48dp.png
new file mode 100644
index 000000000..41558f251
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_android_black_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_android_white_48dp.png b/src/main/res/drawable-mdpi/ic_android_white_48dp.png
new file mode 100644
index 000000000..bbf0efe09
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_android_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_archive_black_48dp.png b/src/main/res/drawable-mdpi/ic_archive_black_48dp.png
new file mode 100644
index 000000000..9b8821817
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_archive_black_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_archive_white_48dp.png b/src/main/res/drawable-mdpi/ic_archive_white_48dp.png
new file mode 100644
index 000000000..3513bd9fe
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_archive_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_event_black_48dp.png b/src/main/res/drawable-mdpi/ic_event_black_48dp.png
new file mode 100644
index 000000000..4b3cefa2b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_event_black_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_event_white_48dp.png b/src/main/res/drawable-mdpi/ic_event_white_48dp.png
new file mode 100644
index 000000000..5356f8220
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_event_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_person_black_48dp.png b/src/main/res/drawable-mdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..360a32f27
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_person_black_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_person_white_48dp.png b/src/main/res/drawable-mdpi/ic_person_white_48dp.png
new file mode 100644
index 000000000..aea15f0be
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_person_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_android_black_48dp.png b/src/main/res/drawable-xhdpi/ic_android_black_48dp.png
new file mode 100644
index 000000000..4f935bf59
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_android_black_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_android_white_48dp.png b/src/main/res/drawable-xhdpi/ic_android_white_48dp.png
new file mode 100644
index 000000000..a10f85f1b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_android_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_archive_black_48dp.png b/src/main/res/drawable-xhdpi/ic_archive_black_48dp.png
new file mode 100644
index 000000000..b8c03760a
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_archive_black_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png b/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png
new file mode 100644
index 000000000..34cd3fd80
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_archive_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_event_black_48dp.png b/src/main/res/drawable-xhdpi/ic_event_black_48dp.png
new file mode 100644
index 000000000..0458ac531
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_event_black_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_event_white_48dp.png b/src/main/res/drawable-xhdpi/ic_event_white_48dp.png
new file mode 100644
index 000000000..d5ebc9612
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_event_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_person_black_48dp.png b/src/main/res/drawable-xhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..1ebc37be1
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_person_black_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_person_white_48dp.png b/src/main/res/drawable-xhdpi/ic_person_white_48dp.png
new file mode 100644
index 000000000..33d40d8b6
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_person_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_android_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_android_black_48dp.png
new file mode 100644
index 000000000..149b4ec9d
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_android_black_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_android_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_android_white_48dp.png
new file mode 100644
index 000000000..964a44daf
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_android_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_archive_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_archive_black_48dp.png
new file mode 100644
index 000000000..6c956e64b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_archive_black_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png
new file mode 100644
index 000000000..5f5763880
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_archive_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_event_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_event_black_48dp.png
new file mode 100644
index 000000000..55c9d9717
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_event_black_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_event_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_event_white_48dp.png
new file mode 100644
index 000000000..cd0d4e39b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_event_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_person_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..77e3a1816
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_person_black_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_person_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_white_48dp.png
new file mode 100644
index 000000000..6a14714bf
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_person_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_android_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_android_black_48dp.png
new file mode 100644
index 000000000..ded531fc5
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_android_black_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_android_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_android_white_48dp.png
new file mode 100644
index 000000000..20c9685f4
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_android_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_archive_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_archive_black_48dp.png
new file mode 100644
index 000000000..abdadd0df
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_archive_black_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png
new file mode 100644
index 000000000..b8e5966de
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_archive_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_event_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_event_black_48dp.png
new file mode 100644
index 000000000..9a8a0fb07
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_event_black_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_event_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_event_white_48dp.png
new file mode 100644
index 000000000..fd9583a90
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_event_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_person_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_black_48dp.png
new file mode 100644
index 000000000..6be3e3063
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_person_black_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_person_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_white_48dp.png
new file mode 100644
index 000000000..4242a5653
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_person_white_48dp.png differ
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 32ff9dbd8..03e8c0d92 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -56,6 +56,10 @@
     <attr name="media_preview_recording" format="reference"/>
     <attr name="media_preview_audio" format="reference"/>
     <attr name="media_preview_location" format="reference"/>
+    <attr name="media_preview_contact" format="reference"/>
+    <attr name="media_preview_app" format="reference"/>
+    <attr name="media_preview_calendar" format="reference"/>
+    <attr name="media_preview_archive" format="reference" />
 
 
     <attr name="icon_add_group" format="reference"/>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 47d975634..449cae4e6 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -67,6 +67,10 @@
         <item type="reference" name="media_preview_recording">@drawable/ic_mic_black_48dp</item>
         <item type="reference" name="media_preview_audio">@drawable/ic_headset_black_48dp</item>
         <item type="reference" name="media_preview_location">@drawable/ic_room_black_48dp</item>
+        <item type="reference" name="media_preview_contact">@drawable/ic_person_black_48dp</item>
+        <item type="reference" name="media_preview_app">@drawable/ic_android_black_48dp</item>
+        <item type="reference" name="media_preview_calendar">@drawable/ic_event_black_48dp</item>
+        <item type="reference" name="media_preview_archive">@drawable/ic_archive_black_48dp</item>
 
         <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
         <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
@@ -173,6 +177,10 @@
         <item type="reference" name="media_preview_recording">@drawable/ic_mic_white_48dp</item>
         <item type="reference" name="media_preview_audio">@drawable/ic_headset_white_48dp</item>
         <item type="reference" name="media_preview_location">@drawable/ic_room_white_48dp</item>
+        <item type="reference" name="media_preview_contact">@drawable/ic_person_white_48dp</item>
+        <item type="reference" name="media_preview_app">@drawable/ic_android_white_48dp</item>
+        <item type="reference" name="media_preview_calendar">@drawable/ic_event_white_48dp</item>
+        <item type="reference" name="media_preview_archive">@drawable/ic_archive_white_48dp</item>
 
         <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
         <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item>