diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss
index f2de7fce380bb..e05f3f5c14488 100644
--- a/apps/settings/css/settings.scss
+++ b/apps/settings/css/settings.scss
@@ -539,20 +539,6 @@ span.usersLastLoginTooltip {
 }
 
 /* APPS */
-#app-content > svg.app-filter {
-	float: left;
-	height: 0;
-	width: 0;
-}
-
-#app-category-app-bundles {
-	margin-bottom: 20px;
-}
-
-.appinfo {
-	margin: 1em 40px;
-}
-
 #app-navigation {
 	/* Navigation icons */
 	img {
@@ -570,24 +556,6 @@ span.usersLastLoginTooltip {
 			display: block;
 		}
 	}
-
-	.appwarning {
-		background: #fcc;
-	}
-
-	&.appwarning:hover {
-		background: #fbb;
-	}
-
-	.app-external {
-		color: var(--color-text-maxcontrast);
-	}
-}
-
-span.version {
-	margin-left: 1em;
-	margin-right: 1em;
-	color: var(--color-text-maxcontrast);
 }
 
 .app-version {
@@ -654,10 +622,6 @@ span.version {
 		opacity: 0.5;
 	}
 
-	.app-score-image {
-		height: 14px;
-	}
-
 	.actions {
 		margin-top: 10px;
 
@@ -796,12 +760,6 @@ span.version {
 	}
 }
 
-@media only screen and (max-width: 500px) {
-	.apps-list.installed .app-groups {
-		display: none !important;
-	}
-}
-
 .section {
 	margin-bottom: 0;
 	/* section divider lines, none needed for last one */
@@ -821,11 +779,6 @@ span.version {
 	}
 }
 
-.followupsection {
-	display: block;
-	padding: 0 30px 30px 30px;
-}
-
 .app-image {
 	position: relative;
 	height: 150px;
@@ -833,37 +786,6 @@ span.version {
 	overflow: hidden;
 }
 
-.app-description-toggle-show, .app-description-toggle-hide {
-	clear: both;
-	padding: 7px 0;
-	cursor: pointer;
-	opacity: .5;
-}
-
-.app-description-container {
-	clear: both;
-	position: relative;
-	top: 7px;
-}
-
-.app-description {
-	clear: both;
-}
-
-#app-category-1 {
-	margin-bottom: 18px;
-}
-
-/* capitalize 'Other' category */
-
-#app-category-925 {
-	text-transform: capitalize;
-}
-
-.app-dependencies {
-	color: #ce3702;
-}
-
 .missing-dependencies {
 	list-style: initial;
 	list-style-type: initial;
@@ -934,14 +856,6 @@ span.version {
 
 		}
 
-		.groups-enable {
-			margin-top: 0;
-
-			label {
-				margin-right: 3px;
-			}
-		}
-
 		.app-image {
 			width: 44px;
 			height: auto;
@@ -982,78 +896,14 @@ span.version {
 	flex-wrap: wrap;
 	align-content: flex-start;
 
-	&.hidden {
-		display: none;
-	}
-
 	.section {
 		position: relative;
 		flex: 0 0 auto;
 
-		h2.app-name {
-			display: block;
-			margin: 8px 0;
-		}
-
 		&:hover {
 			background-color: var(--color-background-dark);
 		}
 	}
-
-	.app-description {
-		p {
-			margin: 10px 0;
-		}
-
-		ul {
-			list-style: disc;
-		}
-
-		ol {
-			list-style: decimal;
-
-			ol, ul {
-				padding-left: 15px;
-			}
-		}
-
-		> {
-			ul, ol {
-				margin-left: 19px;
-			}
-		}
-
-		ul {
-			ol, ul {
-				padding-left: 15px;
-			}
-		}
-	}
-
-	/* Bundle header */
-	.apps-header {
-		position: relative;
-
-		div {
-			display: table-cell;
-			height: 70px;
-		}
-
-		h2 {
-			padding-left: 6px;
-			padding-top: 15px;
-			margin-bottom: 12px;
-			.enable {
-				position: relative;
-				top: -1px;
-				margin-left: 12px;
-			}
-
-			+ .section {
-				margin-top: 50px;
-			}
-		}
-	}
 }
 
 // Display buttons above each other on mobile
diff --git a/apps/settings/src/components/AppList.vue b/apps/settings/src/components/AppList.vue
index 18c4331e0f9fb..0646f041340fa 100644
--- a/apps/settings/src/components/AppList.vue
+++ b/apps/settings/src/components/AppList.vue
@@ -22,9 +22,14 @@
 
 <template>
 	<div id="app-content-inner">
-		<div id="apps-list" class="apps-list" :class="{installed: (useBundleView || useListView), store: useAppStoreView}">
+		<div id="apps-list"
+			class="apps-list"
+			:class="{
+				'apps-list--list-view': (useBundleView || useListView),
+				'apps-list--store-view': useAppStoreView,
+			}">
 			<template v-if="useListView">
-				<div v-if="showUpdateAll" class="toolbar">
+				<div v-if="showUpdateAll" class="apps-list__toolbar">
 					{{ n('settings', '%n app has an update available', '%n apps have an update available', counter) }}
 					<NcButton v-if="showUpdateAll"
 						id="app-list-update-all"
@@ -34,25 +39,25 @@
 					</NcButton>
 				</div>
 
-				<div v-if="!showUpdateAll" class="toolbar">
+				<div v-if="!showUpdateAll" class="apps-list__toolbar">
 					{{ t('settings', 'All apps are up-to-date.') }}
 				</div>
 
-				<transition-group name="app-list" tag="table" class="apps-list-container">
-					<tr key="app-list-view-header" class="apps-header">
-						<th class="app-image">
+				<TransitionGroup name="apps-list" tag="table" class="apps-list__list-container">
+					<tr key="app-list-view-header">
+						<th>
 							<span class="hidden-visually">{{ t('settings', 'Icon') }}</span>
 						</th>
-						<th class="app-name">
+						<th>
 							<span class="hidden-visually">{{ t('settings', 'Name') }}</span>
 						</th>
-						<th class="app-version">
+						<th>
 							<span class="hidden-visually">{{ t('settings', 'Version') }}</span>
 						</th>
-						<th class="app-level">
+						<th>
 							<span class="hidden-visually">{{ t('settings', 'Level') }}</span>
 						</th>
-						<th class="actions">
+						<th>
 							<span class="hidden-visually">{{ t('settings', 'Actions') }}</span>
 						</th>
 					</tr>
@@ -60,33 +65,33 @@
 						:key="app.id"
 						:app="app"
 						:category="category" />
-				</transition-group>
+				</TransitionGroup>
 			</template>
 
 			<table v-if="useBundleView"
-				class="apps-list-container">
-				<tr key="app-list-view-header" class="apps-header">
-					<th id="app-table-col-icon" class="app-image">
+				class="apps-list__list-container">
+				<tr key="app-list-view-header">
+					<th id="app-table-col-icon">
 						<span class="hidden-visually">{{ t('settings', 'Icon') }}</span>
 					</th>
-					<th id="app-table-col-name" class="app-name">
+					<th id="app-table-col-name">
 						<span class="hidden-visually">{{ t('settings', 'Name') }}</span>
 					</th>
-					<th id="app-table-col-version" class="app-version">
+					<th id="app-table-col-version">
 						<span class="hidden-visually">{{ t('settings', 'Version') }}</span>
 					</th>
-					<th id="app-table-col-level" class="app-level">
+					<th id="app-table-col-level">
 						<span class="hidden-visually">{{ t('settings', 'Level') }}</span>
 					</th>
-					<th id="app-table-col-actions" class="actions">
+					<th id="app-table-col-actions">
 						<span class="hidden-visually">{{ t('settings', 'Actions') }}</span>
 					</th>
 				</tr>
 				<template v-for="bundle in bundles">
 					<tr :key="bundle.id">
 						<th :id="`app-table-rowgroup-${bundle.id}`" colspan="5" scope="rowgroup">
-							<div class="app-bundle-heading">
-								<span class="app-bundle-header">
+							<div class="apps-list__bundle-heading">
+								<span class="apps-list__bundle-header">
 									{{ bundle.name }}
 								</span>
 								<NcButton type="secondary" @click="toggleBundle(bundle.id)">
@@ -103,7 +108,7 @@
 						:category="category" />
 				</template>
 			</table>
-			<ul v-if="useAppStoreView" class="apps-store-view">
+			<ul v-if="useAppStoreView" class="apps-list__store-container">
 				<AppItem v-for="app in apps"
 					:key="app.id"
 					:app="app"
@@ -112,20 +117,34 @@
 			</ul>
 		</div>
 
-		<div id="apps-list-search" class="apps-list installed">
-			<div class="apps-list-container">
-				<template v-if="search !== '' && searchApps.length > 0">
-					<div class="section">
-						<div />
-						<td colspan="5">
-							<h2>{{ t('settings', 'Results from other categories') }}</h2>
-						</td>
-					</div>
+		<div id="apps-list-search" class="apps-list apps-list--list-view">
+			<div class="apps-list__list-container">
+				<table v-if="search !== '' && searchApps.length > 0" class="apps-list__list-container">
+					<caption class="apps-list__bundle-header">
+						{{ t('settings', 'Results from other categories') }}
+					</caption>
+					<tr key="app-list-view-header">
+						<th>
+							<span class="hidden-visually">{{ t('settings', 'Icon') }}</span>
+						</th>
+						<th>
+							<span class="hidden-visually">{{ t('settings', 'Name') }}</span>
+						</th>
+						<th>
+							<span class="hidden-visually">{{ t('settings', 'Version') }}</span>
+						</th>
+						<th>
+							<span class="hidden-visually">{{ t('settings', 'Level') }}</span>
+						</th>
+						<th>
+							<span class="hidden-visually">{{ t('settings', 'Actions') }}</span>
+						</th>
+					</tr>
 					<AppItem v-for="app in searchApps"
 						:key="app.id"
 						:app="app"
 						:category="category" />
-				</template>
+				</table>
 			</div>
 		</div>
 
@@ -133,8 +152,6 @@
 			<div id="app-list-empty-icon" class="icon-settings-dark" />
 			<h2>{{ t('settings', 'No apps found for your version') }}</h2>
 		</div>
-
-		<div id="searchresults" />
 	</div>
 </template>
 
@@ -197,6 +214,7 @@ export default {
 				// An app level of `200` will be set for apps featured on the app store
 				return apps.filter(app => app.level === 200)
 			}
+
 			// filter app store categories
 			return apps.filter(app => {
 				return app.appstore && app.category !== undefined
diff --git a/apps/settings/src/components/AppList/AppItem.vue b/apps/settings/src/components/AppList/AppItem.vue
index 0838f2c882254..e66507cc5b7d7 100644
--- a/apps/settings/src/components/AppList/AppItem.vue
+++ b/apps/settings/src/components/AppList/AppItem.vue
@@ -22,8 +22,13 @@
 
 <template>
 	<component :is="listView ? `tr` : `li`"
-		class="section"
-		:class="{ selected: isSelected }">
+		class="app-item"
+		:class="{
+			'app-item--list-view': listView,
+			'app-item--store-view': !listView,
+			'app-item--selected': isSelected,
+			'app-item--with-sidebar': withSidebar,
+		}">
 		<component :is="dataItemTag"
 			class="app-image app-image-icon"
 			:headers="getDataItemHeaders(`app-table-col-icon`)">
@@ -79,7 +84,7 @@
 				{{ t('settings', 'Featured') }}</span>
 			<AppScore v-if="hasRating && !listView" :score="app.score" />
 		</component>
-		<component :is="dataItemTag" :headers="getDataItemHeaders(`app-table-col-actions`)" class="actions">
+		<component :is="dataItemTag" :headers="getDataItemHeaders(`app-table-col-actions`)" class="app-actions">
 			<div v-if="app.error" class="warning">
 				{{ app.error }}
 			</div>
@@ -165,6 +170,9 @@ export default {
 		dataItemTag() {
 			return this.listView ? 'td' : 'div'
 		},
+		withSidebar() {
+			return !!this.$route.params.id
+		},
 	},
 	watch: {
 		'$route.params.id'(id) {
@@ -197,6 +205,175 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@use '../../../../../core/css/variables.scss' as variables;
+@use 'sass:math';
+
+.app-item {
+	position: relative;
+
+	&:hover {
+		background-color: var(--color-background-dark);
+	}
+
+	&--list-view {
+		--app-item-padding: calc(var(--default-grid-baseline) * 2);
+		--app-item-height: calc(var(--default-clickable-area) + var(--app-item-padding) * 2);
+
+		&.app-item--selected {
+			background-color: var(--color-background-dark);
+		}
+
+		> * {
+			vertical-align: middle;
+			border-bottom: 1px solid var(--color-border);
+			padding: var(--app-item-padding);
+			height: var(--app-item-height);
+		}
+
+		.app-image {
+			width: var(--default-clickable-area);
+			height: auto;
+			text-align: right;
+		}
+
+		.app-image-icon svg,
+		.app-image-icon .icon-settings-dark {
+			margin-top: 5px;
+			width: 20px;
+			height: 20px;
+			opacity: .5;
+			background-size: cover;
+			display: inline-block;
+		}
+
+		.app-name {
+			padding: 0 var(--app-item-padding);
+		}
+
+		.app-name--link {
+			height: var(--app-item-height);
+			display: flex;
+			align-items: center;
+		}
+
+		// Note: because of Safari bug, we cannot position link overlay relative to the table row
+		// So we need to manually position it relative to the table container and cell
+		// See: https://bugs.webkit.org/show_bug.cgi?id=240961
+		.app-name--link::after {
+			content: '';
+			position: absolute;
+			left: 0;
+			right: 0;
+			height: var(--app-item-height);
+		}
+
+		.app-actions {
+			display: flex;
+			gap: var(--app-item-padding);
+			flex-wrap: wrap;
+			justify-content: end;
+
+			.icon-loading-small {
+				display: inline-block;
+				top: 4px;
+				margin-right: 10px;
+			}
+		}
+
+		/* hide app version and level on narrower screens */
+		@media only screen and (max-width: 900px) {
+			.app-version,
+			.app-level {
+				display: none;
+			}
+		}
+
+		/* Hide actions on a small screen. Click on app opens fill-screen sidebar with the buttons */
+		@media only screen and (max-width: math.div(variables.$breakpoint-mobile, 2)) {
+			.app-actions {
+				display: none;
+			}
+		}
+	}
+
+	&--store-view {
+		padding: 30px;
+
+		.app-image-icon .icon-settings-dark {
+			width: 100%;
+			height: 150px;
+			background-size: 45px;
+			opacity: 0.5;
+		}
+
+		.app-image-icon svg {
+			position: absolute;
+			bottom: 43px;
+			/* position halfway vertically */
+			width: 64px;
+			height: 64px;
+			opacity: .1;
+		}
+
+		.app-name {
+			margin: 5px 0;
+		}
+
+		.app-name--link::after {
+			content: '';
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+		}
+
+		.app-actions {
+			margin: 10px 0;
+		}
+
+		@media only screen and (min-width: 1601px) {
+			width: 25%;
+
+			&.app-item--with-sidebar {
+				width: 33%;
+			}
+		}
+
+		@media only screen and (max-width: 1600px) {
+			width: 25%;
+
+			&.app-item--with-sidebar {
+				width: 33%;
+			}
+		}
+
+		@media only screen and (max-width: 1400px) {
+			width: 33%;
+
+			&.app-item--with-sidebar {
+				width: 50%;
+			}
+		}
+
+		@media only screen and (max-width: 900px) {
+			width: 50%;
+
+			&.app-item--with-sidebar {
+				width: 100%;
+			}
+		}
+
+		@media only screen and (max-width: variables.$breakpoint-mobile) {
+			width: 50%;
+		}
+
+		@media only screen and (max-width: 480px) {
+			width: 100%;
+		}
+	}
+}
+
 .app-icon {
 	filter: var(--background-invert-if-bright);
 }
diff --git a/cypress/e2e/settings/apps.cy.ts b/cypress/e2e/settings/apps.cy.ts
index bfd6b1965fa31..f2fd753e44587 100644
--- a/cypress/e2e/settings/apps.cy.ts
+++ b/cypress/e2e/settings/apps.cy.ts
@@ -39,11 +39,10 @@ describe('Settings: App management', { testIsolation: true }, () => {
 	})
 
 	it('Can enable an installed app', () => {
-		cy.get('#apps-list').should('be.visible')
+		cy.get('#apps-list').should('exist')
 			// Wait for the app list to load
 			.contains('tr', 'QA testing', { timeout: 10000 })
 			.should('exist')
-			.find('.actions')
 			// I enable the "QA testing" app
 			.contains('button', 'Enable')
 			.click({ force: true })
@@ -51,10 +50,9 @@ describe('Settings: App management', { testIsolation: true }, () => {
 		handlePasswordConfirmation(admin.password)
 
 		// Wait until we see the disable button for the app
-		cy.get('#apps-list').should('be.visible')
+		cy.get('#apps-list').should('exist')
 			.contains('tr', 'QA testing')
 			.should('exist')
-			.find('.actions')
 			// I see the disable button for the app
 			.contains('button', 'Disable', { timeout: 10000 })
 
@@ -62,15 +60,15 @@ describe('Settings: App management', { testIsolation: true }, () => {
 		cy.get('#app-category-enabled a').click({ force: true })
 		cy.url().should('match', /settings\/apps\/enabled$/)
 		// I see that the "QA testing" app has been enabled
-		cy.get('.apps-list-container').contains('tr', 'QA testing')
+		cy.get('#apps-list').contains('tr', 'QA testing')
 	})
 
 	it('Can disable an installed app', () => {
-		cy.get('#apps-list').should('be.visible')
+		cy.get('#apps-list')
+			.should('exist')
 			// Wait for the app list to load
 			.contains('tr', 'Update notification', { timeout: 10000 })
 			.should('exist')
-			.find('.actions')
 			// I disable the "Update notification" app
 			.contains('button', 'Disable')
 			.click({ force: true })
@@ -78,10 +76,9 @@ describe('Settings: App management', { testIsolation: true }, () => {
 		handlePasswordConfirmation(admin.password)
 
 		// Wait until we see the disable button for the app
-		cy.get('#apps-list').should('be.visible')
+		cy.get('#apps-list').should('exist')
 			.contains('tr', 'Update notification')
 			.should('exist')
-			.find('.actions')
 			// I see the enable button for the app
 			.contains('button', 'Enable', { timeout: 10000 })
 
@@ -89,7 +86,7 @@ describe('Settings: App management', { testIsolation: true }, () => {
 		cy.get('#app-category-disabled a').click({ force: true })
 		cy.url().should('match', /settings\/apps\/disabled$/)
 		// I see that the "Update notification" app has been disabled
-		cy.get('.apps-list-container').contains('tr', 'Update notification')
+		cy.get('#apps-list').contains('tr', 'Update notification')
 	})
 
 	it('Browse enabled apps', () => {
@@ -102,8 +99,8 @@ describe('Settings: App management', { testIsolation: true }, () => {
 		cy.get('#app-category-enabled').find('.active').should('exist')
 		// I see that there are only enabled apps
 		cy.get('#apps-list')
-			.should('be.visible')
-			.find('tr .actions')
+			.should('exist')
+			.find('tr button')
 			.each(($action) => {
 				cy.wrap($action).should('not.contain', 'Enable')
 			})
@@ -119,8 +116,8 @@ describe('Settings: App management', { testIsolation: true }, () => {
 		cy.get('#app-category-disabled').find('.active').should('exist')
 		// I see that there are only disabled apps
 		cy.get('#apps-list')
-			.should('be.visible')
-			.find('tr .actions')
+			.should('exist')
+			.find('tr button')
 			.each(($action) => {
 				cy.wrap($action).should('not.contain', 'Disable')
 			})