From bb75e0846a541affb63d6cbccc00c29d78f9ffb6 Mon Sep 17 00:00:00 2001
From: Vault Automation <github-team-secure-vault-core@hashicorp.com>
Date: Thu, 22 Jan 2026 17:55:18 -0800
Subject: [PATCH] [UI][VAULT-41961] Update Access nav and breadcrumbs (#11869)
 (#11915)

* Update access nav and breadcrumbs

* Fix tsts and update permissions

* Remove pausetest

* Check if root is an array

* Fix edit breadcrumb

* Fix more tests!

* Fix logic

Co-authored-by: Kianna <30884335+kiannaquach@users.noreply.github.com>
---
 ui/app/components/identity/entity-nav.hbs     |  11 +-
 .../mfa/mfa-login-enforcement-header.js       |   5 +
 ui/app/components/oidc/client-form.js         |   8 +-
 ui/app/components/oidc/provider-form.js       |   8 +-
 ui/app/components/oidc/scope-form.js          |   8 +-
 ui/app/components/page/policy-show.ts         |   1 +
 .../vault/cluster/access/leases/list.js       |  20 ++-
 .../vault/cluster/access/leases/show.js       |  20 ++-
 .../cluster/access/control-group-accessor.hbs |  12 +-
 .../access/control-groups-configure.hbs       |  14 +-
 .../vault/cluster/access/control-groups.hbs   |  17 ++-
 .../vault/cluster/access/identity/create.hbs  |  14 +-
 .../mfa/enforcements/enforcement/index.hbs    |   1 +
 .../cluster/access/mfa/methods/create.hbs     |   1 +
 .../access/mfa/methods/method/index.hbs       |   1 +
 .../vault/cluster/access/namespaces/index.hbs |   4 +-
 .../oidc/assignments/assignment/details.hbs   |   1 +
 .../oidc/assignments/assignment/edit.hbs      |   1 +
 .../access/oidc/assignments/create.hbs        |   1 +
 .../cluster/access/oidc/clients/client.hbs    |   1 +
 .../vault/cluster/access/oidc/keys/create.hbs |   6 +-
 .../vault/cluster/access/oidc/keys/key.hbs    |   6 +-
 .../access/oidc/providers/provider.hbs        |   1 +
 .../access/oidc/scopes/scope/details.hbs      |   6 +-
 ui/app/templates/vault/cluster/policies.hbs   |   2 +-
 .../vault/cluster/policies/create.hbs         |   1 +
 .../vault/cluster/policies/index.hbs          |   8 ++
 ui/app/templates/vault/cluster/policy.hbs     |   2 +-
 .../templates/vault/cluster/policy/edit.hbs   |   1 +
 .../addon/components/key-value-header.hbs     |   1 +
 .../core/addon/components/key-value-header.js |   6 +-
 .../addon/components/sidebar/nav/access.hbs   | 132 +++++++++++-------
 .../addon/components/sidebar/nav/cluster.hbs  |  16 +--
 .../addon/components/sidebar/nav/cluster.js   |  27 ++++
 .../addon/components/sidebar/nav/policies.hbs |  44 ------
 .../app/components/sidebar/nav/policies.js    |   6 -
 ui/tests/acceptance/access/methods-test.js    |   4 +-
 .../access/namespaces/index-test.js           |   7 +-
 ui/tests/acceptance/chroot-namespace-test.js  |  10 +-
 ui/tests/acceptance/cluster-test.js           |   8 +-
 .../acceptance/enterprise-sidebar-nav-test.js |  40 +++++-
 .../acceptance/mfa-login-enforcement-test.js  |   8 +-
 ui/tests/acceptance/mfa-method-test.js        |  10 +-
 .../oidc-config/providers-scopes-test.js      |   6 +-
 ui/tests/acceptance/policy/index-test.js      |   2 +-
 ui/tests/acceptance/policy/policies-test.js   |   2 +-
 ui/tests/acceptance/sidebar-nav-test.js       |  29 ++--
 .../components/sidebar/nav/access-test.js     |  17 +--
 .../components/sidebar/nav/cluster-test.js    |   1 -
 .../components/sidebar/nav/policies-test.js   |  62 --------
 50 files changed, 352 insertions(+), 268 deletions(-)
 delete mode 100644 ui/lib/core/addon/components/sidebar/nav/policies.hbs
 delete mode 100644 ui/lib/core/app/components/sidebar/nav/policies.js
 delete mode 100644 ui/tests/integration/components/sidebar/nav/policies-test.js

diff --git a/ui/app/components/identity/entity-nav.hbs b/ui/app/components/identity/entity-nav.hbs
index d6ce787145..47e855fec9 100644
--- a/ui/app/components/identity/entity-nav.hbs
+++ b/ui/app/components/identity/entity-nav.hbs
@@ -3,7 +3,16 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Page::Header @title={{titleize (pluralize this.identityType)}} />
+<Page::Header @title={{titleize (pluralize this.identityType)}}>
+  <:breadcrumbs>
+    <Page::Breadcrumbs
+      @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
+        (hash label=(titleize (pluralize this.identityType)))
+      }}
+    />
+  </:breadcrumbs>
+</Page::Header>
 
 <nav class="tabs" aria-label="navigation for entities">
   <ul>
diff --git a/ui/app/components/mfa/mfa-login-enforcement-header.js b/ui/app/components/mfa/mfa-login-enforcement-header.js
index 50f42adfdb..d81edc630f 100644
--- a/ui/app/components/mfa/mfa-login-enforcement-header.js
+++ b/ui/app/components/mfa/mfa-login-enforcement-header.js
@@ -40,6 +40,11 @@ export default class MfaLoginEnforcementHeaderComponent extends Component {
 
   get breadcrumbs() {
     return [
+      {
+        label: 'Vault',
+        route: 'vault.cluster.dashboard',
+        icon: 'vault',
+      },
       {
         label: 'Enforcements',
         route: 'vault.cluster.access.mfa.enforcements.index',
diff --git a/ui/app/components/oidc/client-form.js b/ui/app/components/oidc/client-form.js
index 2dc6848a98..cfbc353909 100644
--- a/ui/app/components/oidc/client-form.js
+++ b/ui/app/components/oidc/client-form.js
@@ -33,14 +33,18 @@ export default class OidcClientForm extends Component {
       : 'limited';
 
   get breadcrumbs() {
-    const firstBreadcrumb = this.args.model.isNew
+    const applicationOrDetailsBreadcrumb = this.args.model.isNew
       ? { label: 'Applications', route: 'vault.cluster.access.oidc.clients' }
       : {
           label: 'Details',
           route: 'vault.cluster.access.oidc.clients.client.details',
           model: this.args.model.name,
         };
-    return [firstBreadcrumb, { label: this.args.model.isNew ? 'Create Application' : 'Edit Application' }];
+    return [
+      { label: 'Vault', route: 'vault.cluster.dashboard', icon: 'vault' },
+      applicationOrDetailsBreadcrumb,
+      { label: this.args.model.isNew ? 'Create Application' : 'Edit Application' },
+    ];
   }
 
   get modelAssignments() {
diff --git a/ui/app/components/oidc/provider-form.js b/ui/app/components/oidc/provider-form.js
index 90964c7800..0fc2431702 100644
--- a/ui/app/components/oidc/provider-form.js
+++ b/ui/app/components/oidc/provider-form.js
@@ -37,14 +37,18 @@ export default class OidcProviderForm extends Component {
       : 'limited';
 
   get breadcrumbs() {
-    const firstBreadcrumb = this.args.model.isNew
+    const providersOrDetailsBreadcrumb = this.args.model.isNew
       ? { label: 'Providers', route: 'vault.cluster.access.oidc.providers' }
       : {
           label: 'Details',
           route: 'vault.cluster.access.oidc.providers.provider.details',
           model: this.args.model.name,
         };
-    return [firstBreadcrumb, { label: this.args.model.isNew ? 'Create Provider' : 'Edit Provider' }];
+    return [
+      { label: 'Vault', route: 'vault.cluster.dashboard', icon: 'vault' },
+      providersOrDetailsBreadcrumb,
+      { label: this.args.model.isNew ? 'Create Provider' : 'Edit Provider' },
+    ];
   }
 
   // function passed to search select
diff --git a/ui/app/components/oidc/scope-form.js b/ui/app/components/oidc/scope-form.js
index 2a97c50f98..6eb26ba9ae 100644
--- a/ui/app/components/oidc/scope-form.js
+++ b/ui/app/components/oidc/scope-form.js
@@ -40,14 +40,18 @@ export default class OidcScopeFormComponent extends Component {
 }`;
 
   get breadcrumbs() {
-    const firstBreadcrumb = this.args.model.isNew
+    const scopesOrDetailsBreadcrumb = this.args.model.isNew
       ? { label: 'Scopes', route: 'vault.cluster.access.oidc.scopes' }
       : {
           label: 'Details',
           route: 'vault.cluster.access.oidc.scopes.scope.details',
           model: this.args.model.name,
         };
-    return [firstBreadcrumb, { label: this.args.model.isNew ? 'Create Scope' : 'Edit Scope' }];
+    return [
+      { label: 'Vault', route: 'vault.cluster.dashboard', icon: 'vault' },
+      scopesOrDetailsBreadcrumb,
+      { label: this.args.model.isNew ? 'Create Scope' : 'Edit Scope' },
+    ];
   }
 
   @task
diff --git a/ui/app/components/page/policy-show.ts b/ui/app/components/page/policy-show.ts
index a1f816f7a9..ba924dc5ca 100644
--- a/ui/app/components/page/policy-show.ts
+++ b/ui/app/components/page/policy-show.ts
@@ -16,6 +16,7 @@ export default class PagePolicyShow extends Component<Args> {
     // Provide defaults so crumbs don't error as the component is torn down
     const { policyType = 'acl', id = 'policy' } = this.args.model || {};
     return [
+      { label: 'Vault', route: 'vault.cluster.dashboard', icon: 'vault' },
       {
         label: `${policyType.toUpperCase()} policies`,
         route: 'vault.cluster.policies',
diff --git a/ui/app/controllers/vault/cluster/access/leases/list.js b/ui/app/controllers/vault/cluster/access/leases/list.js
index 4735c8aa32..fa8914c0bf 100644
--- a/ui/app/controllers/vault/cluster/access/leases/list.js
+++ b/ui/app/controllers/vault/cluster/access/leases/list.js
@@ -25,12 +25,20 @@ export default Controller.extend(ListController, {
   },
 
   backendCrumb: computed('clusterController.model.name', function () {
-    return {
-      label: 'Leases',
-      text: 'Leases',
-      path: 'vault.cluster.access.leases.list-root',
-      model: this.clusterController.model.name,
-    };
+    return [
+      {
+        label: 'Vault',
+        text: 'Vault',
+        path: 'vault.cluster.dashboard',
+        icon: 'vault',
+      },
+      {
+        label: 'Leases',
+        text: 'Leases',
+        path: 'vault.cluster.access.leases.list-root',
+        model: this.clusterController.model.name,
+      },
+    ];
   }),
 
   isLoading: false,
diff --git a/ui/app/controllers/vault/cluster/access/leases/show.js b/ui/app/controllers/vault/cluster/access/leases/show.js
index 4b84a3b536..7011552905 100644
--- a/ui/app/controllers/vault/cluster/access/leases/show.js
+++ b/ui/app/controllers/vault/cluster/access/leases/show.js
@@ -12,12 +12,20 @@ export default Controller.extend({
   clusterController: controller('vault.cluster'),
 
   backendCrumb: computed('clusterController.model.name', function () {
-    return {
-      label: 'Leases',
-      text: 'Leases',
-      path: 'vault.cluster.access.leases.list-root',
-      model: this.clusterController.model.name,
-    };
+    return [
+      {
+        label: 'Vault',
+        text: 'Vault',
+        path: 'vault.cluster.dashboard',
+        icon: 'vault',
+      },
+      {
+        label: 'Leases',
+        text: 'Leases',
+        path: 'vault.cluster.access.leases.list-root',
+        model: this.clusterController.model.name,
+      },
+    ];
   }),
 
   flashMessages: service(),
diff --git a/ui/app/templates/vault/cluster/access/control-group-accessor.hbs b/ui/app/templates/vault/cluster/access/control-group-accessor.hbs
index f62fb06d90..fb54704c93 100644
--- a/ui/app/templates/vault/cluster/access/control-group-accessor.hbs
+++ b/ui/app/templates/vault/cluster/access/control-group-accessor.hbs
@@ -4,7 +4,17 @@
 }}
 
 {{#if (has-feature "Control Groups")}}
-  <Page::Header @title="Control Groups" />
+  <Page::Header @title="Approval workflow">
+    <:breadcrumbs>
+      <Page::Breadcrumbs
+        @breadcrumbs={{array
+          (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
+          (hash label="Approval workflow" route="vault.cluster.access.control-groups")
+          (hash label="Accessor")
+        }}
+      />
+    </:breadcrumbs>
+  </Page::Header>
 
   {{#if this.model.canConfigure}}
     <Toolbar>
diff --git a/ui/app/templates/vault/cluster/access/control-groups-configure.hbs b/ui/app/templates/vault/cluster/access/control-groups-configure.hbs
index 8b9947c5a9..3d6abdc38a 100644
--- a/ui/app/templates/vault/cluster/access/control-groups-configure.hbs
+++ b/ui/app/templates/vault/cluster/access/control-groups-configure.hbs
@@ -4,9 +4,19 @@
 }}
 
 {{#if (has-feature "Control Groups")}}
-  <Page::Header @title="Control Groups" />
+  <Page::Header @title="Approval workflow">
+    <:breadcrumbs>
+      <Page::Breadcrumbs
+        @breadcrumbs={{array
+          (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
+          (hash label="Approval workflow" route="vault.cluster.access.control-groups")
+          (hash label="Configure")
+        }}
+      />
+    </:breadcrumbs>
+  </Page::Header>
 
   <EditForm @model={{this.model}} @onSave={{action "onSave"}} />
 {{else}}
-  <UpgradePage @title="Control Groups" @minimumEdition="Vault Enterprise Premium" />
+  <UpgradePage @title="Approval workflow" @minimumEdition="Vault Enterprise Premium" />
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/access/control-groups.hbs b/ui/app/templates/vault/cluster/access/control-groups.hbs
index a13eaffdf2..c1aad5a3e6 100644
--- a/ui/app/templates/vault/cluster/access/control-groups.hbs
+++ b/ui/app/templates/vault/cluster/access/control-groups.hbs
@@ -4,7 +4,16 @@
 }}
 
 {{#if (has-feature "Control Groups")}}
-  <Page::Header @title="Control Groups" />
+  <Page::Header @title="Approval workflow">
+    <:breadcrumbs>
+      <Page::Breadcrumbs
+        @breadcrumbs={{array
+          (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
+          (hash label="Approval workflow" route="vault.cluster.access.control-groups")
+        }}
+      />
+    </:breadcrumbs>
+  </Page::Header>
   {{#if this.model.canConfigure}}
     <Toolbar>
       <ToolbarActions>
@@ -17,8 +26,8 @@
   <form {{action (nav-to-route "vault.cluster.access.control-group-accessor" this.model.id) on="submit"}}>
     <div class="box is-sideless is-fullwidth is-marginless">
       <p class="has-text-grey is-size-8">
-        Control Groups add additional authorization factors to be required before satisfying a request. If you have a Control
-        Group accessor, provide it here to view the lookup the authorization progress.
+        Approval workflows add additional authorization factors to be required before satisfying a request. If you have a
+        Control Group accessor, provide it here to view the lookup the authorization progress.
       </p>
       <label for="accessor" class="is-label">
         Accessor
@@ -32,5 +41,5 @@
     </div>
   </form>
 {{else}}
-  <UpgradePage @title="Control Groups" @minimumEdition="Vault Enterprise Premium" />
+  <UpgradePage @title="Approval workflow" @minimumEdition="Vault Enterprise Premium" />
 {{/if}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/access/identity/create.hbs b/ui/app/templates/vault/cluster/access/identity/create.hbs
index d71afa918a..80910137cc 100644
--- a/ui/app/templates/vault/cluster/access/identity/create.hbs
+++ b/ui/app/templates/vault/cluster/access/identity/create.hbs
@@ -3,6 +3,18 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Page::Header @title="Create {{titleize this.model.identityType}}" />
+<Page::Header @title="Create {{titleize this.model.identityType}}">
+  <:breadcrumbs>
+    <Page::Breadcrumbs
+      @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
+        (hash
+          label=(titleize this.model.identityType) route="vault.cluster.access.identity" model=(pluralize this.identityType)
+        )
+        (hash label="Create")
+      }}
+    />
+  </:breadcrumbs>
+</Page::Header>
 
 <Identity::EditForm @model={{this.model}} @onSave={{action "navAfterSave"}} />
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/access/mfa/enforcements/enforcement/index.hbs b/ui/app/templates/vault/cluster/access/mfa/enforcements/enforcement/index.hbs
index 75c16863cd..a467b800d9 100644
--- a/ui/app/templates/vault/cluster/access/mfa/enforcements/enforcement/index.hbs
+++ b/ui/app/templates/vault/cluster/access/mfa/enforcements/enforcement/index.hbs
@@ -7,6 +7,7 @@
   <:breadcrumbs>
     <Page::Breadcrumbs
       @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
         (hash label="Enforcements" route="vault.cluster.access.mfa.enforcements.index")
         (hash label=this.model.name)
       }}
diff --git a/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs b/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs
index 6b8889a275..c59d149a90 100644
--- a/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs
+++ b/ui/app/templates/vault/cluster/access/mfa/methods/create.hbs
@@ -7,6 +7,7 @@
   <:breadcrumbs>
     <Page::Breadcrumbs
       @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
         (hash label="Methods" route="vault.cluster.access.mfa.methods.index")
         (hash label="Configure MFA Method")
       }}
diff --git a/ui/app/templates/vault/cluster/access/mfa/methods/method/index.hbs b/ui/app/templates/vault/cluster/access/mfa/methods/method/index.hbs
index 11a18bdf7b..439f95b553 100644
--- a/ui/app/templates/vault/cluster/access/mfa/methods/method/index.hbs
+++ b/ui/app/templates/vault/cluster/access/mfa/methods/method/index.hbs
@@ -7,6 +7,7 @@
   <:breadcrumbs>
     <Page::Breadcrumbs
       @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
         (hash label="Methods" route="vault.cluster.access.mfa.methods.index")
         (hash label=this.model.method.name)
       }}
diff --git a/ui/app/templates/vault/cluster/access/namespaces/index.hbs b/ui/app/templates/vault/cluster/access/namespaces/index.hbs
index 02bc0907a1..1cf5b0da16 100644
--- a/ui/app/templates/vault/cluster/access/namespaces/index.hbs
+++ b/ui/app/templates/vault/cluster/access/namespaces/index.hbs
@@ -6,7 +6,9 @@
 {{#if (has-feature "Namespaces")}}
   <Page::Header @title="Namespaces">
     <:breadcrumbs>
-      <Page::Breadcrumbs @breadcrumbs={{array (hash label="Namespaces")}} />
+      <Page::Breadcrumbs
+        @breadcrumbs={{array (hash label="Vault" route="vault.cluster.dashboard" icon="vault") (hash label="Namespaces")}}
+      />
     </:breadcrumbs>
   </Page::Header>
 
diff --git a/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/details.hbs b/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/details.hbs
index 9cc4939ef1..d1a046462e 100644
--- a/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/details.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/details.hbs
@@ -7,6 +7,7 @@
   <:breadcrumbs>
     <Page::Breadcrumbs
       @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
         (hash label="Assignments" route="vault.cluster.access.oidc.assignments")
         (hash label=@model.name)
       }}
diff --git a/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/edit.hbs b/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/edit.hbs
index a11a6c5b5e..140297d1a3 100644
--- a/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/edit.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/assignments/assignment/edit.hbs
@@ -7,6 +7,7 @@
   <:breadcrumbs>
     <Page::Breadcrumbs
       @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
         (hash label="Details" route="vault.cluster.access.oidc.assignments.assignment.details" model=this.model.name)
         (hash label="Edit Assignment")
       }}
diff --git a/ui/app/templates/vault/cluster/access/oidc/assignments/create.hbs b/ui/app/templates/vault/cluster/access/oidc/assignments/create.hbs
index 6b4530a9fd..6d4f8e981d 100644
--- a/ui/app/templates/vault/cluster/access/oidc/assignments/create.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/assignments/create.hbs
@@ -7,6 +7,7 @@
   <:breadcrumbs>
     <Page::Breadcrumbs
       @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
         (hash label="Assignments" route="vault.cluster.access.oidc.assignments")
         (hash label="Create Assignment")
       }}
diff --git a/ui/app/templates/vault/cluster/access/oidc/clients/client.hbs b/ui/app/templates/vault/cluster/access/oidc/clients/client.hbs
index 177cf9a207..82246ce588 100644
--- a/ui/app/templates/vault/cluster/access/oidc/clients/client.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/clients/client.hbs
@@ -8,6 +8,7 @@
     <:breadcrumbs>
       <Page::Breadcrumbs
         @breadcrumbs={{array
+          (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
           (hash label="Applications" route="vault.cluster.access.oidc.clients")
           (hash label=this.model.name)
         }}
diff --git a/ui/app/templates/vault/cluster/access/oidc/keys/create.hbs b/ui/app/templates/vault/cluster/access/oidc/keys/create.hbs
index 485344af38..819be39a86 100644
--- a/ui/app/templates/vault/cluster/access/oidc/keys/create.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/keys/create.hbs
@@ -6,7 +6,11 @@
 <Page::Header @title="Create Key">
   <:breadcrumbs>
     <Page::Breadcrumbs
-      @breadcrumbs={{array (hash label="Keys" route="vault.cluster.access.oidc.keys") (hash label="Create Key")}}
+      @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
+        (hash label="Keys" route="vault.cluster.access.oidc.keys")
+        (hash label="Create Key")
+      }}
     />
   </:breadcrumbs>
 </Page::Header>
diff --git a/ui/app/templates/vault/cluster/access/oidc/keys/key.hbs b/ui/app/templates/vault/cluster/access/oidc/keys/key.hbs
index d1bfc28d93..baf1a61774 100644
--- a/ui/app/templates/vault/cluster/access/oidc/keys/key.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/keys/key.hbs
@@ -7,7 +7,11 @@
   <Page::Header @title={{this.model.name}}>
     <:breadcrumbs>
       <Page::Breadcrumbs
-        @breadcrumbs={{array (hash label="Keys" route="vault.cluster.access.oidc.keys") (hash label=this.model.name)}}
+        @breadcrumbs={{array
+          (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
+          (hash label="Keys" route="vault.cluster.access.oidc.keys")
+          (hash label=this.model.name)
+        }}
       />
     </:breadcrumbs>
   </Page::Header>
diff --git a/ui/app/templates/vault/cluster/access/oidc/providers/provider.hbs b/ui/app/templates/vault/cluster/access/oidc/providers/provider.hbs
index 38be6c3435..808783c66c 100644
--- a/ui/app/templates/vault/cluster/access/oidc/providers/provider.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/providers/provider.hbs
@@ -8,6 +8,7 @@
     <:breadcrumbs>
       <Page::Breadcrumbs
         @breadcrumbs={{array
+          (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
           (hash label="Providers" route="vault.cluster.access.oidc.providers")
           (hash label=this.model.name)
         }}
diff --git a/ui/app/templates/vault/cluster/access/oidc/scopes/scope/details.hbs b/ui/app/templates/vault/cluster/access/oidc/scopes/scope/details.hbs
index 3c49786a59..aabf9ad76c 100644
--- a/ui/app/templates/vault/cluster/access/oidc/scopes/scope/details.hbs
+++ b/ui/app/templates/vault/cluster/access/oidc/scopes/scope/details.hbs
@@ -6,7 +6,11 @@
 <Page::Header @title={{this.model.name}}>
   <:breadcrumbs>
     <Page::Breadcrumbs
-      @breadcrumbs={{array (hash label="Scopes" route="vault.cluster.access.oidc.scopes") (hash label=this.model.name)}}
+      @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
+        (hash label="Scopes" route="vault.cluster.access.oidc.scopes")
+        (hash label=this.model.name)
+      }}
     />
   </:breadcrumbs>
 </Page::Header>
diff --git a/ui/app/templates/vault/cluster/policies.hbs b/ui/app/templates/vault/cluster/policies.hbs
index 8f409999be..2136badcf9 100644
--- a/ui/app/templates/vault/cluster/policies.hbs
+++ b/ui/app/templates/vault/cluster/policies.hbs
@@ -3,5 +3,5 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Sidebar::Nav::Policies />
+<Sidebar::Nav::Access />
 {{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/policies/create.hbs b/ui/app/templates/vault/cluster/policies/create.hbs
index 21291cedec..83ee389445 100644
--- a/ui/app/templates/vault/cluster/policies/create.hbs
+++ b/ui/app/templates/vault/cluster/policies/create.hbs
@@ -7,6 +7,7 @@
   <:breadcrumbs>
     <Page::Breadcrumbs
       @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
         (hash label=(concat (uppercase this.policyType) " policies") route="vault.cluster.policies" model=this.policyType)
         (hash label="Create")
       }}
diff --git a/ui/app/templates/vault/cluster/policies/index.hbs b/ui/app/templates/vault/cluster/policies/index.hbs
index d8878f47d0..3bf3a1432e 100644
--- a/ui/app/templates/vault/cluster/policies/index.hbs
+++ b/ui/app/templates/vault/cluster/policies/index.hbs
@@ -9,6 +9,14 @@
         <Hds::Badge @text="Sentinel" />
       {{/if}}
     </:badges>
+    <:breadcrumbs>
+      <Page::Breadcrumbs
+        @breadcrumbs={{array
+          (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
+          (hash label=(concat (uppercase this.policyType) " Policies"))
+        }}
+      />
+    </:breadcrumbs>
   </Page::Header>
   <Toolbar>
     {{#if this.model.meta.total}}
diff --git a/ui/app/templates/vault/cluster/policy.hbs b/ui/app/templates/vault/cluster/policy.hbs
index 8f409999be..2136badcf9 100644
--- a/ui/app/templates/vault/cluster/policy.hbs
+++ b/ui/app/templates/vault/cluster/policy.hbs
@@ -3,5 +3,5 @@
   SPDX-License-Identifier: BUSL-1.1
 }}
 
-<Sidebar::Nav::Policies />
+<Sidebar::Nav::Access />
 {{outlet}}
\ No newline at end of file
diff --git a/ui/app/templates/vault/cluster/policy/edit.hbs b/ui/app/templates/vault/cluster/policy/edit.hbs
index 6615cc6c5f..86616da842 100644
--- a/ui/app/templates/vault/cluster/policy/edit.hbs
+++ b/ui/app/templates/vault/cluster/policy/edit.hbs
@@ -7,6 +7,7 @@
   <:breadcrumbs>
     <Page::Breadcrumbs
       @breadcrumbs={{array
+        (hash label="Vault" route="vault.cluster.dashboard" icon="vault")
         (hash label=(concat (uppercase this.policyType) " policies") route="vault.cluster.policies" model=this.policyType)
         (hash label=this.model.id route="vault.cluster.policy.show" model=this.model.id)
         (hash label="Edit")
diff --git a/ui/lib/core/addon/components/key-value-header.hbs b/ui/lib/core/addon/components/key-value-header.hbs
index 8745fcd6b5..dbe21963de 100644
--- a/ui/lib/core/addon/components/key-value-header.hbs
+++ b/ui/lib/core/addon/components/key-value-header.hbs
@@ -10,6 +10,7 @@
         @text={{path.text}}
         @route={{path.path}}
         @model={{path.model}}
+        @icon={{path.icon}}
         data-test-secret-breadcrumb={{path.text}}
       />
     {{else}}
diff --git a/ui/lib/core/addon/components/key-value-header.js b/ui/lib/core/addon/components/key-value-header.js
index e28ae6ad1b..be0ab4bf62 100644
--- a/ui/lib/core/addon/components/key-value-header.js
+++ b/ui/lib/core/addon/components/key-value-header.js
@@ -49,7 +49,11 @@ export default class KeyValueHeader extends Component {
     const baseKeyModel = encodePath(this.args.baseKey?.id);
 
     if (root) {
-      crumbs.push(root);
+      if (Array.isArray(root)) {
+        crumbs.push(...root);
+      } else {
+        crumbs.push(root);
+      }
     }
 
     if (!baseKey) {
diff --git a/ui/lib/core/addon/components/sidebar/nav/access.hbs b/ui/lib/core/addon/components/sidebar/nav/access.hbs
index 036670eeea..7c601d6db4 100644
--- a/ui/lib/core/addon/components/sidebar/nav/access.hbs
+++ b/ui/lib/core/addon/components/sidebar/nav/access.hbs
@@ -18,59 +18,93 @@
     data-test-sidebar-nav-link="Back to main navigation"
   />
 
-  {{#if (has-permission "access" routeParams=(array "methods" "mfa" "oidc"))}}
-    <Nav.Title data-test-sidebar-nav-heading="Authentication">Authentication</Nav.Title>
+  {{! Policies }}
+  {{#if (or (has-permission "policies") (has-permission "access"))}}
+    <Nav.Title data-test-sidebar-nav-heading="Access control">Access control</Nav.Title>
   {{/if}}
-  {{#if (has-permission "access" routeParams="methods")}}
-    <Nav.Link
-      @route="vault.cluster.access.methods"
-      @current-when="vault.cluster.access.methods vault.cluster.access.method vault.cluster.settings.auth"
-      @text="Authentication Methods"
-      data-test-sidebar-nav-link="Authentication Methods"
-    />
-  {{/if}}
-  {{#if (has-permission "access" routeParams="mfa")}}
-    <Nav.Link
-      @route="vault.cluster.access.mfa.methods"
-      @current-when="vault.cluster.access.mfa.methods vault.cluster.access.mfa.enforcements vault.cluster.access.mfa.index"
-      @text="Multi-Factor Authentication"
-      data-test-sidebar-nav-link="Multi-Factor Authentication"
-    />
-  {{/if}}
-  {{#if (has-permission "access" routeParams="oidc")}}
-    <Nav.Link @route="vault.cluster.access.oidc" @text="OIDC Provider" data-test-sidebar-nav-link="OIDC Provider" />
+  {{#if (has-permission "policies")}}
+    {{#if (has-permission "policies" routeParams="acl")}}
+      <Nav.Link
+        @route="vault.cluster.policies"
+        @model="acl"
+        @current-when="vault.cluster.policies vault.cluster.policy"
+        @text="ACL policies"
+        data-test-sidebar-nav-link="ACL policies"
+      />
+    {{/if}}
+    {{#if (and (has-feature "Sentinel") (has-permission "policies" routeParams="rgp"))}}
+      <Nav.Link
+        @route="vault.cluster.policies"
+        @model="rgp"
+        @current-when="vault.cluster.policies vault.cluster.policy"
+        @text="Role governing policies"
+        data-test-sidebar-nav-link="Role governing policies"
+      />
+    {{/if}}
+    {{#if (and (has-feature "Sentinel") (has-permission "policies" routeParams="egp"))}}
+      <Nav.Link
+        @route="vault.cluster.policies"
+        @model="egp"
+        @current-when="vault.cluster.policies vault.cluster.policy"
+        @text="Endpoint governing policies"
+        data-test-sidebar-nav-link="Endpoint governing policies"
+      />
+    {{/if}}
   {{/if}}
 
-  {{#if (and (has-feature "Control Groups") (has-permission "access" routeParams="control-groups"))}}
-    <Nav.Title data-test-sidebar-nav-heading="Access Control">Access Control</Nav.Title>
-    <Nav.Link
-      @route="vault.cluster.access.control-groups"
-      @current-when="vault.cluster.access.control-groups vault.cluster.access.control-group-accessor vault.cluster.access.control-groups-configure"
-      @text="Control Groups"
-      data-test-sidebar-nav-link="Control Groups"
-    />
-  {{/if}}
+  {{#if (has-permission "access")}}
+    {{#if (and (has-feature "Control Groups") (has-permission "access" routeParams="control-groups"))}}
+      <Nav.Link
+        @route="vault.cluster.access.control-groups"
+        @current-when="vault.cluster.access.control-groups vault.cluster.access.control-group-accessor vault.cluster.access.control-groups-configure"
+        @text="Approval workflow"
+        data-test-sidebar-nav-link="Approval workflow"
+      />
+    {{/if}}
+    {{#if (has-permission "access" routeParams="leases")}}
+      <Nav.Link @route="vault.cluster.access.leases" @text="Leases" data-test-sidebar-nav-link="Leases" />
+    {{/if}}
 
-  {{#if (has-permission "access" routeParams=(array "namespaces" "groups" "entities"))}}
-    <Nav.Title data-test-sidebar-nav-heading="Organization">Organization</Nav.Title>
-  {{/if}}
-  {{#if (and (has-feature "Namespaces") (has-permission "access" routeParams="namespaces"))}}
-    <Nav.Link @route="vault.cluster.access.namespaces" @text="Namespaces" data-test-sidebar-nav-link="Namespaces" />
-  {{/if}}
-  {{#if (has-permission "access" routeParams="groups")}}
-    <Nav.Link @route="vault.cluster.access.identity" @model="groups" @text="Groups" data-test-sidebar-nav-link="Groups" />
-  {{/if}}
-  {{#if (has-permission "access" routeParams="entities")}}
-    <Nav.Link
-      @route="vault.cluster.access.identity"
-      @model="entities"
-      @text="Entities"
-      data-test-sidebar-nav-link="Entities"
-    />
-  {{/if}}
+    {{! Authentication }}
+    {{#if (has-permission "access" routeParams=(array "methods" "mfa" "oidc"))}}
+      <Nav.Title data-test-sidebar-nav-heading="Authentication">Authentication</Nav.Title>
+    {{/if}}
+    {{#if (has-permission "access" routeParams="methods")}}
+      <Nav.Link
+        @route="vault.cluster.access.methods"
+        @current-when="vault.cluster.access.methods vault.cluster.access.method vault.cluster.settings.auth"
+        @text="Authentication methods"
+        data-test-sidebar-nav-link="Authentication methods"
+      />
+    {{/if}}
+    {{#if (has-permission "access" routeParams="mfa")}}
+      <Nav.Link
+        @route="vault.cluster.access.mfa.methods"
+        @current-when="vault.cluster.access.mfa.methods vault.cluster.access.mfa.enforcements vault.cluster.access.mfa.index"
+        @text="Multi-factor authentication"
+        data-test-sidebar-nav-link="Multi-factor authentication"
+      />
+    {{/if}}
+    {{#if (has-permission "access" routeParams="oidc")}}
+      <Nav.Link @route="vault.cluster.access.oidc" @text="OIDC provider" data-test-sidebar-nav-link="OIDC provider" />
+    {{/if}}
 
-  {{#if (has-permission "access" routeParams="leases")}}
-    <Nav.Title data-test-sidebar-nav-heading="Administration">Administration</Nav.Title>
-    <Nav.Link @route="vault.cluster.access.leases" @text="Leases" data-test-sidebar-nav-link="Leases" />
+    {{#if (has-permission "access" routeParams=(array "namespaces" "groups" "entities"))}}
+      <Nav.Title data-test-sidebar-nav-heading="Organization">Organization</Nav.Title>
+    {{/if}}
+    {{#if (and (has-feature "Namespaces") (has-permission "access" routeParams="namespaces"))}}
+      <Nav.Link @route="vault.cluster.access.namespaces" @text="Namespaces" data-test-sidebar-nav-link="Namespaces" />
+    {{/if}}
+    {{#if (has-permission "access" routeParams="groups")}}
+      <Nav.Link @route="vault.cluster.access.identity" @model="groups" @text="Groups" data-test-sidebar-nav-link="Groups" />
+    {{/if}}
+    {{#if (has-permission "access" routeParams="entities")}}
+      <Nav.Link
+        @route="vault.cluster.access.identity"
+        @model="entities"
+        @text="Entities"
+        data-test-sidebar-nav-link="Entities"
+      />
+    {{/if}}
   {{/if}}
 </Hds::AppSideNav::Portal>
\ No newline at end of file
diff --git a/ui/lib/core/addon/components/sidebar/nav/cluster.hbs b/ui/lib/core/addon/components/sidebar/nav/cluster.hbs
index 299359de95..c380e02eb1 100644
--- a/ui/lib/core/addon/components/sidebar/nav/cluster.hbs
+++ b/ui/lib/core/addon/components/sidebar/nav/cluster.hbs
@@ -24,25 +24,15 @@
       data-test-sidebar-nav-link="Secrets Recovery"
     />
   {{/unless}}
-  {{#if (has-permission "access")}}
+  {{#if (or (has-permission "access") (has-permission "policies"))}}
     <Nav.Link
-      @route={{get (route-params-for "access") "route"}}
-      @models={{get (route-params-for "access") "models"}}
-      @current-when="vault.cluster.access vault.cluster.settings.auth"
+      @route={{this.accessRoute}}
+      @models={{this.accessRouteModels}}
       @text="Access"
       @hasSubItems={{true}}
       data-test-sidebar-nav-link="Access"
     />
   {{/if}}
-  {{#if (has-permission "policies")}}
-    <Nav.Link
-      @route="vault.cluster.policies"
-      @models={{get (route-params-for "policies") "models"}}
-      @text="Policies"
-      @hasSubItems={{true}}
-      data-test-sidebar-nav-link="Policies"
-    />
-  {{/if}}
   {{#if (has-permission "tools")}}
     <Nav.Link
       @route="vault.cluster.tools.tool"
diff --git a/ui/lib/core/addon/components/sidebar/nav/cluster.js b/ui/lib/core/addon/components/sidebar/nav/cluster.js
index d7dbd5387c..d0a55192e5 100644
--- a/ui/lib/core/addon/components/sidebar/nav/cluster.js
+++ b/ui/lib/core/addon/components/sidebar/nav/cluster.js
@@ -57,4 +57,31 @@ export default class SidebarNavClusterComponent extends Component {
     // otherwise we show the link depending on whether or not the feature exists
     return this.version.hasSecretsSync;
   }
+
+  get accessRoute() {
+    if (this.permissions.hasPermission('policies')) {
+      return 'vault.cluster.policies';
+    }
+
+    if (this.permissions.hasPermission('access')) {
+      return 'vault.cluster.access';
+    }
+
+    return null;
+  }
+
+  get accessRouteModels() {
+    if (this.permissions.hasPermission('policies')) {
+      return this.routeParamsFor('policies').models;
+    }
+    if (this.permissions.hasPermission('access')) {
+      return this.routeParamsFor('access').models;
+    }
+
+    return null;
+  }
+
+  routeParamsFor(routeName) {
+    return this.permissions.navPathParams(routeName);
+  }
 }
diff --git a/ui/lib/core/addon/components/sidebar/nav/policies.hbs b/ui/lib/core/addon/components/sidebar/nav/policies.hbs
deleted file mode 100644
index 8a6c825c81..0000000000
--- a/ui/lib/core/addon/components/sidebar/nav/policies.hbs
+++ /dev/null
@@ -1,44 +0,0 @@
-{{!
-  Copyright IBM Corp. 2016, 2025
-  SPDX-License-Identifier: BUSL-1.1
-}}
-
-<Hds::AppSideNav::Portal @ariaLabel="Policies Navigation Links" data-test-sidebar-nav-panel="Policies" as |Nav|>
-  <Nav.BackLink
-    @route="vault.cluster"
-    @current-when={{false}}
-    @icon="arrow-left"
-    @text="Back to main navigation"
-    data-test-sidebar-nav-link="Back to main navigation"
-  />
-
-  <Nav.Title data-test-sidebar-nav-heading="Policies">Policies</Nav.Title>
-
-  {{#if (has-permission "policies" routeParams="acl")}}
-    <Nav.Link
-      @route="vault.cluster.policies"
-      @model="acl"
-      @current-when="vault.cluster.policies vault.cluster.policy"
-      @text="ACL Policies"
-      data-test-sidebar-nav-link="ACL Policies"
-    />
-  {{/if}}
-  {{#if (and (has-feature "Sentinel") (has-permission "policies" routeParams="rgp"))}}
-    <Nav.Link
-      @route="vault.cluster.policies"
-      @model="rgp"
-      @current-when="vault.cluster.policies vault.cluster.policy"
-      @text="Role-Governing Policies"
-      data-test-sidebar-nav-link="Role-Governing Policies"
-    />
-  {{/if}}
-  {{#if (and (has-feature "Sentinel") (has-permission "policies" routeParams="egp"))}}
-    <Nav.Link
-      @route="vault.cluster.policies"
-      @model="egp"
-      @current-when="vault.cluster.policies vault.cluster.policy"
-      @text="Endpoint Governing Policies"
-      data-test-sidebar-nav-link="Endpoint Governing Policies"
-    />
-  {{/if}}
-</Hds::AppSideNav::Portal>
\ No newline at end of file
diff --git a/ui/lib/core/app/components/sidebar/nav/policies.js b/ui/lib/core/app/components/sidebar/nav/policies.js
deleted file mode 100644
index f673c91d66..0000000000
--- a/ui/lib/core/app/components/sidebar/nav/policies.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Copyright IBM Corp. 2016, 2025
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-export { default } from 'core/components/sidebar/nav/policies';
diff --git a/ui/tests/acceptance/access/methods-test.js b/ui/tests/acceptance/access/methods-test.js
index 512d33ec6f..18f4f9cb24 100644
--- a/ui/tests/acceptance/access/methods-test.js
+++ b/ui/tests/acceptance/access/methods-test.js
@@ -28,7 +28,7 @@ module('Acceptance | auth-methods list view', function (hooks) {
   test('it navigates to auth method', async function (assert) {
     await visit('/vault/access/');
     assert.strictEqual(currentRouteName(), 'vault.cluster.access.methods', 'navigates to the correct route');
-    assert.dom('[data-test-sidebar-nav-link="Authentication Methods"]').hasClass('active');
+    assert.dom('[data-test-sidebar-nav-link="Authentication methods"]').hasClass('active');
   });
 
   test('it filters by name and auth type', async function (assert) {
@@ -83,7 +83,7 @@ module('Acceptance | auth-methods list view', function (hooks) {
         .exists({ count: 1 }, `auth method ${key} appears in list view`);
     }
     await visit('/vault/settings/auth/enable');
-    await click(GENERAL.navLink('OIDC Provider'));
+    await click(GENERAL.navLink('OIDC provider'));
     await visit('/vault/access/');
     for (const [key] of Object.entries(authPayload)) {
       assert
diff --git a/ui/tests/acceptance/access/namespaces/index-test.js b/ui/tests/acceptance/access/namespaces/index-test.js
index b6a60bd247..861142d5d6 100644
--- a/ui/tests/acceptance/access/namespaces/index-test.js
+++ b/ui/tests/acceptance/access/namespaces/index-test.js
@@ -31,8 +31,11 @@ module('Acceptance | Enterprise | /access/namespaces', function (hooks) {
   });
 
   test('the route displays the breadcrumb trail', async function (assert) {
-    assert.dom(GENERAL.breadcrumb).exists({ count: 1 }, 'Only one breadcrumb is displayed');
-    assert.dom(GENERAL.breadcrumb).hasText('Namespaces', 'Breadcrumb trail is displayed correctly');
+    assert.dom(GENERAL.breadcrumb).exists({ count: 2 }, 'Only two breadcrumb is displayed');
+    assert.dom(GENERAL.breadcrumbAtIdx(0)).hasText('Vault', 'Breadcrumb trail is displayed correctly');
+    assert
+      .dom(GENERAL.currentBreadcrumb('Namespaces'))
+      .hasText('Namespaces', 'Namespace breadcrumb trail is displayed correctly');
   });
 
   test('the route should update namespace list after create/delete WITH manual refresh in the CLI', async function (assert) {
diff --git a/ui/tests/acceptance/chroot-namespace-test.js b/ui/tests/acceptance/chroot-namespace-test.js
index b06b7b16e5..f6252d0ae0 100644
--- a/ui/tests/acceptance/chroot-namespace-test.js
+++ b/ui/tests/acceptance/chroot-namespace-test.js
@@ -32,7 +32,7 @@ module('Acceptance | chroot-namespace enterprise ui', function (hooks) {
   test('root-only nav items are unavailable', async function (assert) {
     await login();
 
-    ['Dashboard', 'Secrets Engines', 'Access', 'Tools', 'Policies'].forEach((nav) => {
+    ['Dashboard', 'Secrets Engines', 'Access', 'Tools'].forEach((nav) => {
       assert.dom(navLink(nav)).exists(`Shows ${nav} nav item in chroot listener`);
     });
     // Client count is not root-only, but it is hidden for chroot
@@ -57,7 +57,7 @@ module('Acceptance | chroot-namespace enterprise ui', function (hooks) {
     [('Dashboard', 'Secrets Engines', 'Access', 'Tools')].forEach((nav) => {
       assert.dom(navLink(nav)).exists(`Shows ${nav} nav item for user with default policy`);
     });
-    ['Policies', 'Client Count', 'Replication', 'Raft Storage', 'License', 'Seal Vault'].forEach((nav) => {
+    ['Client Count', 'Replication', 'Raft Storage', 'License', 'Seal Vault'].forEach((nav) => {
       assert.dom(navLink(nav)).doesNotExist(`Does not show ${nav} nav item for user with default policy`);
     });
 
@@ -84,7 +84,7 @@ module('Acceptance | chroot-namespace enterprise ui', function (hooks) {
     );
 
     await loginNs(namespace, reader);
-    ['Dashboard', 'Secrets Engines', 'Access', 'Policies', 'Tools'].forEach((nav) => {
+    ['Dashboard', 'Secrets Engines', 'Access', 'Tools'].forEach((nav) => {
       assert.dom(navLink(nav)).exists(`Shows ${nav} nav item for user with read access policy`);
     });
     ['Replication', 'Raft Storage', 'License', 'Seal Vault', 'Client Count'].forEach((nav) => {
@@ -119,12 +119,12 @@ module('Acceptance | chroot-namespace enterprise ui', function (hooks) {
     ['Dashboard', 'Secrets Engines', 'Access', 'Tools'].forEach((nav) => {
       assert.dom(navLink(nav)).exists(`Shows ${nav} nav item`);
     });
-    ['Policies', 'Client Count', 'Replication', 'Raft Storage', 'License', 'Seal Vault'].forEach((nav) => {
+    ['Client Count', 'Replication', 'Raft Storage', 'License', 'Seal Vault'].forEach((nav) => {
       assert.dom(navLink(nav)).doesNotExist(`Does not show ${nav} nav item`);
     });
 
     await loginNs(`${namespace}/child`, childReader);
-    ['Dashboard', 'Secrets Engines', 'Access', 'Policies', 'Tools'].forEach((nav) => {
+    ['Dashboard', 'Secrets Engines', 'Access', 'Tools'].forEach((nav) => {
       assert.dom(navLink(nav)).exists(`Shows ${nav} nav item within child namespace`);
     });
     ['Replication', 'Raft Storage', 'License', 'Seal Vault', 'Client Count'].forEach((nav) => {
diff --git a/ui/tests/acceptance/cluster-test.js b/ui/tests/acceptance/cluster-test.js
index 5c2f61b0fc..d01e8e64bd 100644
--- a/ui/tests/acceptance/cluster-test.js
+++ b/ui/tests/acceptance/cluster-test.js
@@ -38,7 +38,9 @@ module('Acceptance | cluster', function (hooks) {
     await login(userToken);
     await visit('/vault/access');
 
-    assert.dom('[data-test-sidebar-nav-link="Policies"]').doesNotExist();
+    assert.dom('[data-test-sidebar-nav-link="ACL policies"]').doesNotExist();
+    assert.dom('[data-test-sidebar-nav-link="Role governing policies"]').doesNotExist();
+    assert.dom('[data-test-sidebar-nav-link="Endpoint governing policies"]').doesNotExist();
   });
 
   test('it hides mfa setup if user does not have entityId (ex: is a root user)', async function (assert) {
@@ -72,7 +74,9 @@ module('Acceptance | cluster', function (hooks) {
     await login(userToken);
     await visit('/vault/access');
 
-    assert.dom('[data-test-sidebar-nav-link="Policies"]').hasAttribute('href', '/ui/vault/policies/rgp');
+    assert.dom('[data-test-sidebar-nav-link="ACL policies"]').doesNotExist();
+    assert.dom('[data-test-sidebar-nav-link="Role governing policies"]').exists();
+    assert.dom('[data-test-sidebar-nav-link="Endpoint governing policies"]').doesNotExist();
   });
 
   test('shows error banner if resultant-acl check fails', async function (assert) {
diff --git a/ui/tests/acceptance/enterprise-sidebar-nav-test.js b/ui/tests/acceptance/enterprise-sidebar-nav-test.js
index 9c45deceb5..aeb71e4a6a 100644
--- a/ui/tests/acceptance/enterprise-sidebar-nav-test.js
+++ b/ui/tests/acceptance/enterprise-sidebar-nav-test.js
@@ -57,18 +57,44 @@ module('Acceptance | Enterprise | sidebar navigation', function (hooks) {
     await click(link('License'));
     assert.strictEqual(currentURL(), '/vault/license', 'License route renders');
     await click(link('Access'));
-    await click(link('Control Groups'));
-    assert.strictEqual(currentURL(), '/vault/access/control-groups', 'Control groups route renders');
+    await click(link('Approval workflow'));
+    assert.strictEqual(currentURL(), '/vault/access/control-groups', 'Approval workflow route renders');
 
     await click(link('Namespaces'));
     assert.strictEqual(currentURL(), '/vault/access/namespaces?page=1', 'Replication route renders');
 
     await click(link('Back to main navigation'));
-    await click(link('Policies'));
-    await click(link('Role-Governing Policies'));
-    assert.strictEqual(currentURL(), '/vault/policies/rgp', 'Role-Governing Policies route renders');
+    await click(link('Access'));
+    await click(link('Role governing policies'));
+    assert.strictEqual(currentURL(), '/vault/policies/rgp', 'Role governing policies route renders');
 
-    await click(link('Endpoint Governing Policies'));
-    assert.strictEqual(currentURL(), '/vault/policies/egp', 'Endpoint Governing Policies route renders');
+    await click(link('Endpoint governing policies'));
+    assert.strictEqual(currentURL(), '/vault/policies/egp', 'Endpoint governing policies route renders');
+  });
+
+  test('it should link to correct routes at the access level', async function (assert) {
+    assert.expect(12);
+
+    await click(link('Access'));
+    assert.dom(panel('Access')).exists('Access nav panel renders');
+
+    const links = [
+      { label: 'ACL policies', route: '/vault/policies/acl' },
+      { label: 'Role governing policies', route: '/vault/policies/rgp' },
+      { label: 'Endpoint governing policies', route: '/vault/policies/egp' },
+      { label: 'Approval workflow', route: '/vault/access/control-groups' },
+      { label: 'Leases', route: '/vault/access/leases/list' },
+      { label: 'Authentication methods', route: '/vault/access' },
+      { label: 'Multi-factor authentication', route: '/vault/access/mfa' },
+      { label: 'OIDC provider', route: '/vault/access/oidc' },
+      { label: 'Namespaces', route: '/vault/access/namespaces' },
+      { label: 'Groups', route: '/vault/access/identity/groups' },
+      { label: 'Entities', route: '/vault/access/identity/entities' },
+    ];
+
+    for (const l of links) {
+      await click(link(l.label));
+      assert.ok(currentURL().includes(l.route), `${l.label} route renders`);
+    }
   });
 });
diff --git a/ui/tests/acceptance/mfa-login-enforcement-test.js b/ui/tests/acceptance/mfa-login-enforcement-test.js
index 5815ca3231..cae3f3c536 100644
--- a/ui/tests/acceptance/mfa-login-enforcement-test.js
+++ b/ui/tests/acceptance/mfa-login-enforcement-test.js
@@ -34,7 +34,7 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
     });
 
     await visit('/ui/vault/access');
-    await click('[data-test-sidebar-nav-link="Multi-Factor Authentication"]');
+    await click('[data-test-sidebar-nav-link="Multi-factor authentication"]');
     await click(GENERAL.tab('enforcements'));
     await click('[data-test-enforcement-create]');
     // Fill out form
@@ -48,7 +48,7 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
 
   test('it should create login enforcement', async function (assert) {
     await visit('/ui/vault/access');
-    await click('[data-test-sidebar-nav-link="Multi-Factor Authentication"]');
+    await click('[data-test-sidebar-nav-link="Multi-factor authentication"]');
     await click(GENERAL.tab('enforcements'));
     await click('[data-test-enforcement-create]');
 
@@ -65,7 +65,7 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
       'Cancel transitions to enforcements list'
     );
     await click('[data-test-enforcement-create]');
-    await click('.hds-breadcrumb a');
+    await click(GENERAL.breadcrumbAtIdx(1));
     assert.strictEqual(
       currentRouteName(),
       'vault.cluster.access.mfa.enforcements.index',
@@ -117,7 +117,7 @@ module('Acceptance | mfa-login-enforcement', function (hooks) {
       'vault.cluster.access.mfa.enforcements.enforcement.index',
       'Details more menu action transitions to enforcement route'
     );
-    await click('.hds-breadcrumb a');
+    await click(GENERAL.breadcrumbAtIdx(1));
     await click(GENERAL.menuTrigger);
     await click('[data-test-list-item-link="edit"]');
     assert.strictEqual(
diff --git a/ui/tests/acceptance/mfa-method-test.js b/ui/tests/acceptance/mfa-method-test.js
index 62e4875e9b..f9e57e4d80 100644
--- a/ui/tests/acceptance/mfa-method-test.js
+++ b/ui/tests/acceptance/mfa-method-test.js
@@ -58,7 +58,7 @@ module('Acceptance | mfa-method', function (hooks) {
       'vault.cluster.access.mfa.methods.create',
       'New method link transitions to create route'
     );
-    await click('.hds-breadcrumb a');
+    await click(GENERAL.breadcrumbAtIdx(1));
 
     const methods = this.getMethods();
     const model = this.store.peekRecord('mfa-method', methods[0].id);
@@ -78,7 +78,7 @@ module('Acceptance | mfa-method', function (hooks) {
       'vault.cluster.access.mfa.methods.method.index',
       'Details more menu action transitions to method route'
     );
-    await click('.hds-breadcrumb a');
+    await click(GENERAL.breadcrumbAtIdx(1));
     await click(GENERAL.menuTrigger);
     await click('[data-test-mfa-method-menu-link="edit"]');
     assert.strictEqual(
@@ -154,7 +154,7 @@ module('Acceptance | mfa-method', function (hooks) {
         }
         assert.dom(GENERAL.infoRowValue(label)).hasText(value, `${label} value renders`);
       });
-      await click('.hds-breadcrumb a');
+      await click(GENERAL.breadcrumbAtIdx(1));
     }
 
     await click('[data-test-mfa-method-list-item]');
@@ -210,7 +210,7 @@ module('Acceptance | mfa-method', function (hooks) {
         'vault.cluster.access.mfa.methods.method.index',
         `${type} method is displayed on save`
       );
-      await click('.hds-breadcrumb a');
+      await click(GENERAL.breadcrumbAtIdx(1));
       assert
         .dom('[data-test-mfa-method-list-item]')
         .exists({ count: methodCount + index + 1 }, `List updates with new ${type} method`);
@@ -233,7 +233,7 @@ module('Acceptance | mfa-method', function (hooks) {
     );
     await click('[data-test-tab="enforcements"]');
     assert.dom('[data-test-list-item]').hasTextContaining('bar', 'Enforcement is listed in method view');
-    await click('[data-test-sidebar-nav-link="Multi-Factor Authentication"]');
+    await click('[data-test-sidebar-nav-link="Multi-factor authentication"]');
     await click('[data-test-tab="enforcements"]');
     assert
       .dom('[data-test-list-item="bar"]')
diff --git a/ui/tests/acceptance/oidc-config/providers-scopes-test.js b/ui/tests/acceptance/oidc-config/providers-scopes-test.js
index a8c57fc6c0..99aba819bc 100644
--- a/ui/tests/acceptance/oidc-config/providers-scopes-test.js
+++ b/ui/tests/acceptance/oidc-config/providers-scopes-test.js
@@ -108,7 +108,7 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     );
 
     // navigate to details from index page
-    await click(GENERAL.breadcrumbAtIdx(0));
+    await click(GENERAL.breadcrumbAtIdx(1));
     await click(GENERAL.menuTrigger);
     await click('[data-test-oidc-scope-menu-link="details"]');
     assert.strictEqual(
@@ -232,7 +232,7 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
       .hasText('this is an edit test', 'has correct edited description');
 
     // create a provider using test-scope
-    await click(GENERAL.breadcrumbAtIdx(0));
+    await click(GENERAL.breadcrumbAtIdx(1));
     await click(GENERAL.tab('providers'));
     assert.dom(GENERAL.tab('providers')).hasClass('active', 'providers tab is active');
     await click('[data-test-oidc-provider-create]');
@@ -376,7 +376,7 @@ module('Acceptance |  oidc-config providers and scopes', function (hooks) {
     );
 
     // navigate to details from index page
-    await click(GENERAL.breadcrumbAtIdx(0));
+    await click(GENERAL.breadcrumbAtIdx(1));
     assert.strictEqual(
       currentRouteName(),
       'vault.cluster.access.oidc.providers.index',
diff --git a/ui/tests/acceptance/policy/index-test.js b/ui/tests/acceptance/policy/index-test.js
index 3fa462e7de..4105f7e4c1 100644
--- a/ui/tests/acceptance/policy/index-test.js
+++ b/ui/tests/acceptance/policy/index-test.js
@@ -126,7 +126,7 @@ module('Acceptance | policies/acl', function (hooks) {
     );
     assert.dom(GENERAL.hdsPageHeaderTitle).hasText(policyLower, 'displays the policy name on the show page');
     assert.dom(GENERAL.latestFlashContent).hasText(`ACL policy "${policyLower}" was successfully created.`);
-    await click(GENERAL.breadcrumbAtIdx(0));
+    await click(GENERAL.breadcrumbAtIdx(1));
 
     assert.strictEqual(currentURL(), `/vault/policies/acl`, 'navigates to policy list from breadcrumb');
     // List of policies can get long quickly -- filter for the policy to make the test more robust
diff --git a/ui/tests/acceptance/policy/policies-test.js b/ui/tests/acceptance/policy/policies-test.js
index 7457582843..a32f622fec 100644
--- a/ui/tests/acceptance/policy/policies-test.js
+++ b/ui/tests/acceptance/policy/policies-test.js
@@ -40,7 +40,7 @@ module('Acceptance | policies', function (hooks) {
 
   test('it navigates to and from policy show page from sidebar', async function (assert) {
     await visit('/vault/dashboard');
-    await click(GENERAL.navLink('Policies'));
+    await click(GENERAL.navLink('Access'));
     assert.strictEqual(currentURL(), '/vault/policies/acl', 'currentURL is /vault/policies/acl');
     await fillIn('[data-test-component="navigate-input"]', 'default'); // filter for the policy in case there are many on this view and the default policy is on the second page
     await click('[data-test-policy-link="default"]');
diff --git a/ui/tests/acceptance/sidebar-nav-test.js b/ui/tests/acceptance/sidebar-nav-test.js
index bc9e2387b5..ff35192668 100644
--- a/ui/tests/acceptance/sidebar-nav-test.js
+++ b/ui/tests/acceptance/sidebar-nav-test.js
@@ -40,13 +40,12 @@ module('Acceptance | sidebar navigation', function (hooks) {
   });
 
   test('it should link to correct routes at the cluster level', async function (assert) {
-    assert.expect(11);
+    assert.expect(9);
 
     assert.dom(panel('Cluster')).exists('Cluster nav panel renders');
 
     const subNavs = [
-      { label: 'Access', route: 'access' },
-      { label: 'Policies', route: 'policies/acl' },
+      { label: 'Access', route: 'policies/acl' },
       { label: 'Tools', route: 'tools/wrap' },
     ];
 
@@ -72,18 +71,19 @@ module('Acceptance | sidebar navigation', function (hooks) {
   });
 
   test('it should link to correct routes at the access level', async function (assert) {
-    assert.expect(7);
+    assert.expect(8);
 
     await click(link('Access'));
     assert.dom(panel('Access')).exists('Access nav panel renders');
 
     const links = [
-      { label: 'Multi-Factor Authentication', route: '/vault/access/mfa' },
-      { label: 'OIDC Provider', route: '/vault/access/oidc' },
+      { label: 'ACL policies', route: '/vault/policies/acl' },
+      { label: 'Leases', route: '/vault/access/leases/list' },
+      { label: 'Authentication methods', route: '/vault/access' },
+      { label: 'Multi-factor authentication', route: '/vault/access/mfa' },
+      { label: 'OIDC provider', route: '/vault/access/oidc' },
       { label: 'Groups', route: '/vault/access/identity/groups' },
       { label: 'Entities', route: '/vault/access/identity/entities' },
-      { label: 'Leases', route: '/vault/access/leases/list' },
-      { label: 'Authentication Methods', route: '/vault/access' },
     ];
 
     for (const l of links) {
@@ -92,16 +92,6 @@ module('Acceptance | sidebar navigation', function (hooks) {
     }
   });
 
-  test('it should link to correct routes at the policies level', async function (assert) {
-    assert.expect(2);
-
-    await click(link('Policies'));
-    assert.dom(panel('Policies')).exists('Access nav panel renders');
-
-    await click(link('ACL Policies'));
-    assert.strictEqual(currentURL(), '/vault/policies/acl', 'ACL Policies route renders');
-  });
-
   test('it should link to correct routes at the tools level', async function (assert) {
     assert.expect(7);
 
@@ -139,9 +129,10 @@ module('Acceptance | sidebar navigation', function (hooks) {
 
   test('it should display access nav when mounting and configuring auth methods', async function (assert) {
     await click(link('Access'));
+    await click('[data-test-sidebar-nav-link="Authentication methods"]');
     await click('[data-test-auth-enable]');
     assert.dom('[data-test-sidebar-nav-panel="Access"]').exists('Access nav panel renders');
-    await click(link('Authentication Methods'));
+    await click(link('Authentication methods'));
     await click(GENERAL.linkedBlock('token'));
     await click('[data-test-configure-link]');
     assert.dom('[data-test-sidebar-nav-panel="Access"]').exists('Access nav panel renders');
diff --git a/ui/tests/integration/components/sidebar/nav/access-test.js b/ui/tests/integration/components/sidebar/nav/access-test.js
index 805fd83896..c9aab17407 100644
--- a/ui/tests/integration/components/sidebar/nav/access-test.js
+++ b/ui/tests/integration/components/sidebar/nav/access-test.js
@@ -33,11 +33,10 @@ module('Integration | Component | sidebar-nav-access', function (hooks) {
   });
 
   test('it should render nav headings', async function (assert) {
-    const headings = ['Authentication', 'Access Control', 'Organization', 'Administration'];
+    const headings = ['Access control', 'Authentication', 'Organization'];
 
     stubFeaturesAndPermissions(this.owner);
     await renderComponent();
-
     assert
       .dom('[data-test-sidebar-nav-heading]')
       .exists({ count: headings.length }, 'Correct number of headings render');
@@ -61,18 +60,20 @@ module('Integration | Component | sidebar-nav-access', function (hooks) {
   test('it should render nav links', async function (assert) {
     const links = [
       'Back to main navigation',
-      'Authentication Methods',
-      'Multi-Factor Authentication',
-      'OIDC Provider',
-      'Control Groups',
+      'ACL policies',
+      'Role governing policies',
+      'Endpoint governing policies',
+      'Approval workflow',
+      'Leases',
+      'Authentication methods',
+      'Multi-factor authentication',
+      'OIDC provider',
       'Namespaces',
       'Groups',
       'Entities',
-      'Leases',
     ];
     stubFeaturesAndPermissions(this.owner);
     await renderComponent();
-
     assert
       .dom('[data-test-sidebar-nav-link]')
       .exists({ count: links.length }, 'Correct number of links render');
diff --git a/ui/tests/integration/components/sidebar/nav/cluster-test.js b/ui/tests/integration/components/sidebar/nav/cluster-test.js
index 1364c9bc4b..dfde0db4d8 100644
--- a/ui/tests/integration/components/sidebar/nav/cluster-test.js
+++ b/ui/tests/integration/components/sidebar/nav/cluster-test.js
@@ -62,7 +62,6 @@ module('Integration | Component | sidebar-nav-cluster', function (hooks) {
       'Secrets Sync',
       'Secrets Recovery',
       'Access',
-      'Policies',
       'Tools',
       'Replication',
       'Raft Storage',
diff --git a/ui/tests/integration/components/sidebar/nav/policies-test.js b/ui/tests/integration/components/sidebar/nav/policies-test.js
deleted file mode 100644
index 27d6620480..0000000000
--- a/ui/tests/integration/components/sidebar/nav/policies-test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright IBM Corp. 2016, 2025
- * SPDX-License-Identifier: BUSL-1.1
- */
-
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
-import { stubFeaturesAndPermissions } from 'vault/tests/helpers/components/sidebar-nav';
-import { setRunOptions } from 'ember-a11y-testing/test-support';
-
-const renderComponent = () => {
-  return render(hbs`
-    <Sidebar::Frame @isVisible={{true}}>
-      <Sidebar::Nav::Policies />
-    </Sidebar::Frame>
-  `);
-};
-
-module('Integration | Component | sidebar-nav-policies', function (hooks) {
-  setupRenderingTest(hooks);
-
-  hooks.beforeEach(function () {
-    setRunOptions({
-      rules: {
-        // This is an issue with Hds::AppHeader::HomeLink
-        'aria-prohibited-attr': { enabled: false },
-        // TODO: fix use Dropdown on user-menu
-        'nested-interactive': { enabled: false },
-      },
-    });
-  });
-
-  test('it should hide links user does not have access to', async function (assert) {
-    await renderComponent();
-    assert
-      .dom('[data-test-sidebar-nav-link]')
-      .exists({ count: 1 }, 'Nav links are hidden other than back link');
-  });
-
-  test('it should render nav headings and links', async function (assert) {
-    const links = [
-      'Back to main navigation',
-      'ACL Policies',
-      'Role-Governing Policies',
-      'Endpoint Governing Policies',
-    ];
-    stubFeaturesAndPermissions(this.owner);
-    await renderComponent();
-
-    assert.dom('[data-test-sidebar-nav-heading]').exists({ count: 1 }, 'Correct number of headings render');
-    assert.dom('[data-test-sidebar-nav-heading="Policies"]').hasText('Policies', 'Policies heading renders');
-
-    assert
-      .dom('[data-test-sidebar-nav-link]')
-      .exists({ count: links.length }, 'Correct number of links render');
-    links.forEach((link) => {
-      assert.dom(`[data-test-sidebar-nav-link="${link}"]`).hasText(link, `${link} link renders`);
-    });
-  });
-});