diff --git a/core/css/header.scss b/core/css/header.scss
index 4b6c0fbd007ac..c4119c2cecbfa 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -321,30 +321,6 @@ nav {
 	}
 }
 
-/* Apps management */
-.apps-management {
-	min-height: initial;
-	height: initial;
-	margin: 0;
-	a {
-		svg,
-		span {
-			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)';
-			opacity: .3;
-		}
-		/* icon opacity and hover effect */
-		&:hover svg,
-		&:focus svg,
-		&.active svg,
-		&:hover span,
-		&:focus span,
-		&.active span {
-			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
-			opacity: 1;
-		}
-	}
-}
-
 #apps {
 	max-height: calc(100vh - 100px);
 	overflow: auto;
@@ -583,4 +559,4 @@ nav {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index adeeaf0379758..e8f4082be8042 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -80,16 +80,6 @@
 									<span><?php p($l->t('More apps')); ?></span>
 								</a>
 							</li>
-							<?php if(OC_User::isAdminUser(OC_User::getUser())):	?>
-								<li <?php if(count($_['navigation'])>$headerIconCount-1): ?> class="hidden apps-management"<?php else: ?> class="apps-management"  <?php endif; ?>>
-									<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4"
-										<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
-										<img src="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>" />
-										<div class="icon-loading-dark" style="display:none;"></div>
-										<span><?php p($l->t('Apps')); ?></span>
-									</a>
-								</li>
-							<?php endif; ?>
 					</ul>
 				</div>
 
@@ -115,25 +105,6 @@
 									</a>
 									</li>
 								<?php endforeach; ?>
-								<?php
-								/* show "More apps" link to app administration directly in app navigation, as last entry */
-								if(OC_User::isAdminUser(OC_User::getUser())):
-									?>
-									<li class="apps-management">
-										<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>" tabindex="4"
-											<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
-											<svg width="32" height="32" viewBox="0 0 32 32" class="app-icon">
-												<defs><filter id="invert-appsmanagement"><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="url(#invert-appsmanagement)" xlink:href="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>"></image>
-											</svg>
-											<div class="icon-loading-dark" style="display:none;"></div>
-											<span>
-								<?php p($l->t('Apps')); ?>
-							</span>
-										</a>
-									</li>
-								<?php endif; ?>
-
 							</ul>
 						</div>
 					</div></nav>
@@ -174,6 +145,15 @@
 							</a>
 						</li>
 					<?php endforeach; ?>
+						<?php if(OC_User::isAdminUser(OC_User::getUser())):	?>
+						<li>
+							<a href="<?php print_unescaped(\OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')); ?>"
+								<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
+								<img src="<?php print_unescaped(image_path('settings', 'apps.svg') . '?v=' . $_['versionHash']); ?>" />
+								<?php p($l->t('Apps')); ?>
+							</a>
+						</li>
+						<?php endif; ?>
 						<li>
 							<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
 								<img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg') . '?v=' . $_['versionHash']); ?>">
diff --git a/settings/img/apps.svg b/settings/img/apps.svg
index d1509ea3a3779..292a4ed91fae3 100644
--- a/settings/img/apps.svg
+++ b/settings/img/apps.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1"><path d="M14 6v8H6v4h8v8h4v-8h8v-4h-8V6h-4z" fill="#FFF"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1">
+ <path d="m7 2v5h-5v2h5v5h2v-5h5v-2h-5v-5z"/>
+</svg>
diff --git a/settings/js/apps.js b/settings/js/apps.js
index d2f26578a7cf7..d0fcfeb15ea23 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -539,12 +539,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
 
 
 
-				if (navEntries.length > 7) {
+				if (navEntries.length > 8) {
 					$('#more-apps').show();
-					$('.apps-management').hide();
 				} else {
 					$('#more-apps').hide();
-					$('.apps-management').show();
 				}
 			}
 		});