diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4327b03..ed9df575 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 - Remove bower, now use only npm packages.
 - Add new wysiwyg editor (like the Medunm editor) with emojis, local storage changes, mentions...
 - Add rich text custom fields (with a wysiwyg editor like descreption or comments).
+- Add thumbnails and preview for PSD files.
+- Add thumbnails and preview for SVG files.
 - i18n:
   - Add japanese (ja) translation.
   - Add korean (ko) translation.
diff --git a/app/coffee/utils.coffee b/app/coffee/utils.coffee
index 638dc218..7524f0c3 100644
--- a/app/coffee/utils.coffee
+++ b/app/coffee/utils.coffee
@@ -220,7 +220,7 @@ _.mixin
 
 
 isImage = (name) ->
-    return name.match(/\.(jpe?g|png|gif|gifv|webm)/i) != null
+    return name.match(/\.(jpe?g|png|gif|gifv|webm|svg|psd)/i) != null
 
 
 isPdf = (name) ->
diff --git a/app/modules/components/attachments-preview/attachments-preview.jade b/app/modules/components/attachments-preview/attachments-preview.jade
index 0be41189..b2966ab7 100644
--- a/app/modules/components/attachments-preview/attachments-preview.jade
+++ b/app/modules/components/attachments-preview/attachments-preview.jade
@@ -10,8 +10,8 @@
             tg-svg(svg-icon="icon-arrow-left")
 
         a(href="{{vm.current.get('url')}}", title="{{vm.current.get('description')}}", target="_blank", download="{{vm.current.get('name')}}")
-            tg-preload-image(preload-src="{{vm.getCurrent().get('url')}}")
-                 img(ng-src="{{vm.getCurrent().get('url')}}")
+            tg-preload-image(preload-src="{{vm.current.get('preview_url') || vm.getCurrent().get('url')}}")
+                 img(ng-src="{{vm.current.get('preview_url') || vm.getCurrent().get('url')}}")
 
         a.next(
             href="#",