diff --git a/settings/js/apps.js b/settings/js/apps.js
index 9c1604cfcd9..1ee3372f893 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -20,6 +20,11 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		page.find('span.score').html(app.score);
 		page.find('p.description').text(app.description);
 		page.find('img.preview').attr('src', app.preview);
+		if (app.preview && app.preview.length) {
+			page.find('img.preview').show();
+		} else {
+			page.find('img.preview').hide();
+		}
 		page.find('small.externalapp').attr('style', 'visibility:visible');
 		page.find('span.author').text(app.author);
 		page.find('span.licence').text(app.licence);
@@ -142,12 +147,16 @@ OC.Settings.Apps = OC.Settings.Apps || {
 						li.attr('data-id', entry.id);
 						var img= $('<img class="icon"/>').attr({ src: entry.icon});
 						var a=$('<a></a>').attr('href', entry.href);
-						var filename=$('<span></span>')
+						var filename=$('<span></span>');
 						filename.text(entry.name);
 						a.prepend(filename);
 						a.prepend(img);
 						li.append(a);
 						container.append(li);
+						if (!SVGSupport() && entry.icon.match(/\.svg$/i)) {
+							$(img).addClass('svg');
+							replaceSVG();
+						}
 					}
 				}
 			}
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 0903b9bd5c4..d60fd82f917 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -34,7 +34,7 @@
 		class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
 	<span class="score"></span>
 	<p class="description"></p>
-	<img src="" class="preview" />
+	<img src="" class="preview hidden" />
 	<p class="appslink hidden"><a href="#" target="_blank"><?php
 		p($l->t('See application page at apps.owncloud.com'));?></a></p>
 	<p class="license hidden"><?php