diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.html b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.html
index 735188f479c..4f2366af7da 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/collection-filter.component.html
@@ -3,7 +3,7 @@
     [icon]="collection().node.icon"
     [class.active]="isActive()"
     [text]="displayName()"
-    [variant]="'tree'"
+    variant="tree"
     [appA11yTitle]="displayName()"
     (click)="applyFilter($event)"
   >
@@ -14,9 +14,9 @@
 } @else {
   <bit-nav-item
     [icon]="collection().node.icon"
-    [class.active]="isActive()"
+    [forceActiveStyles]="isActive()"
     [text]="collection().node.name"
-    [variant]="'tree'"
+    variant="tree"
     [appA11yTitle]="collection().node.name"
     (click)="applyFilter($event)"
   />
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.html b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.html
index 8656ec7fe26..0c6f86df53f 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/folder-filter.component.html
@@ -3,7 +3,7 @@
     [icon]="folder().node.icon"
     [class.active]="isActive()"
     [text]="displayName()"
-    [variant]="'tree'"
+    variant="tree"
     [appA11yTitle]="displayName()"
     (click)="applyFilter($event)"
   >
@@ -12,10 +12,10 @@
         type="button"
         slot="end"
         class="edit-button"
-        [bitIconButton]="'bwi-pencil'"
-        [buttonType]="'nav-contrast'"
+        bitIconButton="bwi-pencil"
+        buttonType="nav-contrast"
         size="small"
-        label="'editFolder' | i18n"
+        [label]="'editFolder' | i18n"
         (click)="editFolder(folder().node)"
       ></button>
     }
@@ -28,7 +28,7 @@
     [icon]="folder().node.icon"
     [class.active]="isActive()"
     [text]="displayName()"
-    [variant]="'tree'"
+    variant="tree"
     [appA11yTitle]="displayName()"
     (click)="applyFilter($event)"
   >
@@ -37,10 +37,10 @@
         type="button"
         slot="end"
         class="edit-button"
-        [bitIconButton]="'bwi-pencil'"
-        [buttonType]="'nav-contrast'"
+        bitIconButton="bwi-pencil"
+        buttonType="nav-contrast"
         size="small"
-        label="'editFolder' | i18n"
+        [label]="'editFolder' | i18n"
         (click)="editFolder(folder().node)"
       ></button>
     }
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html
index 60fa048406a..8dc0bf20bef 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/filters/organization-filter.component.html
@@ -5,7 +5,7 @@
         [icon]="organization.node.icon"
         [class.active]="organization.node.id === activeFilter()?.organizationId"
         [text]="organization.node.name"
-        [variant]="'tree'"
+        variant="tree"
         [appA11yTitle]="organization.node.name"
         (click)="applyFilter(organization)"
       >
@@ -20,7 +20,7 @@
         [icon]="organization.node.icon"
         [class.active]="organization.node.id === activeFilter()?.organizationId"
         [text]="organization.node.name"
-        [variant]="'tree'"
+        variant="tree"
         [appA11yTitle]="organization.node.name"
         (click)="applyFilter(organization)"
       />
diff --git a/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.html b/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.html
index 2cf807cfb24..50bc380ac99 100644
--- a/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.html
+++ b/apps/desktop/src/vault/app/vault-v3/vault-filter/vault-filter.component.html
@@ -20,7 +20,7 @@
       [activeFilter]="activeFilter"
     />
     @if (!hideFolders()) {
-      <bit-nav-group [icon]="'bwi-folder'" [text]="'folders' | i18n" [variant]="'tree'">
+      <bit-nav-group icon="bwi-folder" [text]="'folders' | i18n" variant="tree">
         @for (folder of (folders$ | async)?.children ?? []; track folder.node.id) {
           <app-folder-filter
             [activeFilter]="activeFilter"