diff --git a/settings/Controller/AppSettingsController.php b/settings/Controller/AppSettingsController.php
index fbcc21b197..8cfa2a004e 100644
--- a/settings/Controller/AppSettingsController.php
+++ b/settings/Controller/AppSettingsController.php
@@ -382,7 +382,7 @@ class AppSettingsController extends Controller {
 				'missingMaxOwnCloudVersion' => false,
 				'missingMinOwnCloudVersion' => false,
 				'canInstall' => true,
-				'preview' => isset($app['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($app['screenshots'][0]['url']) : '',
+				'screenshot' => isset($app['screenshots'][0]['url']) ? 'https://usercontent.apps.nextcloud.com/'.base64_encode($app['screenshots'][0]['url']) : '',
 				'score' => $app['ratingOverall'],
 				'ratingNumOverall' => $app['ratingNumOverall'],
 				'ratingNumThresholdReached' => $app['ratingNumOverall'] > 5,
diff --git a/settings/src/components/appList/appItem.vue b/settings/src/components/appList/appItem.vue
index 47f3f3f42b..5a4a503f3c 100644
--- a/settings/src/components/appList/appItem.vue
+++ b/settings/src/components/appList/appItem.vue
@@ -23,10 +23,9 @@
 <template>
 	<div class="section" v-bind:class="{ selected: isSelected }" v-on:click="showAppDetails">
 		<div class="app-image app-image-icon" v-on:click="showAppDetails">
-			<div v-if="!app.preview" class="icon-settings-dark"></div>
-			<img v-if="!app.previewAsIcon && app.preview && listView" :src="app.preview"  width="100%" />
+			<div v-if="(listView && !app.preview) || (!listView && !app.screenshot)" class="icon-settings-dark"></div>
 
-			<svg v-if="listView && app.previewAsIcon && app.preview" width="32" height="32" viewBox="0 0 32 32">
+			<svg v-if="listView && app.preview" width="32" height="32" viewBox="0 0 32 32">
 				<defs><filter :id="filterId"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
 				<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" :filter="filterUrl" :xlink:href="app.preview" class="app-icon"></image>
 			</svg>