diff --git a/tests/unit/__snapshots__/AppNavigation.spec.js.snap b/tests/unit/__snapshots__/AppNavigation.spec.js.snap
index d8cf57f..d87d44e 100644
--- a/tests/unit/__snapshots__/AppNavigation.spec.js.snap
+++ b/tests/unit/__snapshots__/AppNavigation.spec.js.snap
@@ -462,15 +462,6 @@
                   appNavigation.powerRestorePolicy
                 
                 </a>
-                <a
-                  class="nav-link"
-                  data-test-id="nav-item-security-settings"
-                  href="#/settings/security-settings"
-                >
-                  
-                  appNavigation.securitySettings
-                
-                </a>
               </li>
             </ul>
           </transition-stub>
@@ -479,10 +470,10 @@
           class="nav-item"
         >
           <button
-            aria-controls="access-control"
+            aria-controls="security-and-access"
             aria-expanded="false"
             class="btn btn-link collapsed"
-            data-test-id="nav-button-access-control"
+            data-test-id="nav-button-security-and-access"
             type="button"
           >
             <svg
@@ -496,16 +487,14 @@
               xmlns="http://www.w3.org/2000/svg"
             >
               <path
-                d="M21,2a8.9977,8.9977,0,0,0-8.6119,11.6118L2,24v6H8L18.3881,19.6118A9,9,0,1,0,21,2Zm0,16a7.0125,7.0125,0,0,1-2.0322-.3022L17.821,17.35l-.8472.8472-3.1811,3.1812L12.4141,20,11,21.4141l1.3787,1.3786-1.5859,1.586L9.4141,23,8,24.4141l1.3787,1.3786L7.1716,28H4V24.8284l9.8023-9.8023.8472-.8474-.3473-1.1467A7,7,0,1,1,21,18Z"
+                d="M14 16.59L11.41 14 10 15.41 14 19.41 22 11.41 20.59 10 14 16.59z"
               />
-              <circle
-                cx="22"
-                cy="10"
-                r="2"
+              <path
+                d="M16,30,9.8242,26.7071A10.9818,10.9818,0,0,1,4,17V4A2.0021,2.0021,0,0,1,6,2H26a2.0021,2.0021,0,0,1,2,2V17a10.9818,10.9818,0,0,1-5.8242,9.7071ZM6,4V17a8.9852,8.9852,0,0,0,4.7656,7.9423L16,27.7333l5.2344-2.791A8.9852,8.9852,0,0,0,26,17V4Z"
               />
             </svg>
             
-              appNavigation.accessControl
+              appNavigation.securityAndAccess
               
             <svg
               aria-hidden="true"
@@ -536,7 +525,7 @@
           >
             <ul
               class="collapse"
-              id="access-control"
+              id="security-and-access"
               style="display: none;"
             >
               <li
@@ -544,17 +533,17 @@
               >
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-client-sessions"
-                  href="#/access-control/client-sessions"
+                  data-test-id="nav-item-sessions"
+                  href="#/security-and-access/sessions"
                 >
                   
-                  appNavigation.clientSessions
+                  appNavigation.sessions
                 
                 </a>
                 <a
                   class="nav-link"
                   data-test-id="nav-item-ldap"
-                  href="#/access-control/ldap"
+                  href="#/security-and-access/ldap"
                 >
                   
                   appNavigation.ldap
@@ -562,20 +551,29 @@
                 </a>
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-local-user-management"
-                  href="#/access-control/local-user-management"
+                  data-test-id="nav-item-user-management"
+                  href="#/security-and-access/user-management"
                 >
                   
-                  appNavigation.localUserManagement
+                  appNavigation.userManagement
                 
                 </a>
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-ssl-certificates"
-                  href="#/access-control/ssl-certificates"
+                  data-test-id="nav-item-policies"
+                  href="#/security-and-access/policies"
                 >
                   
-                  appNavigation.sslCertificates
+                  appNavigation.policies
+                
+                </a>
+                <a
+                  class="nav-link"
+                  data-test-id="nav-item-certificates"
+                  href="#/security-and-access/certificates"
+                >
+                  
+                  appNavigation.certificates
                 
                 </a>
               </li>
@@ -1056,15 +1054,6 @@
                   appNavigation.powerRestorePolicy
                 
                 </a>
-                <a
-                  class="nav-link"
-                  data-test-id="nav-item-security-settings"
-                  href="#/settings/security-settings"
-                >
-                  
-                  appNavigation.securitySettings
-                
-                </a>
               </li>
             </ul>
           </transition-stub>
@@ -1073,10 +1062,10 @@
           class="nav-item"
         >
           <button
-            aria-controls="access-control"
+            aria-controls="security-and-access"
             aria-expanded="false"
             class="btn btn-link collapsed"
-            data-test-id="nav-button-access-control"
+            data-test-id="nav-button-security-and-access"
             type="button"
           >
             <svg
@@ -1090,16 +1079,14 @@
               xmlns="http://www.w3.org/2000/svg"
             >
               <path
-                d="M21,2a8.9977,8.9977,0,0,0-8.6119,11.6118L2,24v6H8L18.3881,19.6118A9,9,0,1,0,21,2Zm0,16a7.0125,7.0125,0,0,1-2.0322-.3022L17.821,17.35l-.8472.8472-3.1811,3.1812L12.4141,20,11,21.4141l1.3787,1.3786-1.5859,1.586L9.4141,23,8,24.4141l1.3787,1.3786L7.1716,28H4V24.8284l9.8023-9.8023.8472-.8474-.3473-1.1467A7,7,0,1,1,21,18Z"
+                d="M14 16.59L11.41 14 10 15.41 14 19.41 22 11.41 20.59 10 14 16.59z"
               />
-              <circle
-                cx="22"
-                cy="10"
-                r="2"
+              <path
+                d="M16,30,9.8242,26.7071A10.9818,10.9818,0,0,1,4,17V4A2.0021,2.0021,0,0,1,6,2H26a2.0021,2.0021,0,0,1,2,2V17a10.9818,10.9818,0,0,1-5.8242,9.7071ZM6,4V17a8.9852,8.9852,0,0,0,4.7656,7.9423L16,27.7333l5.2344-2.791A8.9852,8.9852,0,0,0,26,17V4Z"
               />
             </svg>
             
-              appNavigation.accessControl
+              appNavigation.securityAndAccess
               
             <svg
               aria-hidden="true"
@@ -1130,7 +1117,7 @@
           >
             <ul
               class="collapse"
-              id="access-control"
+              id="security-and-access"
               style="display: none;"
             >
               <li
@@ -1138,17 +1125,17 @@
               >
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-client-sessions"
-                  href="#/access-control/client-sessions"
+                  data-test-id="nav-item-sessions"
+                  href="#/security-and-access/sessions"
                 >
                   
-                  appNavigation.clientSessions
+                  appNavigation.sessions
                 
                 </a>
                 <a
                   class="nav-link"
                   data-test-id="nav-item-ldap"
-                  href="#/access-control/ldap"
+                  href="#/security-and-access/ldap"
                 >
                   
                   appNavigation.ldap
@@ -1156,20 +1143,29 @@
                 </a>
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-local-user-management"
-                  href="#/access-control/local-user-management"
+                  data-test-id="nav-item-user-management"
+                  href="#/security-and-access/user-management"
                 >
                   
-                  appNavigation.localUserManagement
+                  appNavigation.userManagement
                 
                 </a>
                 <a
                   class="nav-link"
-                  data-test-id="nav-item-ssl-certificates"
-                  href="#/access-control/ssl-certificates"
+                  data-test-id="nav-item-policies"
+                  href="#/security-and-access/policies"
                 >
                   
-                  appNavigation.sslCertificates
+                  appNavigation.policies
+                
+                </a>
+                <a
+                  class="nav-link"
+                  data-test-id="nav-item-certificates"
+                  href="#/security-and-access/certificates"
+                >
+                  
+                  appNavigation.certificates
                 
                 </a>
               </li>