diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php
index e2bcb6813b6c7..7d0a26eea93ef 100644
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -5,7 +5,7 @@
 script('core', 'multiselect');
 ?>
 <form id="ocDefaultEncryptionModule" class="section">
-	<h2><?php p($l->t('Basic encryption module')); ?></h2>
+	<h2 data-anchor-name="basic-encryption-module"><?php p($l->t('Basic encryption module')); ?></h2>
 
 	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
 
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 610bc2f0e6b8f..bac89e26b0927 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -114,3 +114,7 @@ td.mountPoint, td.backend { width:160px; }
 #externalStorage .mountOptionsDropdown {
 	margin-right: 40px;
 }
+
+.nav-icon-external-storage {
+	background-image: url('../img/app-dark.svg?v=1');
+}
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 9d8c179dd3221..bbd79994e399c 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -88,7 +88,7 @@ function writeParameterInput($parameter, $options, $classes = []) {
 ?>
 
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
-	<h2><?php p($l->t('External storage')); ?></h2>
+	<h2 data-anchor-name="external-storage"><?php p($l->t('External storage')); ?></h2>
 	<?php if (isset($_['dependencies']) and ($_['dependencies']<>'') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
 		<thead>
diff --git a/apps/twofactor_backupcodes/templates/personal.php b/apps/twofactor_backupcodes/templates/personal.php
index 23b06e230582f..3076e16a166bf 100644
--- a/apps/twofactor_backupcodes/templates/personal.php
+++ b/apps/twofactor_backupcodes/templates/personal.php
@@ -7,6 +7,6 @@
 ?>
 
 <div class="section">
-    <h2><?php p($l->t('Second-factor backup codes')); ?></h2>
+    <h2 data-anchor-name="second-factor-backup-codes"><?php p($l->t('Second-factor backup codes')); ?></h2>
     <div id="twofactor-backupcodes-settings"></div>
 </div>
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 0a1d4e046feb1..65709c9578acb 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -26,6 +26,9 @@ input#openid, input#webdav { width:20em; }
 .nav-icon-second-factor-backup-codes {
 	background-image: url('../img/password.svg?v=1');
 }
+.nav-icon-ssl-root-certificate {
+	background-image: url('../img/password.svg?v=1');
+}
 
 #avatarform {
 	min-width: 145px;
diff --git a/settings/personal.php b/settings/personal.php
index 2c46a9f8dd291..6cbcc330cd929 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -220,8 +220,13 @@
 	if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
 		$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
 		$sectionName = str_replace('</h2>', '', $sectionName);
-		$anchor = strtolower($sectionName);
-		$anchor = str_replace(' ', '-', $anchor);
+		if (strpos($regs['class'], 'data-anchor-name') !== false) {
+			preg_match('%.*data-anchor-name="(?P<anchor>[^"]*)"%i', $regs['class'], $matches);
+			$anchor = $matches['anchor'];
+		} else {
+			$anchor = strtolower($sectionName);
+			$anchor = str_replace(' ', '-', $anchor);
+		}
 
 		return array(
 			'anchor' => $anchor,
diff --git a/settings/templates/certificates.php b/settings/templates/certificates.php
index 16f8dda31ad61..ac0a22938003c 100644
--- a/settings/templates/certificates.php
+++ b/settings/templates/certificates.php
@@ -1,5 +1,5 @@
 <div class="section">
-	<h2><?php p($l->t('SSL Root Certificates')); ?></h2>
+	<h2 data-anchor-name="ssl-root-certificate"><?php p($l->t('SSL Root Certificates')); ?></h2>
 	<table id="sslCertificate" class="grid" data-type="<?php p($_['type']); ?>">
 		<thead>
 			<tr>