diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
index 75ab964f44b5cd35cab2d040ac077dd3b05404e9..21473dafd7b9a9a542f3f2f9c181a246ee9ece43 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
@@ -92,6 +92,8 @@ public class MediaAdapter extends RecyclerView.Adapter<MediaAdapter.MediaViewHol
                 attr = R.attr.media_preview_document;
             } else if (mime.equals("application/gpx+xml")) {
                 attr = R.attr.media_preview_tour;
+            } else if (mime.startsWith("image/")) {
+                attr = R.attr.media_preview_image;
             } else {
                 attr = R.attr.media_preview_unknown;
             }
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index a686f869763f5fe6e43afe84188bf3ac659a713d..c8b9823eecd054227303ae7b016725c6c96a105b 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -475,9 +475,6 @@ public class UIHelper {
     }
 
     public static String getFileDescriptionString(final Context context, final Message message) {
-        if (message.getType() == Message.TYPE_IMAGE) {
-            return context.getString(R.string.image);
-        }
         final String mime = message.getMimeType();
         if (mime == null) {
             return context.getString(R.string.file);
@@ -487,7 +484,9 @@ public class UIHelper {
             return context.getString(R.string.video);
         } else if (mime.equals("image/gif")) {
             return context.getString(R.string.gif);
-        } else if (mime.startsWith("image/")) {
+        } else if (mime.equals("image/svg+xml")) {
+            return context.getString(R.string.vector_graphic);
+        } else if (mime.startsWith("image/") || message.getType() == Message.TYPE_IMAGE) {
             return context.getString(R.string.image);
         } else if (mime.contains("pdf")) {
             return context.getString(R.string.pdf_document);
diff --git a/src/main/res/drawable-hdpi/ic_image_black_48dp.png b/src/main/res/drawable-hdpi/ic_image_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7297bd5d29836b39d398d97961bc312fd9152bb5
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_image_black_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_image_white_48dp.png b/src/main/res/drawable-hdpi/ic_image_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9f1defa6df89b5a7a68df6787a4ba799d3bd3b2
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_image_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_image_black_48dp.png b/src/main/res/drawable-mdpi/ic_image_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b7cd7838b5ab18a63036d58a054a7f7588df8d5
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_image_black_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_image_white_48dp.png b/src/main/res/drawable-mdpi/ic_image_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2642b9e09ec00be308649f62d9323f22ae2b6c6c
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_image_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_image_black_48dp.png b/src/main/res/drawable-xhdpi/ic_image_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebe206ff7bb1de48d109e24282501264d1c85251
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_image_black_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_image_white_48dp.png b/src/main/res/drawable-xhdpi/ic_image_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ffdb55f264ecd3610f90890f8202f93c00f72e1
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_image_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_image_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_image_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2a6b644829815a725ec1316608f4bcc99a9dd78
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_image_black_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_image_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_image_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fe5c5ceb684831ab06bcc40d681890a3eeaa63c
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_image_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_image_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_image_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab700a31baa62ff83bb872ceae6838e546c32080
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_image_black_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_image_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_image_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d5091ded87b138183db10e24afabf288766a598
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_image_white_48dp.png differ
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index fc05b16961188bbd4ed9015f557211182b88ed13..2a9a4a8e63358c1d6fcb63393eda1978b5bb5a6e 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -62,6 +62,7 @@
     <attr name="icon_alpha" format="float" />
     <attr name="delete_icon_alpha" format="float" />
 
+    <attr name="media_preview_image" format="reference" />
     <attr name="media_preview_document" format="reference" />
     <attr name="media_preview_recording" format="reference" />
     <attr name="media_preview_audio" format="reference" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c9ad3d891d45704b957601268af4e2e2c0037c4d..87c44a9fd66409d9aab0420a92b39b9c2a0deb70 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -412,6 +412,7 @@
     <string name="audio">audio</string>
     <string name="video">video</string>
     <string name="image">image</string>
+    <string name="vector_graphic">vector graphic</string>
     <string name="pdf_document">PDF document</string>
     <string name="apk">Android App</string>
     <string name="vcard">Contact</string>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 0ba1106fe19e75f4f113c9a08c1d4527ac2b6e79..9e757a626a71fc85142c00b818712efadf31e7bc 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -80,8 +80,8 @@
         <item name="dialog_horizontal_padding">24dp</item>
         <item name="dialog_vertical_padding">16dp</item>
 
-        <item name="media_preview_document" type="reference">@drawable/ic_description_black_48dp
-        </item>
+        <item name="media_preview_image" type="reference">@drawable/ic_image_black_48dp</item>
+        <item name="media_preview_document" type="reference">@drawable/ic_description_black_48dp</item>
         <item name="media_preview_recording" type="reference">@drawable/ic_mic_black_48dp</item>
         <item name="media_preview_audio" type="reference">@drawable/ic_headset_black_48dp</item>
         <item name="media_preview_location" type="reference">@drawable/ic_room_black_48dp</item>
@@ -236,8 +236,8 @@
         <item name="dialog_horizontal_padding">24dp</item>
         <item name="dialog_vertical_padding">16dp</item>
 
-        <item name="media_preview_document" type="reference">@drawable/ic_description_white_48dp
-        </item>
+        <item name="media_preview_image" type="reference">@drawable/ic_image_white_48dp</item>
+        <item name="media_preview_document" type="reference">@drawable/ic_description_white_48dp</item>
         <item name="media_preview_recording" type="reference">@drawable/ic_mic_white_48dp</item>
         <item name="media_preview_audio" type="reference">@drawable/ic_headset_white_48dp</item>
         <item name="media_preview_location" type="reference">@drawable/ic_room_white_48dp</item>