diff --git a/api-goldens/element-ng/navbar-vertical/index.api.md b/api-goldens/element-ng/navbar-vertical/index.api.md
index 13ef5ded1..07d02354e 100644
--- a/api-goldens/element-ng/navbar-vertical/index.api.md
+++ b/api-goldens/element-ng/navbar-vertical/index.api.md
@@ -30,6 +30,7 @@ export interface NavbarVerticalItemAction extends NavbarVerticalItemBase {
export interface NavbarVerticalItemBase {
badge?: string | number;
badgeColor?: string;
+ hideBadgeWhenCollapsed?: boolean;
icon?: string;
id?: string;
label: TranslatableString;
diff --git a/playwright/e2e/element-examples/navbar-vertical.spec.ts b/playwright/e2e/element-examples/navbar-vertical.spec.ts
index 74363e753..e1f41df69 100644
--- a/playwright/e2e/element-examples/navbar-vertical.spec.ts
+++ b/playwright/e2e/element-examples/navbar-vertical.spec.ts
@@ -59,3 +59,34 @@ test.describe('navbar vertical', () => {
await si.runVisualAndA11yTests('mobile-expanded');
});
});
+
+test.describe('navbar vertical badges', () => {
+ const example = 'si-navbar-vertical/si-navbar-vertical-badges';
+
+ test(example + ' expanded', async ({ page, si }) => {
+ await si.visitExample(example);
+ await page.getByRole('link', { name: 'Home' }).click();
+ await expect(page.getByRole('link', { name: 'Home' })).toHaveClass(/active/);
+ await page.getByRole('button', { name: 'Group with badges' }).click();
+ await page.getByRole('link', { name: 'Sub item critical' }).click();
+ await expect(page.getByRole('link', { name: 'Sub item critical' })).toHaveClass(/active/);
+ await page.locator('.si-layout-main-padding').click(); // to move focus
+
+ await si.waitForAllAnimationsToComplete();
+ await si.runVisualAndA11yTests();
+ });
+
+ test(example + ' collapsed', async ({ page, si }) => {
+ await si.visitExample(example);
+
+ await page.getByLabel('collapse', { exact: true }).click();
+ await page.getByRole('button', { name: 'Group with badges' }).click();
+ await expect(page.getByRole('group', { name: 'Group with badges' })).toBeVisible();
+ await page.getByRole('link', { name: 'Sub item info' }).click();
+
+ await si.waitForAllAnimationsToComplete();
+ await si.runVisualAndA11yTests('collapsed');
+ await page.getByRole('button', { name: 'Group with badges' }).click();
+ await si.runVisualAndA11yTests('collapsed-flyout');
+ });
+});
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-element-examples-chromium-dark-linux.png
index 928be1f8d..6eb4ea2ae 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:45bf8701b44333537a045043bf7df2813a02764805c55a076daf1629027c613f
-size 14379
+oid sha256:0b52e28f0b203915a9f593b468101d4f2907c83b433c6eaad24a4eef44aecdfa
+size 14468
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-element-examples-chromium-light-linux.png
index 921bcea89..bd2ba9214 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:bae3295c0db97f1d906a091effd38f5457d740a61c57bb51c8bbec6c7fd7795e
-size 13875
+oid sha256:b7c731b0252130601cde5283a33c01fbb85f40ead52d8c98e511af28d3507e6c
+size 13917
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout-element-examples-chromium-dark-linux.png
index 02d056337..d18f07e8d 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f794e0f0742962ed9869b01de049691087bf38fb650f4cde0000b83384a772d2
-size 18731
+oid sha256:653bd517ce48e7ac96bd406c822229771b7378ee7b079f24fcc7d76535948cd2
+size 20706
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout-element-examples-chromium-light-linux.png
index 14fad0a52..8e80bd689 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:663c3dfaca8dd9b61fbadc3d74f5fb6d3ff40d81cb4f35cdb3274e0aa89f7801
-size 18566
+oid sha256:4669827c120500c4b9faa4d0c95ca01baa13a4eaaae61158a9c24fcf84fab047
+size 20361
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout.yaml b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout.yaml
index 04bffd8e7..e044b6604 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout.yaml
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed-flyout.yaml
@@ -9,17 +9,18 @@
- button "expand"
- button "Search..."
- button "expand Home"
- - button "Documentation"
- - group "Documentation":
- - link "Sub Item 4":
+ - group "expand Home"
+ - button "Documentation 6"
+ - group "Documentation 6":
+ - link "Sub Item 4 1":
- /url: "#/viewer/viewer/subItem4"
- - link "Sub Item 5":
+ - link "Sub Item 5 2":
- /url: "#/viewer/viewer/subItem5"
- - link "Sub Item 6":
+ - link "Sub Item 6 3":
- /url: "#/viewer/viewer/subItem6"
- link "Energy & Sustainability":
- /url: "#/viewer/viewer/energy"
- - link "4 Test Coverage":
+ - link "Test Coverage":
- /url: "#/viewer/viewer/coverage"
- main:
- heading "Here is a title" [level=2]
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed.yaml b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed.yaml
index bd2e79fee..0d0d106a5 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed.yaml
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--collapsed.yaml
@@ -9,10 +9,12 @@
- button "expand"
- button "Search..."
- button "expand Home"
- - button "Documentation"
+ - group "expand Home"
+ - button "Documentation 6"
+ - group "Documentation 6"
- link "Energy & Sustainability":
- /url: "#/viewer/viewer/energy"
- - link "4 Test Coverage":
+ - link "Test Coverage":
- /url: "#/viewer/viewer/coverage"
- main:
- heading "Here is a title" [level=2]
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded-element-examples-chromium-dark-linux.png
index 7df7bf52a..467f006cd 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4d3b8db025382ae4eedf1b2d05150d530c3c1b4995861c4b93a85911aa1d0100
-size 19083
+oid sha256:edc0c2cb5d3c4a14224a324c7330ac4c5573a4adaaa95d14dbf5215c12ac5d02
+size 20339
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded-element-examples-chromium-light-linux.png
index 103acdd69..e440c1f3e 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:217cee238d49d95307ef1c13df0e2b6dec7a8c8019335e5a5cbb24d4f23e5352
-size 18100
+oid sha256:75fe23f9ffbe96a71d329c15bd30902a0f5c3af3ea4c1f32fd3e8d8efd923af4
+size 19337
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded.yaml b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded.yaml
index 774e963d0..c20b58e28 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded.yaml
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy--mobile-expanded.yaml
@@ -9,17 +9,18 @@
- link "Home":
- /url: "#/viewer/viewer/Home"
- button "expand Home"
+ - group "expand Home"
- button "Documentation" [expanded]
- group "Documentation":
- - link "Sub Item 4":
+ - link "Sub Item 4 1":
- /url: "#/viewer/viewer/subItem4"
- - link "Sub Item 5":
+ - link "Sub Item 5 2":
- /url: "#/viewer/viewer/subItem5"
- - link "Sub Item 6":
+ - link "Sub Item 6 3":
- /url: "#/viewer/viewer/subItem6"
- link "Energy & Sustainability":
- /url: "#/viewer/viewer/energy"
- - link "Test Coverage 4":
+ - link "Test Coverage":
- /url: "#/viewer/viewer/coverage"
- main:
- heading "Here is a title" [level=2]
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy-element-examples-chromium-dark-linux.png
index f10d3d8ea..ca799a9fd 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2eaee582f6cfd0956512ed53611184e221e9c1ea574ff7080cc31fab5e75ca3a
-size 25521
+oid sha256:fc358d7d3fea648a245d0886f1de8f235972d5f0807a836c6b674c09b54ad318
+size 26790
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy-element-examples-chromium-light-linux.png
index 26b9b9dcf..a88bc0088 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1c8464922bc1420bbb6302e590a8baef04a60431cbc3dcbc3a24fe180737dadc
-size 24458
+oid sha256:4ded5e9a87114513a62843ca95997690e013054eb003811d4c42b758db6e5d7c
+size 25723
diff --git a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy.yaml b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy.yaml
index fe701129d..beab92313 100644
--- a/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy.yaml
+++ b/playwright/snapshots/navbar-vertical-legacy.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-legacy.yaml
@@ -11,17 +11,18 @@
- link "Home":
- /url: "#/viewer/viewer/Home"
- button "expand Home"
+ - group "expand Home"
- button "Documentation" [expanded]
- group "Documentation":
- - link "Sub Item 4":
+ - link "Sub Item 4 1":
- /url: "#/viewer/viewer/subItem4"
- - link "Sub Item 5":
+ - link "Sub Item 5 2":
- /url: "#/viewer/viewer/subItem5"
- - link "Sub Item 6":
+ - link "Sub Item 6 3":
- /url: "#/viewer/viewer/subItem6"
- link "Energy & Sustainability":
- /url: "#/viewer/viewer/energy"
- - link "Test Coverage 4":
+ - link "Test Coverage":
- /url: "#/viewer/viewer/coverage"
- main:
- heading "Here is a title" [level=2]
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-element-examples-chromium-dark-linux.png
index 9932c1d61..df0223c78 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9530cd2ef68aa941d6a85464c297278734602f221fd7ace03fb92c27e39d3c17
-size 16545
+oid sha256:07e7dc2bb8979bee3fd3c7f373a3b01b7cc2e5da0f151828e8fb7ec82f81319d
+size 16129
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-element-examples-chromium-light-linux.png
index 9a1d39600..32ce6c9d5 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8a0db10c592a6b190122f9e8b11970a371a9aba4675c39c7dd75590a4ba59b5f
-size 16099
+oid sha256:0470bc637c7dc1f25cd9faad9bcfe8e9678f22e89a7069c6308af51dbeaa83c9
+size 15650
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout-element-examples-chromium-dark-linux.png
index cd32d6d5f..7be7c49d6 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9e1072f3e247747572086991bccd5b86f7cb4ed3967e40f586c721a82182ca28
-size 21451
+oid sha256:5f52b6bfb1a30bb0363da5efef18731c9d17210996558a4a97aa02416a64c247
+size 20468
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout-element-examples-chromium-light-linux.png
index b6373435b..f9db8ca8a 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e467315ffb09f13ea99514b0c62ab8e8a4a926090920acdf02ab02294b0cc305
-size 21135
+oid sha256:0d12e69e498c4abbd66bc1937640a3908cf0bea3d6effcbfa2c74e943e4e1e80
+size 20206
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout.yaml b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout.yaml
index 922a042e5..266ae6670 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout.yaml
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed-flyout.yaml
@@ -13,15 +13,16 @@
- /url: "#/viewer/viewer/energy"
- button "User management"
- group "User management":
- - link "Sub item 4":
+ - link "Sub item":
- /url: "#/viewer/viewer/subItem"
- link "Sub item 2":
- /url: "#/viewer/viewer/subItem2"
- link "Sub item 3":
- /url: "#/viewer/viewer/subItem3"
- - link "4 Test coverage":
+ - link "Test coverage":
- /url: "#/viewer/viewer/coverage"
- button "Documentation"
+ - group "Documentation"
- button "Action"
- main:
- heading "Here is a title" [level=2]
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed.yaml b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed.yaml
index ac7943b2c..22c2a51c8 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed.yaml
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--collapsed.yaml
@@ -12,9 +12,11 @@
- link "Energy & sustainability":
- /url: "#/viewer/viewer/energy"
- button "User management"
- - link "4 Test coverage":
+ - group "User management"
+ - link "Test coverage":
- /url: "#/viewer/viewer/coverage"
- button "Documentation"
+ - group "Documentation"
- button "Action"
- main:
- heading "Here is a title" [level=2]
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded-element-examples-chromium-dark-linux.png
index 8f2435114..bf9108dff 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0270185b13bdadd47f9bbc93365b727a7eec6499ee0f420710dfdfaff0ea8f54
-size 25023
+oid sha256:9825f06ec15142e57391aa623d61d3dfc46195afebb0b5909b97c3b8f25fcbc2
+size 24394
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded-element-examples-chromium-light-linux.png
index b4fd4daea..29de597e1 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0b6851babeb4c8647dabe3c91772ceda8646f909d74bc6b508e22bfa443590b0
-size 23964
+oid sha256:9fdb80f6e4fc1ee530c2eca29e22190d6f310f3b8d43adc5e25f66f8264c1499
+size 23387
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded.yaml b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded.yaml
index 453c19991..d0ead6eb4 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded.yaml
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical--mobile-expanded.yaml
@@ -13,7 +13,8 @@
- link "Energy & sustainability":
- /url: "#/viewer/viewer/energy"
- button "User management"
- - link "Test coverage 4":
+ - group "User management"
+ - link "Test coverage":
- /url: "#/viewer/viewer/coverage"
- button "Documentation" [expanded]
- group "Documentation":
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-element-examples-chromium-dark-linux.png
new file mode 100644
index 000000000..2dc986e8b
--- /dev/null
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-element-examples-chromium-dark-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f29032b7df5e5009020dda4d4aa7b367b6b776e9be6e648829c9673b6f0f5e11
+size 21020
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-element-examples-chromium-light-linux.png
new file mode 100644
index 000000000..8059077f8
--- /dev/null
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-element-examples-chromium-light-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a512f1ff856ded12acdc2b524fae20d08be9c92252b6c5bc087210aaf1c5225
+size 20449
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-flyout-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-flyout-element-examples-chromium-dark-linux.png
new file mode 100644
index 000000000..bd6d2592e
--- /dev/null
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-flyout-element-examples-chromium-dark-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31badea1c11bd8053e62fb6c5394b0f94ebb3638bd4a4ea8c832f18ecb8d3afe
+size 28126
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-flyout-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-flyout-element-examples-chromium-light-linux.png
new file mode 100644
index 000000000..655604d98
--- /dev/null
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-flyout-element-examples-chromium-light-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c941dda7bef765fc14a4146fb80fde3f2e3a9ee689216547f606560cdeec0be5
+size 27760
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-flyout.yaml b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-flyout.yaml
new file mode 100644
index 000000000..5396b2675
--- /dev/null
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed-flyout.yaml
@@ -0,0 +1,30 @@
+- link "Jump to Main content"
+- link "Jump to Navigation"
+- banner:
+ - link "Siemens logo":
+ - /url: "#/"
+ - heading "Navbar Vertical Badges Example" [level=1]
+- navigation:
+ - button "expand"
+ - button "Search..."
+ - link "Home":
+ - /url: "#/viewer/viewer/home"
+ - link "Text badge Info":
+ - /url: "#/viewer/viewer/text-badge"
+ - button "Group with badges 6"
+ - group "Group with badges 6":
+ - link "Sub item critical 1":
+ - /url: "#/viewer/viewer/sub-badge-1"
+ - link "Sub item info 2":
+ - /url: "#/viewer/viewer/sub-badge-2"
+ - link "Sub item warning 3":
+ - /url: "#/viewer/viewer/sub-badge-3"
+ - button "Group item"
+ - group "Group item"
+ - link "Subtle badge 5":
+ - /url: "#/viewer/viewer/success"
+ - link /Danger emphasis badge \+\d+/:
+ - /url: "#/viewer/viewer/danger"
+- main:
+ - heading "Badge Examples" [level=2]
+ - text: Content with path 'sub-badge-2'
\ No newline at end of file
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed.yaml b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed.yaml
new file mode 100644
index 000000000..fc48b49b0
--- /dev/null
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges--collapsed.yaml
@@ -0,0 +1,24 @@
+- link "Jump to Main content"
+- link "Jump to Navigation"
+- banner:
+ - link "Siemens logo":
+ - /url: "#/"
+ - heading "Navbar Vertical Badges Example" [level=1]
+- navigation:
+ - button "expand"
+ - button "Search..."
+ - link "Home":
+ - /url: "#/viewer/viewer/home"
+ - link "Text badge Info":
+ - /url: "#/viewer/viewer/text-badge"
+ - button "Group with badges 6"
+ - group "Group with badges 6"
+ - button "Group item"
+ - group "Group item"
+ - link "Subtle badge 5":
+ - /url: "#/viewer/viewer/success"
+ - link /Danger emphasis badge \+\d+/:
+ - /url: "#/viewer/viewer/danger"
+- main:
+ - heading "Badge Examples" [level=2]
+ - text: Content with path 'sub-badge-2'
\ No newline at end of file
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges-element-examples-chromium-dark-linux.png
new file mode 100644
index 000000000..4c31a82ca
--- /dev/null
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges-element-examples-chromium-dark-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11ace2a9f32080a81db70c7ff48e8106d9c67add1a7790090506ca5656f1b17d
+size 41236
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges-element-examples-chromium-light-linux.png
new file mode 100644
index 000000000..eac31dcf5
--- /dev/null
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges-element-examples-chromium-light-linux.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93ada3a8d02f95b1b83c369fcf11ac5822f5a796066efa57d0c56a6f3ad7fbc7
+size 39691
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges.yaml b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges.yaml
new file mode 100644
index 000000000..59fab8461
--- /dev/null
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-badges.yaml
@@ -0,0 +1,31 @@
+- link "Jump to Main content"
+- link "Jump to Navigation"
+- banner:
+ - link "Siemens logo":
+ - /url: "#/"
+ - heading "Navbar Vertical Badges Example" [level=1]
+- navigation:
+ - button "collapse" [expanded]
+ - textbox "Search..."
+ - link "Home Text":
+ - /url: "#/viewer/viewer/home"
+ - text: Badge Examples
+ - link "Text badge Info":
+ - /url: "#/viewer/viewer/text-badge"
+ - button "Group with badges" [expanded]
+ - group "Group with badges":
+ - link "Sub item critical 1":
+ - /url: "#/viewer/viewer/sub-badge-1"
+ - link "Sub item info 2":
+ - /url: "#/viewer/viewer/sub-badge-2"
+ - link "Sub item warning 3":
+ - /url: "#/viewer/viewer/sub-badge-3"
+ - button "Group item"
+ - group "Group item"
+ - link "Subtle badge 5":
+ - /url: "#/viewer/viewer/success"
+ - link /Danger emphasis badge \+\d+/:
+ - /url: "#/viewer/viewer/danger"
+- main:
+ - heading "Badge Examples" [level=2]
+ - text: Content with path 'sub-badge-1'
\ No newline at end of file
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-element-examples-chromium-dark-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-element-examples-chromium-dark-linux.png
index 833ecb15a..44769e0ea 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-element-examples-chromium-dark-linux.png
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-element-examples-chromium-dark-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:35d23bc16ebea3f738ce33d34a0e3f076657e8368ce59f78aacabc2f260ea2e6
-size 30654
+oid sha256:99bca27795e13ba9708488db8d4072a71e1186c4a5a57d37962f8a2ec1aaa91c
+size 30019
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-element-examples-chromium-light-linux.png b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-element-examples-chromium-light-linux.png
index bf585ed45..88d75696c 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-element-examples-chromium-light-linux.png
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical-element-examples-chromium-light-linux.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:60a1c614917a5c3a14aa6e1e102347f70e819a6e41048c8694426dd172b2057a
-size 29534
+oid sha256:25472e2ccff93467eb76c6ff395488c5d9a1c9e36c28366be53215c26fba74c1
+size 28949
diff --git a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical.yaml b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical.yaml
index 453c19991..d0ead6eb4 100644
--- a/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical.yaml
+++ b/playwright/snapshots/navbar-vertical.spec.ts-snapshots/si-navbar-vertical--si-navbar-vertical.yaml
@@ -13,7 +13,8 @@
- link "Energy & sustainability":
- /url: "#/viewer/viewer/energy"
- button "User management"
- - link "Test coverage 4":
+ - group "User management"
+ - link "Test coverage":
- /url: "#/viewer/viewer/coverage"
- button "Documentation" [expanded]
- group "Documentation":
diff --git a/projects/element-ng/navbar-vertical/si-navbar-vertical-item.component.html b/projects/element-ng/navbar-vertical/si-navbar-vertical-item.component.html
index 0a0823670..e5df7c946 100644
--- a/projects/element-ng/navbar-vertical/si-navbar-vertical-item.component.html
+++ b/projects/element-ng/navbar-vertical/si-navbar-vertical-item.component.html
@@ -1,23 +1,27 @@
@let icon = item().icon;
-@if (icon) {
-