diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.html
index 9917a1b988c..b6ba2c3b112 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/organization-filter.component.html
@@ -121,7 +121,7 @@
               }}"
               [attr.aria-pressed]="activeFilter.selectedOrganizationId === organization.id"
             >
-              <i class="bwi bwi-fw {{ getIconString(organization) }}" aria-hidden="true"></i>
+              <i class="bwi bwi-fw {{ organization.getIconString() }}" aria-hidden="true"></i>
               &nbsp;{{ organization.name }}
             </button>
             <span *ngIf="!organization.enabled" class="tw-ml-auto">
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
index 79e16866939..3dd60febc40 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
@@ -24,7 +24,6 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SingleUserState, StateProvider } from "@bitwarden/common/platform/state";
 import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
@@ -186,14 +185,7 @@ export class VaultFilterService implements VaultFilterServiceAbstraction {
       const orgNodes: TreeNode<OrganizationFilter>[] = [];
       orgs.forEach((org) => {
         const orgCopy = org as OrganizationFilter;
-        if (
-          org?.productTierType === ProductTierType.Free ||
-          org?.productTierType === ProductTierType.Families
-        ) {
-          orgCopy.icon = "bwi-family";
-        } else {
-          orgCopy.icon = "bwi-business";
-        }
+        orgCopy.icon = org.getIconString();
         const node = new TreeNode<OrganizationFilter>(orgCopy, headNode, orgCopy.name);
         orgNodes.push(node);
       });
diff --git a/libs/common/src/admin-console/models/domain/organization.spec.ts b/libs/common/src/admin-console/models/domain/organization.spec.ts
index 5765e84dfb2..e9129f63f01 100644
--- a/libs/common/src/admin-console/models/domain/organization.spec.ts
+++ b/libs/common/src/admin-console/models/domain/organization.spec.ts
@@ -294,4 +294,54 @@ describe("Organization", () => {
       expect(organization.canEnableAutoConfirmPolicy).toBe(false);
     });
   });
+
+  describe("getIconString", () => {
+    it("should return bwi-family when productTierType is free", () => {
+      data.productTierType = ProductTierType.Free;
+
+      const organization = new Organization(data);
+
+      expect(organization.getIconString()).toBe("bwi-family");
+    });
+
+    it("should return bwi-family when productTierType is families", () => {
+      data.productTierType = ProductTierType.Families;
+
+      const organization = new Organization(data);
+
+      expect(organization.getIconString()).toBe("bwi-family");
+    });
+
+    it("should return bwi-business when productTierType is teams", () => {
+      data.productTierType = ProductTierType.Teams;
+
+      const organization = new Organization(data);
+
+      expect(organization.getIconString()).toBe("bwi-business");
+    });
+
+    it("should return bwi-business when productTierType is enterprise", () => {
+      data.productTierType = ProductTierType.Enterprise;
+
+      const organization = new Organization(data);
+
+      expect(organization.getIconString()).toBe("bwi-business");
+    });
+
+    it("should return bwi-business when productTierType is teamsStarter", () => {
+      data.productTierType = ProductTierType.TeamsStarter;
+
+      const organization = new Organization(data);
+
+      expect(organization.getIconString()).toBe("bwi-business");
+    });
+
+    it("should return bwi-business when productTierType is null", () => {
+      data.productTierType = null;
+
+      const organization = new Organization(data);
+
+      expect(organization.getIconString()).toBe("bwi-business");
+    });
+  });
 });
diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts
index 2991ffb7caa..dd4d00cf728 100644
--- a/libs/common/src/admin-console/models/domain/organization.ts
+++ b/libs/common/src/admin-console/models/domain/organization.ts
@@ -415,4 +415,15 @@ export class Organization {
   get canUseAccessIntelligence() {
     return this.productTierType === ProductTierType.Enterprise;
   }
+
+  getIconString(): string {
+    if (
+      this?.productTierType === ProductTierType.Free ||
+      this?.productTierType === ProductTierType.Families
+    ) {
+      return "bwi-family";
+    } else {
+      return "bwi-business";
+    }
+  }
 }