diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index 300c24ff940..e0b83fe5e47 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -177,14 +177,14 @@ class NavigationManager implements INavigationManager {
 				]);
 			}
 
-			// Personal settings
+			// Personal and (if applicable) admin settings
 			$this->add([
 				'type' => 'settings',
-				'id' => 'personal',
+				'id' => 'settings',
 				'order' => 1,
 				'href' => $this->urlGenerator->linkToRoute('settings_personal'),
-				'name' => $l->t('Personal'),
-				'icon' => $this->urlGenerator->imagePath('settings', 'personal.svg'),
+				'name' => $l->t('Settings'),
+				'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
 			]);
 
 			// Logout
@@ -211,18 +211,6 @@ class NavigationManager implements INavigationManager {
 					'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
 				]);
 			}
-
-			if ($this->isAdmin()) {
-				// Admin settings
-				$this->add([
-					'type' => 'settings',
-					'id' => 'admin',
-					'order' => 2,
-					'href' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index'),
-					'name' => $l->t('Admin'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
-				]);
-			}
 		}
 
 		if ($this->appManager === 'null') {
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 0d68a3b622d..4786af4733f 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -1296,3 +1296,11 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 	margin-bottom: 12px;
 	opacity: .7;
 }
+
+.settings-caption {
+	font-weight: bold;
+	line-height: 44px;
+	padding: 0 12px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
diff --git a/settings/templates/admin/frame.php b/settings/templates/settings/frame.php
similarity index 65%
rename from settings/templates/admin/frame.php
rename to settings/templates/settings/frame.php
index 2b234f4cd9b..80737bc6f91 100644
--- a/settings/templates/admin/frame.php
+++ b/settings/templates/settings/frame.php
@@ -30,9 +30,39 @@ script('files', 'jquery.fileupload');
 
 <div id="app-navigation">
 	<ul>
+		<li class="settings-caption">Personal</li>
 		<?php
-		foreach($_['forms'] as $form) {
+		foreach($_['forms']['personal'] as $form) {
 			if (isset($form['anchor'])) {
+				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]);
+				$class = 'nav-icon-' . $form['anchor'];
+				$sectionName = $form['section-name'];
+				$active = $form['active'] ? ' class="active"' : '';
+				?>
+				<li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?>>
+					<a href="<?php p($anchor); ?>">
+						<?php if (!empty($form['icon'])) { ?>
+							<img alt="" src="<?php print_unescaped($form['icon']); ?>">
+							<span><?php p($form['section-name']); ?></span>
+						<?php } else { ?>
+							<span class="no-icon"><?php p($form['section-name']); ?></span>
+						<?php } ?>
+					</a>
+				</li>
+				<?php
+			}
+		}
+		?>
+
+		<?php
+		if(!empty($_['forms']['admin'])) {
+			?>
+			<li class="settings-caption">Administration</li>
+			<?php
+		}
+		foreach($_['forms']['admin'] as $form) {
+			if (isset($form['anchor'])) {
+
 				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]);
 				$class = 'nav-icon-' . $form['anchor'];
 				$sectionName = $form['section-name'];