From 4449d8baf6506ffc82f1609ffd7c83e5cb94631a Mon Sep 17 00:00:00 2001
From: Bryan Cunningham <bcunningham@bitwarden.com>
Date: Tue, 19 Aug 2025 15:15:41 -0400
Subject: [PATCH 01/34] [CL-689][CL-799] Fix Icon button a11y errors (#15750)

* Throw error if appA11yTitle is null in icon button

* Add required label input

* Fix icon button errors in CL components and storeis

* fix popover aria-label errors

* remove commented code

* add labels to icon buttons in browser

* add labels to icon buttons in web

* add labels to icon buttons in license

* add labels to icon buttons in send

* add labels to icon buttons in angular

* fix missing pipe error

* fix sso icon button missed in error

* update labels in vault

* add section expand button label

* Adding labels to icon buttons

* Add lint rule to not allow icon buttons without label input

* rename util file

* trigger updates on title change

* update eslint rule name and folder

* add edit collection label to vault headers

* fix web header story label

* add show/hide summary labels

* update summary message

* fix breadcrumbs label message

* fix JSDoc to use correct input

* remove commented code

* use label as aria-label always. Remove init function

* add moreBreadcrumbs translation message to other apps

* add @bitwarden/team-ui-foundation as code owner for component eslint rules

* switch title to const variable

* add jsdoc comment on what the label input is used for

* [PM-22415] Tax ID notifications for Organizations and Providers (#15996)

* [NO LOGIC] Rename BillableEntity to BitwardenSubscriber

This helps us maintain paraody with server where we call this choice type ISubscriber. I chose BitwardenSubscriber to avoid overlap with RxJS

* [NO LOGIC] Move subscriber-billing.client to clients folder

* [NO LOGIC] Move organization warnings under organization folder

* Move getWarnings from OrganizationBillingApiService to new OrganizationBillingClient

I'd like us to move away from stashing so much in libs and utilizing the JsLibServicesModule when it's not necessary to do so. These are invocations used exclusively by the Web Vault and, until that changes, they should be treated as such

* Refactor OrganizationWarningsService

There was a case added to the Inactive Subscription warning for a free trial, but free trials do not represent inactive subscriptions so this was semantically incorrect. This creates another method that pulls the free trial warning and shows a dialog asking the user to subscribe if they're on one.

* Implement Tax ID Warnings throughout Admin Console and Provider Portal

* Fix linting error

* Jimmy's feedback

* remove duplicate messages keys

* revert changes to popover stories

* add back dupe myItems key for now as it was already here

* fix directive type errors

* remove variable left in error from merge conflict

* revert unintentional change to reports layout

* add back reports change

---------

Co-authored-by: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com>
---
 .github/CODEOWNERS                            |  1 +
 apps/browser/src/_locales/en/messages.json    |  4 ++
 .../settings/blocked-domains.component.html   |  2 +-
 .../settings/excluded-domains.component.html  |  2 +-
 .../popup/components/pop-out.component.html   |  2 +-
 .../popup/layout/popup-header.component.html  |  3 +-
 .../popup/layout/popup-layout.stories.ts      | 32 +++++-------
 .../add-edit/send-add-edit.component.html     |  2 +-
 .../add-edit/add-edit-v2.component.html       |  2 +-
 .../item-copy-actions.component.html          | 30 +++++------
 .../item-more-options.component.html          |  3 +-
 .../vault-header-v2.component.html            |  2 +-
 .../vault-list-items-container.component.html |  5 +-
 .../vault-v2/view-v2/view-v2.component.html   |  2 +-
 .../popup/settings/folders-v2.component.html  |  2 +-
 .../trash-list-items-container.component.html |  3 +-
 apps/desktop/src/locales/en/messages.json     |  4 ++
 .../vault-header/vault-header.component.html  |  1 +
 .../manage/group-add-edit.component.html      |  2 +-
 .../manage/groups.component.html              |  4 +-
 .../members/members.component.html            |  4 +-
 .../access-selector-dialog.stories.ts         |  2 +-
 .../access-selector.component.html            |  2 +-
 .../collection-dialog.component.html          |  2 +-
 .../emergency-access-add-edit.component.html  |  2 +-
 .../emergency-access.component.html           |  4 +-
 .../two-factor-setup-yubikey.component.html   |  2 +-
 .../free-bitwarden-families.component.html    |  2 +-
 .../billing-sync-api-key.component.html       |  2 +-
 .../billing-sync-key.component.html           |  2 +-
 .../change-plan-dialog.component.html         |  2 +-
 .../organizations/change-plan.component.html  |  2 +-
 .../sponsoring-org-row.component.html         |  2 +-
 .../pricing-summary.component.html            |  4 +-
 .../reports/reports-layout.component.html     |  2 +-
 .../app/layouts/header/web-header.stories.ts  |  2 +-
 .../product-switcher.component.html           |  2 +-
 .../app/settings/domain-rules.component.html  |  3 +-
 .../src/app/tools/send/send.component.html    |  2 +-
 .../vault-item-dialog.component.html          |  2 +-
 .../vault-cipher-row.component.html           |  4 +-
 .../vault-collection-row.component.html       |  2 +-
 .../vault-items/vault-items.component.html    |  2 +-
 .../vault-header/vault-header.component.html  |  2 +-
 apps/web/src/locales/en/messages.json         | 10 ++++
 .../device-approvals.component.html           |  4 +-
 .../domain-add-edit-dialog.component.html     |  5 +-
 .../organizations/manage/scim.component.html  |  8 +--
 .../add-edit-member-dialog.component.html     |  2 +-
 .../providers/manage/members.component.html   |  4 +-
 .../src/app/auth/sso/sso.component.html       | 14 ++---
 .../clients/manage-clients.component.html     |  2 +-
 .../app-table-row-scrollable.component.html   |  2 +-
 .../overview/section.component.html           |  1 +
 .../dialog/secret-dialog.component.html       |  2 +-
 .../access/access-list.component.html         |  6 +--
 .../config/config.component.html              | 10 +++-
 .../service-accounts-list.component.html      |  6 +--
 .../access-policy-selector.component.html     |  3 +-
 .../shared/projects-list.component.html       |  9 ++--
 .../shared/secrets-list.component.html        |  9 ++--
 eslint.config.mjs                             |  6 +++
 .../spotlight/spotlight.component.html        |  3 +-
 .../input-password.component.html             |  4 +-
 .../src/a11y/a11y-title.directive.ts          | 21 ++++----
 .../src/a11y/set-a11y-title-and-aria-label.ts | 16 ++++++
 .../components/src/async-actions/in-forms.mdx |  8 ++-
 .../src/async-actions/in-forms.stories.ts     |  7 ++-
 .../src/async-actions/standalone.mdx          |  2 +-
 .../src/async-actions/standalone.stories.ts   |  2 +-
 .../src/banner/banner.component.html          |  3 +-
 .../breadcrumbs/breadcrumbs.component.html    |  1 +
 .../src/breadcrumbs/breadcrumbs.component.ts  |  4 +-
 .../src/breadcrumbs/breadcrumbs.stories.ts    | 13 +++++
 .../src/dialog/dialog/dialog.component.html   |  3 +-
 .../src/dialog/dialog/dialog.stories.ts       | 10 ++--
 .../src/disclosure/disclosure.component.ts    |  1 +
 .../src/disclosure/disclosure.stories.ts      |  2 +-
 .../src/drawer/drawer-header.component.html   |  8 +--
 .../src/form-field/form-field.stories.ts      | 28 +++++-----
 .../form-field/password-input-toggle.spec.ts  |  8 ++-
 .../password-input-toggle.stories.ts          |  4 +-
 .../src/icon-button/icon-button.component.ts  | 25 +++++++--
 .../src/icon-button/icon-button.stories.ts    |  1 +
 libs/components/src/item/item.mdx             |  4 +-
 libs/components/src/item/item.stories.ts      | 44 ++++++++--------
 .../src/navigation/nav-group.component.html   |  3 +-
 .../src/navigation/nav-item.stories.ts        |  4 +-
 .../src/navigation/side-nav.component.html    |  2 +-
 .../src/popover/popover.component.html        |  3 +-
 libs/components/src/section/section.mdx       |  2 +-
 .../components/src/section/section.stories.ts | 16 +++---
 .../dialog-virtual-scroll-block.component.ts  |  2 +-
 .../components/kitchen-sink-form.component.ts |  8 ++-
 .../kitchen-sink-table.component.ts           |  2 +
 .../components/src/toast/toast.component.html |  1 +
 libs/eslint/components/index.mjs              |  3 ++
 .../require-label-on-biticonbutton.mjs        | 51 +++++++++++++++++++
 .../src/components/export.component.html      |  2 +
 ...redential-generator-history.component.html |  2 +-
 .../src/credential-generator.component.html   |  4 +-
 .../src/password-generator.component.html     |  4 +-
 .../src/username-generator.component.html     |  4 +-
 .../send-add-edit-dialog.component.html       |  2 +-
 .../options/send-options.component.html       |  6 +--
 .../send-details/send-details.component.html  |  2 +-
 .../send-list-items-container.component.html  |  4 +-
 .../delete-attachment.component.html          |  2 +-
 .../uri-option.component.html                 |  6 +--
 ...dd-edit-custom-field-dialog.component.html |  2 +-
 .../custom-fields.component.html              |  4 +-
 .../item-details-section.component.html       |  2 +-
 .../login-details-section.component.html      | 10 ++--
 .../sshkey-section.component.html             |  2 +-
 .../additional-options.component.html         |  2 +-
 .../autofill-options-view.component.html      |  4 +-
 .../card-details-view.component.html          |  4 +-
 .../custom-fields-v2.component.html           |  6 +--
 .../login-credentials-view.component.html     |  8 +--
 .../sshkey-view.component.html                |  6 +--
 .../view-identity-sections.component.html     | 18 +++----
 .../add-edit-folder-dialog.component.html     |  2 +-
 .../download-attachment.component.html        |  2 +-
 .../password-history-view.component.html      |  2 +-
 124 files changed, 414 insertions(+), 285 deletions(-)
 create mode 100644 libs/components/src/a11y/set-a11y-title-and-aria-label.ts
 create mode 100644 libs/eslint/components/index.mjs
 create mode 100644 libs/eslint/components/require-label-on-biticonbutton.mjs

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 187f500828c..4b956fd577a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -131,6 +131,7 @@ apps/web/src/translation-constants.ts @bitwarden/team-platform-dev
 .github/workflows/version-auto-bump.yml @bitwarden/team-platform-dev
 # ESLint custom rules
 libs/eslint @bitwarden/team-platform-dev
+libs/eslint/components @bitwarden/team-ui-foundation
 # Typescript tooling
 tsconfig.base.json @bitwarden/team-platform-dev
 nx.json @bitwarden/team-platform-dev
diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index f8dde376b35..1c27fab6971 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -5579,5 +5579,9 @@
   },
   "showLess": {
     "message": "Show less"
+  },
+  "moreBreadcrumbs": {
+    "message": "More breadcrumbs",
+    "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   }
 }
diff --git a/apps/browser/src/autofill/popup/settings/blocked-domains.component.html b/apps/browser/src/autofill/popup/settings/blocked-domains.component.html
index 8156525301b..6a08b4483af 100644
--- a/apps/browser/src/autofill/popup/settings/blocked-domains.component.html
+++ b/apps/browser/src/autofill/popup/settings/blocked-domains.component.html
@@ -30,7 +30,7 @@
         </bit-item-content>
         <button
           *ngIf="i < fieldsEditThreshold"
-          appA11yTitle="{{ 'remove' | i18n }}"
+          label="{{ 'remove' | i18n }}"
           bitIconButton="bwi-minus-circle"
           buttonType="danger"
           size="small"
diff --git a/apps/browser/src/autofill/popup/settings/excluded-domains.component.html b/apps/browser/src/autofill/popup/settings/excluded-domains.component.html
index a963c2608a6..75be3bcc1a0 100644
--- a/apps/browser/src/autofill/popup/settings/excluded-domains.component.html
+++ b/apps/browser/src/autofill/popup/settings/excluded-domains.component.html
@@ -26,7 +26,7 @@
         </bit-item-content>
         <button
           *ngIf="i < fieldsEditThreshold"
-          appA11yTitle="{{ 'remove' | i18n }}"
+          label="{{ 'remove' | i18n }}"
           bitIconButton="bwi-minus-circle"
           buttonType="danger"
           size="small"
diff --git a/apps/browser/src/platform/popup/components/pop-out.component.html b/apps/browser/src/platform/popup/components/pop-out.component.html
index 3097f6e30d3..b66f636b635 100644
--- a/apps/browser/src/platform/popup/components/pop-out.component.html
+++ b/apps/browser/src/platform/popup/components/pop-out.component.html
@@ -3,7 +3,7 @@
     bitIconButton="bwi-popout"
     size="small"
     type="button"
-    appA11yTitle="{{ 'popOutNewWindow' | i18n }}"
+    label="{{ 'popOutNewWindow' | i18n }}"
     [title]="'popOutNewWindow' | i18n"
     (click)="expand()"
   ></button>
diff --git a/apps/browser/src/platform/popup/layout/popup-header.component.html b/apps/browser/src/platform/popup/layout/popup-header.component.html
index 014ebc86411..2aac161b9d5 100644
--- a/apps/browser/src/platform/popup/layout/popup-header.component.html
+++ b/apps/browser/src/platform/popup/layout/popup-header.component.html
@@ -19,8 +19,7 @@
         bitIconButton="bwi-angle-left"
         type="button"
         *ngIf="showBackButton"
-        [title]="'back' | i18n"
-        [attr.aria-label]="'back' | i18n"
+        [label]="'back' | i18n"
         [bitAction]="backAction"
       ></button>
       <h1 *ngIf="pageTitle" bitTypography="h3" class="!tw-mb-0.5">
diff --git a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
index aeeed6f65ce..7455921b08b 100644
--- a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
+++ b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
@@ -67,14 +67,10 @@ class ExtensionPoppedContainerComponent {}
               <button type="button" bitBadge variant="primary">Fill</button>
             </bit-item-action>
             <bit-item-action>
-              <button type="button" bitIconButton="bwi-clone" aria-label="Copy item"></button>
+              <button type="button" bitIconButton="bwi-clone" label="Copy item"></button>
             </bit-item-action>
             <bit-item-action>
-              <button
-                type="button"
-                bitIconButton="bwi-ellipsis-v"
-                aria-label="More options"
-              ></button>
+              <button type="button" bitIconButton="bwi-ellipsis-v" label="More options"></button>
             </bit-item-action>
           </ng-container>
         </bit-item>
@@ -102,13 +98,7 @@ class MockAddButtonComponent {}
 @Component({
   selector: "mock-popout-button",
   template: `
-    <button
-      bitIconButton="bwi-popout"
-      size="small"
-      type="button"
-      title="Pop out"
-      aria-label="Pop out"
-    ></button>
+    <button bitIconButton="bwi-popout" size="small" type="button" label="Pop out"></button>
   `,
   imports: [IconButtonModule],
 })
@@ -278,7 +268,13 @@ class MockSettingsPageComponent {}
       <popup-footer slot="footer">
         <button type="button" bitButton buttonType="primary">Save</button>
         <button type="button" bitButton buttonType="secondary">Cancel</button>
-        <button slot="end" type="button" buttonType="danger" bitIconButton="bwi-trash"></button>
+        <button
+          slot="end"
+          type="button"
+          buttonType="danger"
+          bitIconButton="bwi-trash"
+          label="Delete"
+        ></button>
       </popup-footer>
     </popup-page>
   `,
@@ -671,17 +667,13 @@ export const WithVirtualScrollChild: Story = {
                       <button type="button" bitBadge variant="primary">Fill</button>
                     </bit-item-action>
                     <bit-item-action>
-                      <button
-                        type="button"
-                        bitIconButton="bwi-clone"
-                        aria-label="Copy item"
-                      ></button>
+                      <button type="button" bitIconButton="bwi-clone" label="Copy item"></button>
                     </bit-item-action>
                     <bit-item-action>
                       <button
                         type="button"
                         bitIconButton="bwi-ellipsis-v"
-                        aria-label="More options"
+                        label="More options"
                       ></button>
                     </bit-item-action>
                   </ng-container>
diff --git a/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.html b/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.html
index 5d313188d8f..c6ea52aff62 100644
--- a/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.html
+++ b/apps/browser/src/tools/popup/send-v2/add-edit/send-add-edit.component.html
@@ -26,7 +26,7 @@
       slot="end"
       bitIconButton="bwi-trash"
       [bitAction]="deleteSend"
-      appA11yTitle="{{ 'delete' | i18n }}"
+      label="{{ 'delete' | i18n }}"
     ></button>
   </popup-footer>
 </popup-page>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.html
index 21b298fb30a..8f184c6a0c1 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/add-edit/add-edit-v2.component.html
@@ -38,7 +38,7 @@
       type="button"
       buttonType="danger"
       bitIconButton="bwi-trash"
-      [appA11yTitle]="'delete' | i18n"
+      [label]="'delete' | i18n"
     ></button>
   </popup-footer>
 </popup-page>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.html b/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.html
index 567d5277454..f4cc27171ad 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-copy-action/item-copy-actions.component.html
@@ -7,7 +7,7 @@
         size="small"
         appCopyField="username"
         [cipher]="cipher"
-        [appA11yTitle]="'copyUsername' | i18n"
+        [label]="'copyUsername' | i18n"
       ></button>
     </bit-item-action>
     <bit-item-action>
@@ -18,7 +18,7 @@
         size="small"
         appCopyField="password"
         [cipher]="cipher"
-        [appA11yTitle]="'copyPassword' | i18n"
+        [label]="'copyPassword' | i18n"
       ></button>
     </bit-item-action>
     <bit-item-action>
@@ -28,7 +28,7 @@
         size="small"
         appCopyField="totp"
         [cipher]="cipher"
-        [appA11yTitle]="'copyVerificationCode' | i18n"
+        [label]="'copyVerificationCode' | i18n"
       ></button>
     </bit-item-action>
   </ng-container>
@@ -40,7 +40,7 @@
         type="button"
         bitIconButton="bwi-clone"
         size="small"
-        [appA11yTitle]="'copyFieldCipherName' | i18n: singleCopyableLogin.key : cipher.name"
+        [label]="'copyFieldCipherName' | i18n: singleCopyableLogin.key : cipher.name"
         [appCopyField]="singleCopyableLogin.field"
         [cipher]="cipher"
       ></button>
@@ -49,7 +49,7 @@
           type="button"
           bitIconButton="bwi-clone"
           size="small"
-          [appA11yTitle]="
+          [label]="
             hasLoginValues ? ('copyInfoTitle' | i18n: cipher.name) : ('noValuesToCopy' | i18n)
           "
           [disabled]="!hasLoginValues"
@@ -86,7 +86,7 @@
         size="small"
         appCopyField="cardNumber"
         [cipher]="cipher"
-        [appA11yTitle]="'copyNumber' | i18n"
+        [label]="'copyNumber' | i18n"
       ></button>
     </bit-item-action>
     <bit-item-action>
@@ -96,7 +96,7 @@
         size="small"
         appCopyField="securityCode"
         [cipher]="cipher"
-        [appA11yTitle]="'copySecurityCode' | i18n"
+        [label]="'copySecurityCode' | i18n"
       ></button>
     </bit-item-action>
   </ng-container>
@@ -107,7 +107,7 @@
         type="button"
         bitIconButton="bwi-clone"
         size="small"
-        [appA11yTitle]="'copyFieldCipherName' | i18n: singleCopyableCard.key : cipher.name"
+        [label]="'copyFieldCipherName' | i18n: singleCopyableCard.key : cipher.name"
         [appCopyField]="singleCopyableCard.field"
         [cipher]="cipher"
         showToast
@@ -117,7 +117,7 @@
           type="button"
           bitIconButton="bwi-clone"
           size="small"
-          [appA11yTitle]="
+          [label]="
             hasCardValues ? ('copyInfoTitle' | i18n: cipher.name) : ('noValuesToCopy' | i18n)
           "
           [disabled]="!hasCardValues"
@@ -142,7 +142,7 @@
     type="button"
     bitIconButton="bwi-clone"
     size="small"
-    [appA11yTitle]="'copyFieldCipherName' | i18n: singleCopyableIdentity.key : cipher.name"
+    [label]="'copyFieldCipherName' | i18n: singleCopyableIdentity.key : cipher.name"
     [appCopyField]="singleCopyableIdentity.field"
     [cipher]="cipher"
     showToast
@@ -152,7 +152,7 @@
       type="button"
       bitIconButton="bwi-clone"
       size="small"
-      [appA11yTitle]="
+      [label]="
         hasIdentityValues ? ('copyInfoTitle' | i18n: cipher.name) : ('noValuesToCopy' | i18n)
       "
       [disabled]="!hasIdentityValues"
@@ -180,9 +180,7 @@
     type="button"
     bitIconButton="bwi-clone"
     size="small"
-    [appA11yTitle]="
-      hasSecureNoteValue ? ('copyNoteTitle' | i18n: cipher.name) : ('noValuesToCopy' | i18n)
-    "
+    [label]="hasSecureNoteValue ? ('copyNoteTitle' | i18n: cipher.name) : ('noValuesToCopy' | i18n)"
     appCopyField="secureNote"
     [cipher]="cipher"
   ></button>
@@ -193,9 +191,7 @@
     type="button"
     bitIconButton="bwi-clone"
     size="small"
-    [appA11yTitle]="
-      hasSshKeyValues ? ('copyInfoTitle' | i18n: cipher.name) : ('noValuesToCopy' | i18n)
-    "
+    [label]="hasSshKeyValues ? ('copyInfoTitle' | i18n: cipher.name) : ('noValuesToCopy' | i18n)"
     [disabled]="!hasSshKeyValues"
     [bitMenuTriggerFor]="sshKeyOptions"
   ></button>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
index 962f0c914f5..42e2779679a 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.html
@@ -3,8 +3,7 @@
     type="button"
     bitIconButton="bwi-ellipsis-v"
     size="small"
-    [attr.aria-label]="'moreOptionsLabel' | i18n: cipher.name"
-    [title]="'moreOptionsTitle' | i18n: cipher.name"
+    [label]="'moreOptionsLabel' | i18n: cipher.name"
     [disabled]="decryptionFailure"
     [bitMenuTriggerFor]="moreOptions"
   ></button>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.html
index 91feaa433a9..1ab162b56fb 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.html
@@ -8,7 +8,7 @@
       bitIconButton="bwi-sliders"
       [buttonType]="'muted'"
       [bitDisclosureTriggerFor]="disclosureRef"
-      [appA11yTitle]="'filterVault' | i18n"
+      [label]="'filterVault' | i18n"
       aria-describedby="filters-applied"
     ></button>
     <p
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
index b012b7bf157..86bdaa98835 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-list-items-container/vault-list-items-container.component.html
@@ -42,7 +42,7 @@
       type="button"
       size="small"
       (click)="onRefresh.emit()"
-      [appA11yTitle]="'refresh' | i18n"
+      [label]="'refresh' | i18n"
     ></button>
     <span bitTypography="body2" slot="end">
       <span
@@ -141,8 +141,7 @@
                 bitIconButton="bwi-external-link"
                 size="small"
                 (click)="launchCipher(cipher)"
-                [attr.aria-label]="'launchWebsiteName' | i18n: cipher.name"
-                [title]="'launchWebsiteName' | i18n: cipher.name"
+                [label]="'launchWebsiteName' | i18n: cipher.name"
               ></button>
             </bit-item-action>
             <app-item-copy-actions [cipher]="cipher"></app-item-copy-actions>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html
index 8c76db600ae..9b8380a4214 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html
@@ -33,7 +33,7 @@
       type="button"
       buttonType="danger"
       bitIconButton="bwi-trash"
-      [appA11yTitle]="(cipher.isDeleted ? 'deleteForever' : 'delete') | i18n"
+      [label]="(cipher.isDeleted ? 'deleteForever' : 'delete') | i18n"
     ></button>
   </popup-footer>
 </popup-page>
diff --git a/apps/browser/src/vault/popup/settings/folders-v2.component.html b/apps/browser/src/vault/popup/settings/folders-v2.component.html
index 8cea05f9c17..b36b5affc23 100644
--- a/apps/browser/src/vault/popup/settings/folders-v2.component.html
+++ b/apps/browser/src/vault/popup/settings/folders-v2.component.html
@@ -25,7 +25,7 @@
               slot="end"
               type="button"
               (click)="openAddEditFolderDialog(folder)"
-              [appA11yTitle]="'editFolderWithName' | i18n: folder.name"
+              [label]="'editFolderWithName' | i18n: folder.name"
               bitIconButton="bwi-pencil-square"
               class="tw-self-end"
               data-testid="edit-folder-button"
diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
index 11ed2674178..d1e70390844 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
@@ -37,8 +37,7 @@
             type="button"
             bitIconButton="bwi-ellipsis-v"
             size="small"
-            [attr.aria-label]="'moreOptionsLabel' | i18n: cipher.name"
-            [title]="'moreOptionsTitle' | i18n: cipher.name"
+            [label]="'moreOptionsLabel' | i18n: cipher.name"
             [bitMenuTriggerFor]="moreOptions"
           ></button>
           <bit-menu #moreOptions>
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 72d40ed750f..d99d3686d12 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -4077,5 +4077,9 @@
   },
   "enableAutotypeDescription": {
     "message": "Bitwarden does not validate input locations, be sure you are in the right window and field before using the shortcut."
+  },
+  "moreBreadcrumbs": {
+    "message": "More breadcrumbs",
+    "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
   }
 }
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.html b/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.html
index 50d34227b56..9c3e607d6eb 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.html
+++ b/apps/web/src/app/admin-console/organizations/collections/vault-header/vault-header.component.html
@@ -34,6 +34,7 @@
           [bitMenuTriggerFor]="editCollectionMenu"
           size="small"
           type="button"
+          [label]="'editCollection' | i18n"
         ></button>
         <bit-menu #editCollectionMenu>
           <ng-container *ngIf="canEditCollection">
diff --git a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html
index 101512dea04..cc90d10fb4a 100644
--- a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html
@@ -80,7 +80,7 @@
         bitIconButton="bwi-trash"
         bitFormButton
         [bitAction]="delete"
-        [appA11yTitle]="'delete' | i18n"
+        [label]="'delete' | i18n"
       ></button>
     </ng-container>
   </bit-dialog>
diff --git a/apps/web/src/app/admin-console/organizations/manage/groups.component.html b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
index 4518513ba7d..62d0b5b874b 100644
--- a/apps/web/src/app/admin-console/organizations/manage/groups.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
@@ -46,7 +46,7 @@
               type="button"
               bitIconButton="bwi-ellipsis-v"
               size="small"
-              appA11yTitle="{{ 'options' | i18n }}"
+              label="{{ 'options' | i18n }}"
             ></button>
 
             <bit-menu #headerMenu>
@@ -82,7 +82,7 @@
               type="button"
               bitIconButton="bwi-ellipsis-v"
               size="small"
-              appA11yTitle="{{ 'options' | i18n }}"
+              label="{{ 'options' | i18n }}"
             ></button>
 
             <bit-menu #rowMenu>
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.html b/apps/web/src/app/admin-console/organizations/members/members.component.html
index 49946806efc..7e0aa465bf3 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.html
@@ -106,7 +106,7 @@
                 type="button"
                 bitIconButton="bwi-ellipsis-v"
                 size="small"
-                appA11yTitle="{{ 'options' | i18n }}"
+                label="{{ 'options' | i18n }}"
                 *ngIf="showUserManagementControls$ | async"
               ></button>
 
@@ -350,7 +350,7 @@
                 type="button"
                 bitIconButton="bwi-ellipsis-v"
                 size="small"
-                appA11yTitle="{{ 'options' | i18n }}"
+                label="{{ 'options' | i18n }}"
               ></button>
 
               <bit-menu #rowMenu>
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts
index a803f6ef7b5..5cb61197b99 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector-dialog.stories.ts
@@ -51,7 +51,7 @@ const render: Story["render"] = (args) => ({
           buttonType="danger"
           size="default"
           title="Delete"
-          aria-label="Delete"></button>
+          label="Delete"></button>
       </ng-container>
     </bit-dialog>
   `,
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
index e0ffc9a4bce..116af15f579 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
+++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
@@ -122,7 +122,7 @@
           type="button"
           bitIconButton="bwi-close"
           buttonType="muted"
-          appA11yTitle="{{ 'remove' | i18n }} {{ item.labelName }}"
+          label="{{ 'remove' | i18n }} {{ item.labelName }}"
           [disabled]="disabled"
           (click)="selectionList.deselectItem(item.id); handleBlur()"
         ></button>
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.html b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.html
index 4a91fcc2a41..dec257b3741 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.html
@@ -143,7 +143,7 @@
         buttonType="danger"
         class="tw-ml-auto"
         bitFormButton
-        [appA11yTitle]="'delete' | i18n"
+        [label]="'delete' | i18n"
         [bitAction]="delete"
         [disabled]="loading"
       ></button>
diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.html b/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.html
index 6e87d66d18b..1c04c03a8d2 100644
--- a/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.html
+++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.html
@@ -62,7 +62,7 @@
         buttonType="danger"
         [bitAction]="delete"
         *ngIf="editMode"
-        appA11yTitle="{{ 'delete' | i18n }}"
+        label="{{ 'delete' | i18n }}"
       ></button>
     </ng-container>
   </bit-dialog>
diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html
index 8a802e4f6af..70165a94fc3 100644
--- a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html
+++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html
@@ -89,7 +89,7 @@
             <button
               [bitMenuTriggerFor]="trustedContactOptions"
               type="button"
-              appA11yTitle="{{ 'options' | i18n }}"
+              label="{{ 'options' | i18n }}"
               bitIconButton="bwi-ellipsis-v"
               buttonType="main"
             ></button>
@@ -212,7 +212,7 @@
             <button
               [bitMenuTriggerFor]="grantedContactOptions"
               type="button"
-              appA11yTitle="{{ 'options' | i18n }}"
+              label="{{ 'options' | i18n }}"
               bitIconButton="bwi-ellipsis-v"
               buttonType="main"
             ></button>
diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.html
index 1df1e52f7e4..dbad422a32e 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.html
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-yubikey.component.html
@@ -39,7 +39,7 @@
                 type="button"
                 buttonType="danger"
                 (click)="remove(i)"
-                appA11yTitle="{{ 'remove' | i18n }}"
+                label="{{ 'remove' | i18n }}"
               ></button>
             </div>
           </div>
diff --git a/apps/web/src/app/billing/members/free-bitwarden-families.component.html b/apps/web/src/app/billing/members/free-bitwarden-families.component.html
index ddf7c506745..697a5963a71 100644
--- a/apps/web/src/app/billing/members/free-bitwarden-families.component.html
+++ b/apps/web/src/app/billing/members/free-bitwarden-families.component.html
@@ -53,7 +53,7 @@
                       bitIconButton="bwi-ellipsis-v"
                       buttonType="main"
                       [bitMenuTriggerFor]="appListDropdown"
-                      appA11yTitle="{{ 'options' | i18n }}"
+                      label="{{ 'options' | i18n }}"
                     ></button>
                     <bit-menu #appListDropdown>
                       @if (!isSelfHosted && !sponsoredFamily.validUntil) {
diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
index a09000ef55f..465a50ec8c3 100644
--- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
+++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html
@@ -33,7 +33,7 @@
             showToast
             [valueLabel]="'billingSyncKey' | i18n"
             [appCopyClick]="clientSecret"
-            [appA11yTitle]="'copyValue' | i18n"
+            [label]="'copyValue' | i18n"
           ></button>
         </bit-form-field>
         <div class="tw-mt-2 tw-text-sm tw-text-muted" *ngIf="showLastSyncText">
diff --git a/apps/web/src/app/billing/organizations/billing-sync-key.component.html b/apps/web/src/app/billing/organizations/billing-sync-key.component.html
index 9736351deca..94a81140344 100644
--- a/apps/web/src/app/billing/organizations/billing-sync-key.component.html
+++ b/apps/web/src/app/billing/organizations/billing-sync-key.component.html
@@ -33,7 +33,7 @@
         bitIconButton="bwi-trash"
         bitFormButton
         [bitAction]="deleteConnection"
-        appA11yTitle="{{ 'delete' | i18n }}"
+        label="{{ 'delete' | i18n }}"
       ></button>
     </ng-container>
   </bit-dialog>
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
index ace3d749a3f..f899b8eccb4 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
@@ -359,7 +359,7 @@
               type="button"
               [bitIconButton]="totalOpened ? 'bwi-angle-down' : 'bwi-angle-up'"
               size="small"
-              aria-hidden="true"
+              [label]="totalOpened ? ('hidePricingSummary' | i18n) : ('showPricingSummary' | i18n)"
             ></button>
           </p>
         </div>
diff --git a/apps/web/src/app/billing/organizations/change-plan.component.html b/apps/web/src/app/billing/organizations/change-plan.component.html
index 75a12122d19..1cd15a7c836 100644
--- a/apps/web/src/app/billing/organizations/change-plan.component.html
+++ b/apps/web/src/app/billing/organizations/change-plan.component.html
@@ -8,7 +8,7 @@
       type="button"
       size="small"
       class="tw-float-right"
-      appA11yTitle="{{ 'cancel' | i18n }}"
+      label="{{ 'cancel' | i18n }}"
       (click)="cancel()"
     ></button>
     <h2 bitTypography="h2">{{ "changeBillingPlan" | i18n }}</h2>
diff --git a/apps/web/src/app/billing/settings/sponsoring-org-row.component.html b/apps/web/src/app/billing/settings/sponsoring-org-row.component.html
index 1e5690cd85a..5167c0a5c32 100644
--- a/apps/web/src/app/billing/settings/sponsoring-org-row.component.html
+++ b/apps/web/src/app/billing/settings/sponsoring-org-row.component.html
@@ -12,7 +12,7 @@
     bitIconButton="bwi-ellipsis-v"
     buttonType="main"
     [bitMenuTriggerFor]="appListDropdown"
-    appA11yTitle="{{ 'options' | i18n }}"
+    label="{{ 'options' | i18n }}"
   ></button>
   <bit-menu #appListDropdown>
     <button
diff --git a/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.html b/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.html
index 855b83bdb2d..428d6b7f04e 100644
--- a/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.html
+++ b/apps/web/src/app/billing/shared/pricing-summary/pricing-summary.component.html
@@ -11,7 +11,9 @@
         type="button"
         [bitIconButton]="summaryData.totalOpened ? 'bwi-angle-down' : 'bwi-angle-up'"
         size="small"
-        aria-hidden="true"
+        [label]="
+          summaryData.totalOpened ? ('hidePricingSummary' | i18n) : ('showPricingSummary' | i18n)
+        "
       ></button>
     </p>
   </div>
diff --git a/apps/web/src/app/dirt/reports/reports-layout.component.html b/apps/web/src/app/dirt/reports/reports-layout.component.html
index 283d9213cc7..a27556a7aa9 100644
--- a/apps/web/src/app/dirt/reports/reports-layout.component.html
+++ b/apps/web/src/app/dirt/reports/reports-layout.component.html
@@ -2,7 +2,7 @@
 
 <div class="tw-flex tw-flex-wrap tw-gap-4 tw-mt-4">
   <div class="tw-w-full">
-    <a bitButton bitIconButton="bwi-angle-left" routerLink="./" *ngIf="!homepage">
+    <a bitButton routerLink="./" *ngIf="!homepage">
       {{ "backToReports" | i18n }}
     </a>
   </div>
diff --git a/apps/web/src/app/layouts/header/web-header.stories.ts b/apps/web/src/app/layouts/header/web-header.stories.ts
index 9715dbf8cd3..7abddf01f2b 100644
--- a/apps/web/src/app/layouts/header/web-header.stories.ts
+++ b/apps/web/src/app/layouts/header/web-header.stories.ts
@@ -48,7 +48,7 @@ class MockStateService {
 
 @Component({
   selector: "product-switcher",
-  template: `<button type="button" bitIconButton="bwi-filter"></button>`,
+  template: `<button type="button" bitIconButton="bwi-filter" label="Switch products"></button>`,
   standalone: false,
 })
 class MockProductSwitcher {}
diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.component.html b/apps/web/src/app/layouts/product-switcher/product-switcher.component.html
index f1942a02c20..a44f05a7ed7 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.component.html
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.component.html
@@ -3,7 +3,7 @@
   bitIconButton="bwi bwi-fw bwi-filter"
   [bitMenuTriggerFor]="content?.menu"
   [buttonType]="buttonType"
-  [attr.aria-label]="'switchProducts' | i18n"
+  [label]="'switchProducts' | i18n"
   *ngIf="products$ | async"
 ></button>
 <product-switcher-content #content></product-switcher-content>
diff --git a/apps/web/src/app/settings/domain-rules.component.html b/apps/web/src/app/settings/domain-rules.component.html
index 8ebeecb429f..880e2a6da0f 100644
--- a/apps/web/src/app/settings/domain-rules.component.html
+++ b/apps/web/src/app/settings/domain-rules.component.html
@@ -32,7 +32,7 @@
           type="button"
           buttonType="danger"
           (click)="remove(i)"
-          appA11yTitle="{{ 'remove' | i18n }}"
+          label="{{ 'remove' | i18n }}"
         ></button>
       </div>
       <button bitButton type="button" (click)="add()" buttonType="secondary" class="tw-mb-2">
@@ -62,6 +62,7 @@
               bitIconButton="bwi-ellipsis-v"
               [bitMenuTriggerFor]="appListDropdown"
               class="tw-border-0 tw-bg-transparent tw-p-0"
+              [label]="'editDomain' | i18n"
             ></button>
             <bit-menu #appListDropdown>
               <a href="#" bitMenuItem appStopClick (click)="toggleExcluded(d)" *ngIf="!d.excluded">
diff --git a/apps/web/src/app/tools/send/send.component.html b/apps/web/src/app/tools/send/send.component.html
index 042046b85ff..b79f50311ed 100644
--- a/apps/web/src/app/tools/send/send.component.html
+++ b/apps/web/src/app/tools/send/send.component.html
@@ -156,7 +156,7 @@
               type="button"
               [bitMenuTriggerFor]="sendOptions"
               bitIconButton="bwi-ellipsis-v"
-              appA11yTitle="{{ 'options' | i18n }}"
+              label="{{ 'options' | i18n }}"
             ></button>
             <bit-menu #sendOptions>
               <button type="button" bitMenuItem (click)="copy(s)">
diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
index 45df670570d..06d5f5ea81a 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
@@ -71,7 +71,7 @@
         bitIconButton="bwi-trash"
         type="button"
         buttonType="danger"
-        [appA11yTitle]="'delete' | i18n"
+        [label]="'delete' | i18n"
         [bitAction]="delete"
         [disabled]="!canDelete"
         data-testid="delete-cipher-btn"
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
index 006bf9ff197..2074f380e32 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
@@ -82,7 +82,7 @@
     size="small"
     bitIconButton="bwi-ellipsis-v"
     type="button"
-    appA11yTitle="{{ 'options' | i18n }}"
+    label="{{ 'options' | i18n }}"
     appStopProp
   ></button>
   <bit-menu #corruptedCipherOptions>
@@ -101,7 +101,7 @@
       bitIconButton="bwi-ellipsis-v"
       type="button"
       appStopProp
-      appA11yTitle="{{ 'options' | i18n }}"
+      label="{{ 'options' | i18n }}"
     ></button>
     <bit-menu #cipherOptions>
       <ng-container *ngIf="isNotDeletedLoginCipher">
diff --git a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html
index ad2886b1e59..7cd5129d3f0 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html
@@ -65,7 +65,7 @@
       size="small"
       bitIconButton="bwi-ellipsis-v"
       type="button"
-      appA11yTitle="{{ 'options' | i18n }}"
+      label="{{ 'options' | i18n }}"
       appStopProp
     ></button>
   }
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index ef928903a72..5ddccf6a395 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -56,7 +56,7 @@
             bitIconButton="bwi-ellipsis-v"
             size="small"
             type="button"
-            appA11yTitle="{{ 'options' | i18n }}"
+            label="{{ 'options' | i18n }}"
           ></button>
           <bit-menu #headerMenu>
             <button *ngIf="bulkMoveAllowed" type="button" bitMenuItem (click)="bulkMoveToFolder()">
diff --git a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
index 02a7a2b12ff..af4eb182eec 100644
--- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.html
@@ -29,7 +29,7 @@
           [bitMenuTriggerFor]="editCollectionMenu"
           size="small"
           type="button"
-          aria-haspopup="true"
+          [label]="'editCollection' | i18n"
         ></button>
         <bit-menu #editCollectionMenu>
           <button
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index bbd89c1d288..98e3a4d5d11 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -2825,6 +2825,12 @@
       }
     }
   },
+  "showPricingSummary": {
+    "message": "Show pricing summary"
+  },
+  "hidePricingSummary": {
+    "message": "Hide pricing summary"
+  },
   "summary": {
     "message": "Summary"
   },
@@ -11023,6 +11029,10 @@
   "missingTaxIdWarning": {
     "message": "Action required: You're missing a Tax ID number in payment details. If a Tax ID is not added, your invoices may include additional tax."
   },
+  "moreBreadcrumbs": {
+    "message": "More breadcrumbs",
+    "description": "This is used in the context of a breadcrumb navigation, indicating that there are more items in the breadcrumb trail that are not currently displayed."
+  },
   "addTaxId": {
     "message": "Add a Tax ID"
   },
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html
index 48463b7359e..fb17989aa57 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.html
@@ -25,7 +25,7 @@
           bitIconButton="bwi-ellipsis-v"
           size="small"
           type="button"
-          appA11yTitle="{{ 'options' | i18n }}"
+          label="{{ 'options' | i18n }}"
         ></button>
         <bit-menu #headerMenu>
           <button
@@ -71,7 +71,7 @@
           bitIconButton="bwi-ellipsis-v"
           size="small"
           type="button"
-          appA11yTitle="{{ 'options' | i18n }}"
+          label="{{ 'options' | i18n }}"
         ></button>
         <bit-menu #rowMenu>
           <button
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.html
index 7c92bdb7544..a2b231ffd48 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.html
@@ -36,7 +36,7 @@
           type="button"
           bitSuffix
           bitIconButton="bwi-clone"
-          appA11yTitle="{{ 'copyDnsTxtRecord' | i18n }}"
+          label="{{ 'copyDnsTxtRecord' | i18n }}"
           (click)="copyDnsTxt()"
         ></button>
       </bit-form-field>
@@ -67,8 +67,7 @@
         bitIconButton="bwi-trash"
         buttonType="danger"
         size="default"
-        title="{{ 'delete' | i18n }}"
-        aria-label="Delete"
+        label="{{ 'delete' | i18n }}"
         [bitAction]="deleteDomain"
         type="submit"
         bitFormButton
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.html
index 7ade2e6c63d..38cb077c623 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.html
@@ -29,7 +29,7 @@
       bitSuffix
       bitIconButton="bwi-clone"
       [bitAction]="copyScimUrl"
-      [appA11yTitle]="'copyScimUrl' | i18n"
+      [label]="'copyScimUrl' | i18n"
     ></button>
   </bit-form-field>
 
@@ -46,7 +46,7 @@
       bitSuffix
       [bitIconButton]="showScimKey ? 'bwi-eye-slash' : 'bwi-eye'"
       [bitAction]="toggleScimKey"
-      [appA11yTitle]="'toggleVisibility' | i18n"
+      [label]="'toggleVisibility' | i18n"
     ></button>
     <button
       type="button"
@@ -54,14 +54,14 @@
       bitIconButton="bwi-generate"
       [bitAction]="rotateScimKey"
       bitFormButton
-      [appA11yTitle]="'rotateScimKey' | i18n"
+      [label]="'rotateScimKey' | i18n"
     ></button>
     <button
       type="button"
       bitSuffix
       bitIconButton="bwi-clone"
       [bitAction]="copyScimKey"
-      [appA11yTitle]="'copyScimKey' | i18n"
+      [label]="'copyScimKey' | i18n"
     ></button>
     <bit-hint>{{ "scimApiKeyHelperText" | i18n }}</bit-hint>
   </bit-form-field>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/add-edit-member-dialog.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/add-edit-member-dialog.component.html
index 60993f5570c..08e694aa45a 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/add-edit-member-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/dialogs/add-edit-member-dialog.component.html
@@ -58,7 +58,7 @@
           bitIconButton="bwi-trash"
           buttonType="danger"
           bitFormButton
-          [appA11yTitle]="'delete' | i18n"
+          [label]="'delete' | i18n"
           [bitAction]="delete"
           [disabled]="loading"
         ></button>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html
index f203b7a934a..07ccd997b96 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.html
@@ -79,7 +79,7 @@
                 type="button"
                 bitIconButton="bwi-ellipsis-v"
                 size="small"
-                appA11yTitle="{{ 'options' | i18n }}"
+                label="{{ 'options' | i18n }}"
               ></button>
               <bit-menu #headerMenu>
                 <button
@@ -177,7 +177,7 @@
                 type="button"
                 bitIconButton="bwi-ellipsis-v"
                 size="small"
-                appA11yTitle="{{ 'options' | i18n }}"
+                label="{{ 'options' | i18n }}"
               ></button>
               <bit-menu #rowMenu>
                 <button
diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
index 0be7e904af3..ef8241b534c 100644
--- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
+++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.html
@@ -181,7 +181,7 @@
             bitSuffix
             type="button"
             [appCopyClick]="callbackPath"
-            [appA11yTitle]="'copyValue' | i18n"
+            [label]="'copyValue' | i18n"
           ></button>
         </bit-form-field>
 
@@ -193,7 +193,7 @@
             bitSuffix
             type="button"
             [appCopyClick]="signedOutCallbackPath"
-            [appA11yTitle]="'copyValue' | i18n"
+            [label]="'copyValue' | i18n"
           ></button>
         </bit-form-field>
 
@@ -336,7 +336,7 @@
             bitSuffix
             type="button"
             [appCopyClick]="spEntityId"
-            [appA11yTitle]="'copyValue' | i18n"
+            [label]="'copyValue' | i18n"
           ></button>
         </bit-form-field>
 
@@ -348,7 +348,7 @@
             bitSuffix
             type="button"
             [appCopyClick]="spEntityIdStatic"
-            [appA11yTitle]="'copyValue' | i18n"
+            [label]="'copyValue' | i18n"
           ></button>
         </bit-form-field>
 
@@ -360,14 +360,14 @@
             bitSuffix
             type="button"
             [appLaunchClick]="spMetadataUrl"
-            [appA11yTitle]="'launch' | i18n"
+            [label]="'launch' | i18n"
           ></button>
           <button
             bitIconButton="bwi-clone"
             bitSuffix
             type="button"
             [appCopyClick]="spMetadataUrl"
-            [appA11yTitle]="'copyValue' | i18n"
+            [label]="'copyValue' | i18n"
           ></button>
         </bit-form-field>
 
@@ -379,7 +379,7 @@
             bitSuffix
             type="button"
             [appCopyClick]="spAcsUrl"
-            [appA11yTitle]="'copyValue' | i18n"
+            [label]="'copyValue' | i18n"
           ></button>
         </bit-form-field>
 
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
index 043ce65b961..2ab82bd837b 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
@@ -86,7 +86,7 @@
           type="button"
           bitIconButton="bwi-ellipsis-v"
           size="small"
-          appA11yTitle="{{ 'options' | i18n }}"
+          label="{{ 'options' | i18n }}"
         ></button>
         <bit-menu #rowMenu>
           <button
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
index 97c5b187ef9..8e48b5e107d 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html
@@ -84,7 +84,7 @@
           type="button"
           bitIconButton="bwi-ellipsis-v"
           size="small"
-          appA11yTitle="{{ 'options' | i18n }}"
+          label="{{ 'options' | i18n }}"
         ></button>
 
         <bit-menu #rowMenu>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/section.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/overview/section.component.html
index ab7c67c7b22..e7f9692beb3 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/section.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/section.component.html
@@ -7,6 +7,7 @@
       (click)="toggle()"
       [attr.aria-expanded]="open"
       [attr.aria-controls]="contentId"
+      [label]="'toggleVisibility' | i18n"
     ></button>
   </header>
   <div *ngIf="open" [attr.id]="contentId" class="tw-mt-4">
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html
index 24168d0b025..3a2c858ac31 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html
@@ -95,7 +95,7 @@
         buttonType="danger"
         bitIconButton="bwi-trash"
         bitFormButton
-        [appA11yTitle]="'delete' | i18n"
+        [label]="'delete' | i18n"
         [bitAction]="delete"
       ></button>
     </ng-container>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
index fbb0dd8888a..3399b550ba5 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
@@ -40,8 +40,7 @@
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
           [bitMenuTriggerFor]="tableMenu"
-          [title]="'options' | i18n"
-          [attr.aria-label]="'options' | i18n"
+          [label]="'options' | i18n"
         ></button>
       </th>
     </tr>
@@ -65,8 +64,7 @@
           type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
-          [title]="'options' | i18n"
-          [attr.aria-label]="'options' | i18n"
+          [label]="'options' | i18n"
           [bitMenuTriggerFor]="tokenMenu"
         ></button>
       </td>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.html
index b17e47a39ec..11f8e0b9b77 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/config/config.component.html
@@ -11,12 +11,19 @@
           type="button"
           bitIconButton="bwi-clone"
           [bitAction]="copyIdentityUrl"
+          [label]="'copyCustomField' | i18n: identityUrl"
         ></button>
       </bit-form-field>
       <bit-form-field class="tw-w-2/5 tw-min-w-80">
         <bit-label>{{ "apiUrl" | i18n }}</bit-label>
         <input bitInput type="text" [(ngModel)]="apiUrl" [disabled]="true" />
-        <button bitSuffix type="button" bitIconButton="bwi-clone" [bitAction]="copyApiUrl"></button>
+        <button
+          bitSuffix
+          type="button"
+          bitIconButton="bwi-clone"
+          [bitAction]="copyApiUrl"
+          [label]="'copyCustomField' | i18n: apiUrl"
+        ></button>
       </bit-form-field>
     </div>
     <bit-form-field class="tw-w-2/5 tw-min-w-80">
@@ -27,6 +34,7 @@
         type="button"
         bitIconButton="bwi-clone"
         [bitAction]="copyOrganizationId"
+        [label]="'copyCustomField' | i18n: organizationId"
       ></button>
     </bit-form-field>
   </div>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
index bfb7b985423..3d7fc9715c3 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
@@ -39,8 +39,7 @@
           type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
-          [title]="'options' | i18n"
-          [attr.aria-label]="'options' | i18n"
+          [label]="'options' | i18n"
           [bitMenuTriggerFor]="tableMenu"
         ></button>
       </th>
@@ -72,8 +71,7 @@
           type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
-          [title]="'options' | i18n"
-          [attr.aria-label]="'options' | i18n"
+          [label]="'options' | i18n"
           [bitMenuTriggerFor]="serviceAccountMenu"
         ></button>
       </td>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.component.html
index c8a50175781..d01faae4e6e 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.component.html
@@ -67,8 +67,7 @@
             buttonType="main"
             size="default"
             [disabled]="disabled"
-            [attr.title]="'remove' | i18n"
-            [attr.aria-label]="'remove' | i18n"
+            [label]="'remove' | i18n"
             (click)="selectionList.deselectItem(item.id); handleBlur()"
           ></button>
         </td>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html
index bc1655d8b28..236af0d414c 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html
@@ -43,8 +43,7 @@
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
           [bitMenuTriggerFor]="tableMenu"
-          [title]="'options' | i18n"
-          [attr.aria-label]="'options' | i18n"
+          [label]="'options' | i18n"
           *ngIf="showMenus"
         ></button>
       </th>
@@ -77,8 +76,7 @@
                 bitIconButton="bwi-clone"
                 buttonType="main"
                 size="small"
-                [title]="'copyUuid' | i18n"
-                [attr.aria-label]="'copyUuid' | i18n"
+                [label]="'copyUuid' | i18n"
                 (click)="copyProjectUuidToClipboard(project.id)"
               ></button>
             </div>
@@ -94,8 +92,7 @@
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
           [bitMenuTriggerFor]="projectMenu"
-          [title]="'options' | i18n"
-          [attr.aria-label]="'options' | i18n"
+          [label]="'options' | i18n"
           *ngIf="showMenus"
         ></button>
       </td>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
index 859c7417eb8..e5d22a01502 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
@@ -45,8 +45,7 @@
           type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
-          [title]="'options' | i18n"
-          [attr.aria-label]="'options' | i18n"
+          [label]="'options' | i18n"
           [bitMenuTriggerFor]="tableMenu"
         ></button>
       </th>
@@ -78,8 +77,7 @@
                 bitIconButton="bwi-clone"
                 buttonType="main"
                 size="small"
-                [title]="'copyUuid' | i18n"
-                [attr.aria-label]="'copyUuid' | i18n"
+                [label]="'copyUuid' | i18n"
                 (click)="copySecretUuidEvent.emit(secret.id)"
               ></button>
             </div>
@@ -108,8 +106,7 @@
           type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
-          [title]="'options' | i18n"
-          [attr.aria-label]="'options' | i18n"
+          [label]="'options' | i18n"
           [bitMenuTriggerFor]="secretMenu"
         ></button>
       </td>
diff --git a/eslint.config.mjs b/eslint.config.mjs
index c4018b7625e..c745f073fc8 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -12,6 +12,7 @@ import angularRxjs from "eslint-plugin-rxjs-angular";
 import storybook from "eslint-plugin-storybook";
 
 import platformPlugins from "./libs/eslint/platform/index.mjs";
+import componentPlugins from "./libs/eslint/components/index.mjs";
 
 export default tseslint.config(
   ...storybook.configs["flat/recommended"],
@@ -174,6 +175,7 @@ export default tseslint.config(
     plugins: {
       "@angular-eslint/template": angular.templatePlugin,
       tailwindcss: eslintPluginTailwindCSS,
+      "@bitwarden/components": componentPlugins,
     },
     rules: {
       "@angular-eslint/template/button-has-type": "error",
@@ -188,6 +190,10 @@ export default tseslint.config(
       "tailwindcss/enforces-negative-arbitrary-values": "error",
       "tailwindcss/enforces-shorthand": "error",
       "tailwindcss/no-contradicting-classname": "error",
+      "@bitwarden/components/require-label-on-biticonbutton": [
+        "error",
+        { ignoreIfHas: ["bitPasswordInputToggle"] },
+      ],
     },
   },
 
diff --git a/libs/angular/src/vault/components/spotlight/spotlight.component.html b/libs/angular/src/vault/components/spotlight/spotlight.component.html
index e445640cff9..0d0e95e191b 100644
--- a/libs/angular/src/vault/components/spotlight/spotlight.component.html
+++ b/libs/angular/src/vault/components/spotlight/spotlight.component.html
@@ -18,9 +18,8 @@
       size="small"
       *ngIf="!persistent"
       (click)="handleDismiss()"
-      [attr.title]="'close' | i18n"
-      [attr.aria-label]="'close' | i18n"
       class="-tw-me-2"
+      [label]="'close' | i18n"
     ></button>
   </div>
 
diff --git a/libs/auth/src/angular/input-password/input-password.component.html b/libs/auth/src/angular/input-password/input-password.component.html
index d39215b2d68..d56fe6a27fc 100644
--- a/libs/auth/src/angular/input-password/input-password.component.html
+++ b/libs/auth/src/angular/input-password/input-password.component.html
@@ -45,7 +45,7 @@
         type="button"
         bitIconButton="bwi-generate"
         bitSuffix
-        [appA11yTitle]="'generatePassword' | i18n"
+        [label]="'generatePassword' | i18n"
         (click)="generatePassword()"
       ></button>
       <button
@@ -53,7 +53,7 @@
         type="button"
         bitSuffix
         bitIconButton="bwi-clone"
-        appA11yTitle="{{ 'copyPassword' | i18n }}"
+        label="{{ 'copyPassword' | i18n }}"
         (click)="copy()"
       ></button>
       <button
diff --git a/libs/components/src/a11y/a11y-title.directive.ts b/libs/components/src/a11y/a11y-title.directive.ts
index 8bcff2cff4e..15f725f4285 100644
--- a/libs/components/src/a11y/a11y-title.directive.ts
+++ b/libs/components/src/a11y/a11y-title.directive.ts
@@ -1,4 +1,6 @@
-import { Directive, effect, ElementRef, input, Renderer2 } from "@angular/core";
+import { Directive, effect, ElementRef, input } from "@angular/core";
+
+import { setA11yTitleAndAriaLabel } from "./set-a11y-title-and-aria-label";
 
 @Directive({
   selector: "[appA11yTitle]",
@@ -6,19 +8,16 @@ import { Directive, effect, ElementRef, input, Renderer2 } from "@angular/core";
 export class A11yTitleDirective {
   title = input.required<string>({ alias: "appA11yTitle" });
 
-  constructor(
-    private el: ElementRef,
-    private renderer: Renderer2,
-  ) {
+  constructor(private el: ElementRef) {
     const originalTitle = this.el.nativeElement.getAttribute("title");
     const originalAriaLabel = this.el.nativeElement.getAttribute("aria-label");
+
     effect(() => {
-      if (originalTitle === null) {
-        this.renderer.setAttribute(this.el.nativeElement, "title", this.title());
-      }
-      if (originalAriaLabel === null) {
-        this.renderer.setAttribute(this.el.nativeElement, "aria-label", this.title());
-      }
+      setA11yTitleAndAriaLabel({
+        element: this.el.nativeElement,
+        title: originalTitle ?? this.title(),
+        label: originalAriaLabel ?? this.title(),
+      });
     });
   }
 }
diff --git a/libs/components/src/a11y/set-a11y-title-and-aria-label.ts b/libs/components/src/a11y/set-a11y-title-and-aria-label.ts
new file mode 100644
index 00000000000..641a61fe4c6
--- /dev/null
+++ b/libs/components/src/a11y/set-a11y-title-and-aria-label.ts
@@ -0,0 +1,16 @@
+export function setA11yTitleAndAriaLabel({
+  element,
+  title,
+  label,
+}: {
+  element: HTMLElement;
+  title?: string;
+  label?: string;
+}): void {
+  if (title) {
+    element.setAttribute("title", title);
+  }
+  if (label) {
+    element.setAttribute("aria-label", label);
+  }
+}
diff --git a/libs/components/src/async-actions/in-forms.mdx b/libs/components/src/async-actions/in-forms.mdx
index 6b1ab864248..111a0df06af 100644
--- a/libs/components/src/async-actions/in-forms.mdx
+++ b/libs/components/src/async-actions/in-forms.mdx
@@ -125,7 +125,13 @@ handler.
 
 ```html
 <button type="button" bitFormButton bitButton [bitAction]="handler">Do action</button>
-<button type="button" bitFormButton bitIconButton="bwi-star" [bitAction]="handler"></button>
+<button
+  type="button"
+  bitFormButton
+  bitIconButton="bwi-star"
+  label="Your label here"
+  [bitAction]="handler"
+></button>
 ```
 
 ## `[bitSubmit]` Disabled Form Submit
diff --git a/libs/components/src/async-actions/in-forms.stories.ts b/libs/components/src/async-actions/in-forms.stories.ts
index dd901cd2477..88383fe85a3 100644
--- a/libs/components/src/async-actions/in-forms.stories.ts
+++ b/libs/components/src/async-actions/in-forms.stories.ts
@@ -7,6 +7,7 @@ import { delay, of } from "rxjs";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 
+import { A11yTitleDirective } from "../a11y";
 import { ButtonModule } from "../button";
 import { FormFieldModule } from "../form-field";
 import { IconButtonModule } from "../icon-button";
@@ -28,20 +29,21 @@ const template = `
     <bit-form-field>
       <bit-label>Email</bit-label>
       <input bitInput formControlName="email" />
-      <button type="button" bitSuffix bitIconButton="bwi-refresh" bitFormButton [bitAction]="refresh"></button>
+      <button type="button" label="Refresh" bitSuffix bitIconButton="bwi-refresh" bitFormButton [bitAction]="refresh"></button>
     </bit-form-field>
 
     <button class="tw-me-2" type="submit" buttonType="primary" bitButton bitFormButton>Submit</button>
     <button class="tw-me-2" type="button" buttonType="secondary" bitButton bitFormButton>Cancel</button>
     <button class="tw-me-2" type="button" buttonType="danger" bitButton bitFormButton [bitAction]="delete">Delete</button>
     <button class="tw-me-2" type="button" buttonType="secondary" bitButton bitFormButton [disabled]="true">Disabled</button>
-    <button class="tw-me-2" type="button" buttonType="muted" bitIconButton="bwi-star" bitFormButton [bitAction]="delete">Delete</button>
+    <button class="tw-me-2" type="button" buttonType="muted" bitIconButton="bwi-star" label="Delete" bitFormButton [bitAction]="delete">Delete</button>
   </form>`;
 
 @Component({
   selector: "app-promise-example",
   template,
   imports: [
+    A11yTitleDirective,
     AsyncActionsModule,
     ButtonModule,
     FormFieldModule,
@@ -86,6 +88,7 @@ class PromiseExampleComponent {
   selector: "app-observable-example",
   template,
   imports: [
+    A11yTitleDirective,
     AsyncActionsModule,
     ButtonModule,
     FormFieldModule,
diff --git a/libs/components/src/async-actions/standalone.mdx b/libs/components/src/async-actions/standalone.mdx
index f484ea01c58..a781f40d852 100644
--- a/libs/components/src/async-actions/standalone.mdx
+++ b/libs/components/src/async-actions/standalone.mdx
@@ -63,7 +63,7 @@ from how click handlers are usually defined with the output syntax `(click)="han
 ```html
 <button bitButton [bitAction]="handler">Do action</button>
 
-<button bitIconButton="bwi-trash" [bitAction]="handler"></button>`;
+<button bitIconButton="bwi-trash" label="Your label here" [bitAction]="handler"></button>`;
 ```
 
 ## Stories
diff --git a/libs/components/src/async-actions/standalone.stories.ts b/libs/components/src/async-actions/standalone.stories.ts
index 1ed6f6c5a59..99cde70566b 100644
--- a/libs/components/src/async-actions/standalone.stories.ts
+++ b/libs/components/src/async-actions/standalone.stories.ts
@@ -16,7 +16,7 @@ const template = /*html*/ `
   <button type="button" bitButton buttonType="primary" [bitAction]="action" class="tw-me-2">
     Perform action {{ statusEmoji }}
   </button>
-  <button type="button" bitIconButton="bwi-trash" buttonType="danger" [bitAction]="action"></button>`;
+  <button type="button" label="Delete" bitIconButton="bwi-trash" buttonType="danger" [bitAction]="action"></button>`;
 
 @Component({
   template,
diff --git a/libs/components/src/banner/banner.component.html b/libs/components/src/banner/banner.component.html
index 581a56d86cb..bfde8135da9 100644
--- a/libs/components/src/banner/banner.component.html
+++ b/libs/components/src/banner/banner.component.html
@@ -19,8 +19,7 @@
       buttonType="main"
       size="small"
       (click)="onClose.emit()"
-      [attr.title]="'close' | i18n"
-      [attr.aria-label]="'close' | i18n"
+      [label]="'close' | i18n"
     ></button>
   }
 </div>
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.component.html b/libs/components/src/breadcrumbs/breadcrumbs.component.html
index d062e82548e..b63b21de76b 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.component.html
+++ b/libs/components/src/breadcrumbs/breadcrumbs.component.html
@@ -35,6 +35,7 @@
     bitIconButton="bwi-ellipsis-h"
     [bitMenuTriggerFor]="overflowMenu"
     size="small"
+    [label]="'moreBreadcrumbs' | i18n"
   ></button>
   <bit-menu #overflowMenu>
     @for (breadcrumb of overflow; track breadcrumb) {
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.component.ts b/libs/components/src/breadcrumbs/breadcrumbs.component.ts
index a1a6e732459..3c24f91be99 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.component.ts
+++ b/libs/components/src/breadcrumbs/breadcrumbs.component.ts
@@ -2,6 +2,8 @@ import { CommonModule } from "@angular/common";
 import { Component, ContentChildren, QueryList, input } from "@angular/core";
 import { RouterModule } from "@angular/router";
 
+import { I18nPipe } from "@bitwarden/ui-common";
+
 import { IconButtonModule } from "../icon-button";
 import { LinkModule } from "../link";
 import { MenuModule } from "../menu";
@@ -16,7 +18,7 @@ import { BreadcrumbComponent } from "./breadcrumb.component";
 @Component({
   selector: "bit-breadcrumbs",
   templateUrl: "./breadcrumbs.component.html",
-  imports: [CommonModule, LinkModule, RouterModule, IconButtonModule, MenuModule],
+  imports: [I18nPipe, CommonModule, LinkModule, RouterModule, IconButtonModule, MenuModule],
 })
 export class BreadcrumbsComponent {
   readonly show = input(3);
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
index 98af3c0ae7b..893f645a913 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
+++ b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts
@@ -2,9 +2,12 @@ import { Component, importProvidersFrom } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular";
 
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+
 import { IconButtonModule } from "../icon-button";
 import { LinkModule } from "../link";
 import { MenuModule } from "../menu";
+import { I18nMockService } from "../utils";
 
 import { BreadcrumbComponent } from "./breadcrumb.component";
 import { BreadcrumbsComponent } from "./breadcrumbs.component";
@@ -26,6 +29,16 @@ export default {
   decorators: [
     moduleMetadata({
       imports: [LinkModule, MenuModule, IconButtonModule, RouterModule, BreadcrumbComponent],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              moreBreadcrumbs: "More breadcrumbs",
+            });
+          },
+        },
+      ],
     }),
     applicationConfig({
       providers: [
diff --git a/libs/components/src/dialog/dialog/dialog.component.html b/libs/components/src/dialog/dialog/dialog.component.html
index 94fc9ef06a0..9f140ca7624 100644
--- a/libs/components/src/dialog/dialog/dialog.component.html
+++ b/libs/components/src/dialog/dialog/dialog.component.html
@@ -37,8 +37,7 @@
         buttonType="main"
         size="default"
         bitDialogClose
-        [attr.title]="'close' | i18n"
-        [attr.aria-label]="'close' | i18n"
+        [label]="'close' | i18n"
       ></button>
     }
   </header>
diff --git a/libs/components/src/dialog/dialog/dialog.stories.ts b/libs/components/src/dialog/dialog/dialog.stories.ts
index 71e07542ed8..f93ef1a2f25 100644
--- a/libs/components/src/dialog/dialog/dialog.stories.ts
+++ b/libs/components/src/dialog/dialog/dialog.stories.ts
@@ -101,8 +101,7 @@ export const Default: Story = {
             bitIconButton="bwi-trash"
             buttonType="danger"
             size="default"
-            title="Delete"
-            aria-label="Delete"></button>
+            label="Delete"></button>
         </ng-container>
       </bit-dialog>
     `,
@@ -219,7 +218,7 @@ export const WithCards: Story = {
               <h2 bitTypography="h6">
                 Foo
               </h2>
-              <button type="button" bitIconButton="bwi-star" size="small" slot="end"></button>
+              <button type="button" label="Favorite" bitIconButton="bwi-star" size="small" slot="end"></button>
             </bit-section-header>
             <bit-card>
               <bit-form-field>
@@ -239,7 +238,7 @@ export const WithCards: Story = {
               <h2 bitTypography="h6">
                 Bar
               </h2>
-              <button type="button" bitIconButton="bwi-star" size="small" slot="end"></button>
+              <button label="Favorite" type="button" bitIconButton="bwi-star" size="small" slot="end"></button>
             </bit-section-header>
             <bit-card>
               <bit-form-field>
@@ -265,8 +264,7 @@ export const WithCards: Story = {
             bitIconButton="bwi-trash"
             buttonType="danger"
             size="default"
-            title="Delete"
-            aria-label="Delete"></button>
+            label="Delete"></button>
         </ng-container>
       </bit-dialog>
   </form>
diff --git a/libs/components/src/disclosure/disclosure.component.ts b/libs/components/src/disclosure/disclosure.component.ts
index 703c815087b..2d73d7d8ad6 100644
--- a/libs/components/src/disclosure/disclosure.component.ts
+++ b/libs/components/src/disclosure/disclosure.component.ts
@@ -28,6 +28,7 @@ let nextId = 0;
   *   bitIconButton="bwi-sliders"
   *   [buttonType]="'muted'"
   *   [bitDisclosureTriggerFor]="disclosureRef"
+  *   [label]="'Settings' | i18n"
   * ></button>
   * <bit-disclosure #disclosureRef open>click button to hide this content</bit-disclosure>
   * ```
diff --git a/libs/components/src/disclosure/disclosure.stories.ts b/libs/components/src/disclosure/disclosure.stories.ts
index bb3680c1f3b..2e45964ccaa 100644
--- a/libs/components/src/disclosure/disclosure.stories.ts
+++ b/libs/components/src/disclosure/disclosure.stories.ts
@@ -27,7 +27,7 @@ export const DisclosureWithIconButton: Story = {
   render: (args) => ({
     props: args,
     template: /*html*/ `
-      <button type="button" bitIconButton="bwi-sliders" [buttonType]="'muted'" [bitDisclosureTriggerFor]="disclosureRef">
+      <button type="button" label="Settings" bitIconButton="bwi-sliders" [buttonType]="'muted'" [bitDisclosureTriggerFor]="disclosureRef">
       </button>
       <bit-disclosure #disclosureRef class="tw-text-main tw-block" open>click button to hide this content</bit-disclosure>
     `,
diff --git a/libs/components/src/drawer/drawer-header.component.html b/libs/components/src/drawer/drawer-header.component.html
index 863b19edfb2..2723744eda3 100644
--- a/libs/components/src/drawer/drawer-header.component.html
+++ b/libs/components/src/drawer/drawer-header.component.html
@@ -5,11 +5,5 @@
       {{ title() }}
     </h2>
   </div>
-  <button
-    bitIconButton="bwi-close"
-    type="button"
-    bitDrawerClose
-    [attr.title]="'close' | i18n"
-    [attr.aria-label]="'close' | i18n"
-  ></button>
+  <button bitIconButton="bwi-close" type="button" bitDrawerClose [label]="'close' | i18n"></button>
 </header>
diff --git a/libs/components/src/form-field/form-field.stories.ts b/libs/components/src/form-field/form-field.stories.ts
index e070765ec8a..7aeb2f63040 100644
--- a/libs/components/src/form-field/form-field.stories.ts
+++ b/libs/components/src/form-field/form-field.stories.ts
@@ -239,8 +239,8 @@ export const Readonly: Story = {
       <bit-form-field>
         <bit-label>Input</bit-label>
         <input bitInput type="password" value="Foobar" [readonly]="true" />
-        <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
-        <button type="button" bitSuffix bitIconButton="bwi-clone" [appA11yTitle]="'Clone Input'"></button>
+        <button type="button" label="Toggle password" bitIconButton bitSuffix bitPasswordInputToggle></button>
+        <button type="button" bitSuffix bitIconButton="bwi-clone" [label]="'Clone Input'"></button>
       </bit-form-field>
 
       <bit-form-field>
@@ -261,7 +261,7 @@ export const Readonly: Story = {
               <bit-label>Input</bit-label>
               <input bitInput type="password" value="Foobar" readonly />
               <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
-              <button type="button" bitSuffix bitIconButton="bwi-clone" [appA11yTitle]="'Clone Input'"></button>
+              <button type="button" bitSuffix bitIconButton="bwi-clone" [label]="'Clone Input'"></button>
             </bit-form-field>
 
             <bit-form-field>
@@ -309,11 +309,11 @@ export const ButtonInputGroup: Story = {
             <i class="bwi bwi-question-circle" aria-hidden="true"></i>
           </a>
         </bit-label>
-        <button type="button" bitPrefix bitIconButton="bwi-star" [appA11yTitle]="'Favorite Label'"></button>
+        <button type="button" bitPrefix bitIconButton="bwi-star" [label]="'Favorite Label'"></button>
         <input bitInput placeholder="Placeholder" />
-        <button type="button" bitSuffix bitIconButton="bwi-eye" [appA11yTitle]="'Hide Label'"></button>
-        <button type="button" bitSuffix bitIconButton="bwi-clone" [appA11yTitle]="'Clone Label'"></button>
-        <button type="button" bitSuffix bitIconButton="bwi-ellipsis-v" [appA11yTitle]="'Menu Label'"></button>
+        <button type="button" bitSuffix bitIconButton="bwi-eye" [label]="'Hide Label'"></button>
+        <button type="button" bitSuffix bitIconButton="bwi-clone" [label]="'Clone Label'"></button>
+        <button type="button" bitSuffix bitIconButton="bwi-ellipsis-v" [label]="'Menu Label'"></button>
       </bit-form-field>
     `,
   }),
@@ -326,11 +326,11 @@ export const DisabledButtonInputGroup: Story = {
     template: /*html*/ `
       <bit-form-field>
         <bit-label>Label</bit-label>
-        <button type="button" bitPrefix bitIconButton="bwi-star" disabled [appA11yTitle]="'Favorite Label'"></button>
+        <button type="button" bitPrefix bitIconButton="bwi-star" disabled [label]="'Favorite Label'"></button>
         <input bitInput placeholder="Placeholder" disabled />
-        <button type="button" bitSuffix bitIconButton="bwi-eye" disabled [appA11yTitle]="'Hide Label'"></button>
-        <button type="button" bitSuffix bitIconButton="bwi-clone" disabled [appA11yTitle]="'Clone Label'"></button>
-        <button type="button" bitSuffix bitIconButton="bwi-ellipsis-v" disabled [appA11yTitle]="'Menu Label'"></button>
+        <button type="button" bitSuffix bitIconButton="bwi-eye" disabled [label]="'Hide Label'"></button>
+        <button type="button" bitSuffix bitIconButton="bwi-clone" disabled [label]="'Clone Label'"></button>
+        <button type="button" bitSuffix bitIconButton="bwi-ellipsis-v" disabled [label]="'Menu Label'"></button>
 
       </bit-form-field>
     `,
@@ -345,9 +345,9 @@ export const PartiallyDisabledButtonInputGroup: Story = {
       <bit-form-field>
         <bit-label>Label</bit-label>
         <input bitInput placeholder="Placeholder" disabled />
-        <button type="button" bitSuffix bitIconButton="bwi-eye" [appA11yTitle]="'Hide Label'"></button>
-        <button type="button" bitSuffix bitIconButton="bwi-clone" [appA11yTitle]="'Clone Label'"></button>
-        <button type="button" bitSuffix bitIconButton="bwi-ellipsis-v" disabled [appA11yTitle]="'Menu Label'"></button>
+        <button type="button" bitSuffix bitIconButton="bwi-eye" [label]="'Hide Label'"></button>
+        <button type="button" bitSuffix bitIconButton="bwi-clone" [label]="'Clone Label'"></button>
+        <button type="button" bitSuffix bitIconButton="bwi-ellipsis-v" disabled [label]="'Menu Label'"></button>
       </bit-form-field>
     `,
   }),
diff --git a/libs/components/src/form-field/password-input-toggle.spec.ts b/libs/components/src/form-field/password-input-toggle.spec.ts
index 95110f2bd93..72f2481d789 100644
--- a/libs/components/src/form-field/password-input-toggle.spec.ts
+++ b/libs/components/src/form-field/password-input-toggle.spec.ts
@@ -20,7 +20,13 @@ import { BitPasswordInputToggleDirective } from "./password-input-toggle.directi
       <bit-form-field>
         <bit-label>Password</bit-label>
         <input bitInput type="password" />
-        <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
+        <button
+          type="button"
+          label="Toggle password visibility"
+          bitIconButton
+          bitSuffix
+          bitPasswordInputToggle
+        ></button>
       </bit-form-field>
     </form>
   `,
diff --git a/libs/components/src/form-field/password-input-toggle.stories.ts b/libs/components/src/form-field/password-input-toggle.stories.ts
index d46ec92ab37..3d50a4eb75a 100644
--- a/libs/components/src/form-field/password-input-toggle.stories.ts
+++ b/libs/components/src/form-field/password-input-toggle.stories.ts
@@ -48,7 +48,7 @@ export const Default: Story = {
         <bit-form-field>
           <bit-label>Password</bit-label>
           <input bitInput type="password" />
-          <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
+          <button type="button" label="Toggle password visibility" bitIconButton bitSuffix bitPasswordInputToggle></button>
         </bit-form-field>
       </form>
     `,
@@ -63,7 +63,7 @@ export const Binding: Story = {
         <bit-form-field>
           <bit-label>Password</bit-label>
           <input bitInput type="password" />
-          <button type="button" bitIconButton bitSuffix bitPasswordInputToggle [(toggled)]="toggled"></button>
+          <button type="button" label="Toggle password visibility" bitIconButton bitSuffix bitPasswordInputToggle [(toggled)]="toggled"></button>
         </bit-form-field>
   
         <label class="tw-text-main">
diff --git a/libs/components/src/icon-button/icon-button.component.ts b/libs/components/src/icon-button/icon-button.component.ts
index 5f5de1df3ef..3849ff85e37 100644
--- a/libs/components/src/icon-button/icon-button.component.ts
+++ b/libs/components/src/icon-button/icon-button.component.ts
@@ -1,8 +1,9 @@
 import { NgClass } from "@angular/common";
-import { Component, computed, ElementRef, HostBinding, input, model } from "@angular/core";
+import { Component, computed, effect, ElementRef, HostBinding, input, model } from "@angular/core";
 import { toObservable, toSignal } from "@angular/core/rxjs-interop";
 import { debounce, interval } from "rxjs";
 
+import { setA11yTitleAndAriaLabel } from "../a11y/set-a11y-title-and-aria-label";
 import { ButtonLikeAbstraction } from "../shared/button-like.abstraction";
 import { FocusableElement } from "../shared/focusable-element";
 
@@ -62,7 +63,7 @@ const sizes: Record<IconButtonSize, string[]> = {
   small: ["tw-text-base", "tw-p-2", "tw-rounded"],
 };
 /**
-  * Icon buttons are used when no text accompanies the button. It consists of an icon that may be updated to any icon in the `bwi-font`, a `title` attribute, and an `aria-label`.
+  * Icon buttons are used when no text accompanies the button. It consists of an icon that may be updated to any icon in the `bwi-font`, a `title` attribute, and an `aria-label` that are added via the `label` input.
 
   * The most common use of the icon button is in the banner, toast, and modal components as a close button. It can also be found in tables as the 3 dot option menu, or on navigation list items when there are options that need to be collapsed into a menu.
 
@@ -94,6 +95,14 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
 
   readonly size = model<IconButtonSize>("default");
 
+  /**
+   * label input will be used to set the `aria-label` attributes on the button.
+   * This is for accessibility purposes, as it provides a text alternative for the icon button.
+   *
+   * NOTE: It will also be used to set the `title` attribute on the button if no `title` is provided.
+   */
+  readonly label = input<string>();
+
   @HostBinding("class") get classList() {
     return [
       "tw-font-semibold",
@@ -159,5 +168,15 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
     return this.elementRef.nativeElement;
   }
 
-  constructor(private elementRef: ElementRef) {}
+  constructor(private elementRef: ElementRef) {
+    const originalTitle = this.elementRef.nativeElement.getAttribute("title");
+
+    effect(() => {
+      setA11yTitleAndAriaLabel({
+        element: this.elementRef.nativeElement,
+        title: originalTitle ?? this.label(),
+        label: this.label(),
+      });
+    });
+  }
 }
diff --git a/libs/components/src/icon-button/icon-button.stories.ts b/libs/components/src/icon-button/icon-button.stories.ts
index 45022a55535..d716b9697f2 100644
--- a/libs/components/src/icon-button/icon-button.stories.ts
+++ b/libs/components/src/icon-button/icon-button.stories.ts
@@ -9,6 +9,7 @@ export default {
   component: BitIconButtonComponent,
   args: {
     bitIconButton: "bwi-plus",
+    label: "Your button label here",
   },
   argTypes: {
     buttonType: {
diff --git a/libs/components/src/item/item.mdx b/libs/components/src/item/item.mdx
index d3e6065487a..a5b20dbcb62 100644
--- a/libs/components/src/item/item.mdx
+++ b/libs/components/src/item/item.mdx
@@ -102,10 +102,10 @@ Actions are commonly icon buttons or badge buttons.
       <button type="button" bitBadge variant="primary">Auto-fill</button>
     </bit-item-action>
     <bit-item-action>
-      <button type="button" bitIconButton="bwi-clone" aria-label="Copy"></button>
+      <button type="button" bitIconButton="bwi-clone" label="Copy"></button>
     </bit-item-action>
     <bit-item-action>
-      <button type="button" bitIconButton="bwi-ellipsis-v" aria-label="Options"></button>
+      <button type="button" bitIconButton="bwi-ellipsis-v" label="Options"></button>
     </bit-item-action>
   </ng-container>
 </bit-item>
diff --git a/libs/components/src/item/item.stories.ts b/libs/components/src/item/item.stories.ts
index 15b81f3f67e..bc2ced7fd11 100644
--- a/libs/components/src/item/item.stories.ts
+++ b/libs/components/src/item/item.stories.ts
@@ -77,10 +77,10 @@ export const Default: Story = {
             <button type="button" bitBadge variant="primary">Fill</button>
           </bit-item-action>
           <bit-item-action>
-            <button type="button" bitIconButton="bwi-clone" size="small"></button>
+            <button type="button" bitIconButton="bwi-clone" size="small" label="Clone"></button>
           </bit-item-action>
           <bit-item-action>
-            <button type="button" bitIconButton="bwi-ellipsis-v" size="small"></button>
+            <button type="button" bitIconButton="bwi-ellipsis-v" size="small" label="More options"></button>
           </bit-item-action>
         </ng-container>
       </bit-item>
@@ -150,10 +150,10 @@ export const TextOverflowTruncate: Story = {
         </bit-item-content>
         <ng-container slot="end">
           <bit-item-action>
-            <button type="button" bitIconButton="bwi-clone" size="small"></button>
+            <button type="button" bitIconButton="bwi-clone" size="small" label="Clone"></button>
           </bit-item-action>
           <bit-item-action>
-            <button type="button" bitIconButton="bwi-ellipsis-v" size="small"></button>
+            <button type="button" bitIconButton="bwi-ellipsis-v" size="small" label="More options"></button>
           </bit-item-action>
         </ng-container>
       </bit-item>
@@ -173,10 +173,10 @@ export const TextOverflowWrap: Story = {
         </bit-item-content>
         <ng-container slot="end">
           <bit-item-action>
-            <button type="button" bitIconButton="bwi-clone" size="small"></button>
+            <button type="button" bitIconButton="bwi-clone" size="small" label="Clone"></button>
           </bit-item-action>
           <bit-item-action>
-            <button type="button" bitIconButton="bwi-ellipsis-v" size="small"></button>
+            <button type="button" bitIconButton="bwi-ellipsis-v" size="small" label="More options"></button>
           </bit-item-action>
         </ng-container>
       </bit-item>
@@ -198,10 +198,10 @@ const multipleActionListTemplate = /*html*/ `
           <button type="button" bitBadge variant="primary">Fill</button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-clone" size="small"></button>
+          <button type="button" bitIconButton="bwi-clone" size="small" label="Clone"></button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-ellipsis-v" size="small"></button>
+          <button type="button" bitIconButton="bwi-ellipsis-v" size="small" label="More options"></button>
         </bit-item-action>
       </ng-container>
     </bit-item>
@@ -217,10 +217,10 @@ const multipleActionListTemplate = /*html*/ `
           <button type="button" bitBadge variant="primary">Fill</button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-clone" size="small"></button>
+          <button type="button" bitIconButton="bwi-clone" size="small" label="Clone"></button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-ellipsis-v" size="small"></button>
+          <button type="button" bitIconButton="bwi-ellipsis-v" size="small" label="More options"></button>
         </bit-item-action>
       </ng-container>
     </bit-item>
@@ -236,10 +236,10 @@ const multipleActionListTemplate = /*html*/ `
           <button type="button" bitBadge variant="primary">Fill</button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-clone" size="small"></button>
+          <button type="button" bitIconButton="bwi-clone" size="small" label="Clone"></button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-ellipsis-v" size="small"></button>
+          <button type="button" bitIconButton="bwi-ellipsis-v" size="small" label="More options"></button>
         </bit-item-action>
       </ng-container>
     </bit-item>
@@ -255,10 +255,10 @@ const multipleActionListTemplate = /*html*/ `
           <button type="button" bitBadge variant="primary">Fill</button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-clone" size="small"></button>
+          <button type="button" bitIconButton="bwi-clone" size="small" label="Clone"></button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-ellipsis-v" size="small"></button>
+          <button type="button" bitIconButton="bwi-ellipsis-v" size="small" label="More options"></button>
         </bit-item-action>
       </ng-container>
     </bit-item>
@@ -274,10 +274,10 @@ const multipleActionListTemplate = /*html*/ `
           <button type="button" bitBadge variant="primary">Fill</button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-clone" size="small"></button>
+          <button type="button" bitIconButton="bwi-clone" size="small" label="Clone"></button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-ellipsis-v" size="small"></button>
+          <button type="button" bitIconButton="bwi-ellipsis-v" size="small" label="More options"></button>
         </bit-item-action>
       </ng-container>
     </bit-item>
@@ -293,10 +293,10 @@ const multipleActionListTemplate = /*html*/ `
           <button type="button" bitBadge variant="primary">Fill</button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-clone" size="small"></button>
+          <button type="button" bitIconButton="bwi-clone" size="small" label="Clone"></button>
         </bit-item-action>
         <bit-item-action>
-          <button type="button" bitIconButton="bwi-ellipsis-v" size="small"></button>
+          <button type="button" bitIconButton="bwi-ellipsis-v" size="small" label="More options"></button>
         </bit-item-action>
       </ng-container>
     </bit-item>
@@ -410,10 +410,10 @@ export const VirtualScrolling: Story = {
                 <button type="button" bitBadge variant="primary">Fill</button>
               </bit-item-action>
               <bit-item-action>
-                <button type="button" bitIconButton="bwi-clone" size="small"></button>
+                <button type="button" bitIconButton="bwi-clone" size="small" label="Clone"></button>
               </bit-item-action>
               <bit-item-action>
-                <button type="button" bitIconButton="bwi-ellipsis-v" size="small"></button>
+                <button type="button" bitIconButton="bwi-ellipsis-v" size="small" label="More options"></button>
               </bit-item-action>
             </ng-container>
           </bit-item>
@@ -440,10 +440,10 @@ export const WithoutBorderRadius: Story = {
             <button type="button" bitBadge variant="primary">Fill</button>
           </bit-item-action>
           <bit-item-action>
-            <button type="button" bitIconButton="bwi-clone"></button>
+            <button type="button" bitIconButton="bwi-clone" label="Clone"></button>
           </bit-item-action>
           <bit-item-action>
-            <button type="button" bitIconButton="bwi-ellipsis-v"></button>
+            <button type="button" bitIconButton="bwi-ellipsis-v" label="More options"></button>
           </bit-item-action>
         </ng-container>
       </bit-item>
diff --git a/libs/components/src/navigation/nav-group.component.html b/libs/components/src/navigation/nav-group.component.html
index e294f3cebe2..195569292f6 100644
--- a/libs/components/src/navigation/nav-group.component.html
+++ b/libs/components/src/navigation/nav-group.component.html
@@ -18,11 +18,10 @@
         [buttonType]="'nav-contrast'"
         (click)="toggle($event)"
         size="small"
-        [title]="'toggleCollapse' | i18n"
         aria-haspopup="true"
         [attr.aria-expanded]="open().toString()"
         [attr.aria-controls]="contentId"
-        [attr.aria-label]="['toggleCollapse' | i18n, text()].join(' ')"
+        [label]="['toggleCollapse' | i18n, text()].join(' ')"
       ></button>
     </ng-template>
     <ng-container slot="end">
diff --git a/libs/components/src/navigation/nav-item.stories.ts b/libs/components/src/navigation/nav-item.stories.ts
index c3f7e526ecb..dbd17695c8b 100644
--- a/libs/components/src/navigation/nav-item.stories.ts
+++ b/libs/components/src/navigation/nav-item.stories.ts
@@ -95,7 +95,7 @@ export const WithChildButtons: Story = {
           [bitIconButton]="'bwi-pencil-square'"
           [buttonType]="'nav-contrast'"
           size="small"
-          aria-label="option 2"
+          label="Edit"
         ></button>
         <button
           type="button" 
@@ -104,7 +104,7 @@ export const WithChildButtons: Story = {
           [bitIconButton]="'bwi-check'"
           [buttonType]="'nav-contrast'"
           size="small"
-          aria-label="option 3"
+          label="Confirm"
         ></button>
       </bit-nav-item>
     `,
diff --git a/libs/components/src/navigation/side-nav.component.html b/libs/components/src/navigation/side-nav.component.html
index a5866b5e42e..1fdd40b1588 100644
--- a/libs/components/src/navigation/side-nav.component.html
+++ b/libs/components/src/navigation/side-nav.component.html
@@ -37,7 +37,7 @@
           buttonType="nav-contrast"
           size="small"
           (click)="sideNavService.toggle()"
-          [attr.aria-label]="'toggleSideNavigation' | i18n"
+          [label]="'toggleSideNavigation' | i18n"
           [attr.aria-expanded]="data.open"
           aria-controls="bit-side-nav"
         ></button>
diff --git a/libs/components/src/popover/popover.component.html b/libs/components/src/popover/popover.component.html
index 328da284732..756ac27b749 100644
--- a/libs/components/src/popover/popover.component.html
+++ b/libs/components/src/popover/popover.component.html
@@ -18,8 +18,7 @@
           <button
             type="button"
             bitIconButton="bwi-close"
-            [attr.title]="'close' | i18n"
-            [attr.aria-label]="'close' | i18n"
+            [label]="'close' | i18n"
             (click)="closed.emit()"
             size="small"
           ></button>
diff --git a/libs/components/src/section/section.mdx b/libs/components/src/section/section.mdx
index 92798420479..81d98101c06 100644
--- a/libs/components/src/section/section.mdx
+++ b/libs/components/src/section/section.mdx
@@ -51,7 +51,7 @@ padding to align the header with the border radius of the card/item.
 <bit-section>
   <bit-section-header>
     <h2 bitTypography="h6">I'm a section header</h2>
-    <button bitIconButton="bwi-star" size="small" slot="end"></button>
+    <button bitIconButton="bwi-star" label="Favorite" size="small" slot="end"></button>
   </bit-section-header>
   <bit-card>
     <h3 bitTypography="h3">I'm card content</h3>
diff --git a/libs/components/src/section/section.stories.ts b/libs/components/src/section/section.stories.ts
index f28cca0af7b..31cdd0a324c 100644
--- a/libs/components/src/section/section.stories.ts
+++ b/libs/components/src/section/section.stories.ts
@@ -69,7 +69,7 @@ export const HeaderVariants: Story = {
         <h2 bitTypography="h6">
           Title with icon button suffix
         </h2>
-        <button type="button" bitIconButton="bwi-refresh" size="small"></button>
+        <button type="button" label="Refresh" bitIconButton="bwi-refresh" size="small"></button>
       </bit-section-header>
     `,
   }),
@@ -88,7 +88,7 @@ export const HeaderEndSlotVariants: Story = {
         <h2 bitTypography="h6">
           Title with end slot icon button
         </h2>
-        <button type="button" bitIconButton="bwi-star" size="small" slot="end"></button>
+        <button type="button" label="Favorite" bitIconButton="bwi-star" size="small" slot="end"></button>
       </bit-section-header>
     `,
   }),
@@ -103,7 +103,7 @@ export const HeaderWithPadding: Story = {
             <h2 bitTypography="h6">
               Card as immediate sibling
             </h2>
-            <button type="button" bitIconButton="bwi-star" size="small" slot="end"></button>
+            <button type="button" label="Favorite" bitIconButton="bwi-star" size="small" slot="end"></button>
           </bit-section-header>
           <bit-card>
             <h3 bitTypography="h3">bit-section-header has padding</h3>
@@ -114,7 +114,7 @@ export const HeaderWithPadding: Story = {
             <h2 bitTypography="h6">
               Card nested in immediate sibling
             </h2>
-            <button type="button" bitIconButton="bwi-star" size="small" slot="end"></button>
+            <button type="button" label="Favorite" bitIconButton="bwi-star" size="small" slot="end"></button>
           </bit-section-header>
           <div>
             <bit-card>
@@ -127,7 +127,7 @@ export const HeaderWithPadding: Story = {
             <h2 bitTypography="h6">
               Item as immediate sibling
             </h2>
-            <button type="button" bitIconButton="bwi-star" size="small" slot="end"></button>
+            <button type="button" label="Favorite" bitIconButton="bwi-star" size="small" slot="end"></button>
           </bit-section-header>
           <bit-item>
             <bit-item-content bitTypography="body1">bit-section-header has padding</bit-item-content>
@@ -138,7 +138,7 @@ export const HeaderWithPadding: Story = {
             <h2 bitTypography="h6">
               Item nested in immediate sibling
             </h2>
-            <button type="button" bitIconButton="bwi-star" size="small" slot="end"></button>
+            <button type="button" label="Favorite" bitIconButton="bwi-star" size="small" slot="end"></button>
           </bit-section-header>
           <bit-item-group>
             <bit-item>
@@ -160,7 +160,7 @@ export const HeaderWithoutPadding: Story = {
             <h2 bitTypography="h6">
               No card or item used
             </h2>
-            <button bitIconButton="bwi-star" size="small" slot="end"></button>
+            <button bitIconButton="bwi-star" size="small" slot="end" label="Favorite"></button>
           </bit-section-header>
           <div>
             <h3 bitTypography="h3">just a div, so bit-section-header has no padding</h3>
@@ -171,7 +171,7 @@ export const HeaderWithoutPadding: Story = {
             <h2 bitTypography="h6">
               Card nested in non-immediate sibling
             </h2>
-            <button bitIconButton="bwi-star" size="small" slot="end"></button>
+            <button bitIconButton="bwi-star" size="small" slot="end" label="Favorite"></button>
           </bit-section-header>
           <div class="tw-text-main">
             a div here
diff --git a/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts b/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts
index 9eb68d3f23f..7f6a6c42f32 100644
--- a/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/dialog-virtual-scroll-block.component.ts
@@ -36,7 +36,7 @@ import { TableDataSource, TableModule } from "../../../table";
               <button
                 bitIconButton="bwi-ellipsis-v"
                 type="button"
-                aria-label="Options"
+                label="Options"
                 (click)="openDefaultDialog()"
               ></button>
             </td>
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
index 316dbf22d66..f92a14330d6 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-form.component.ts
@@ -80,7 +80,13 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
           </button>
         </bit-label>
         <input bitInput type="password" formControlName="password" />
-        <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
+        <button
+          type="button"
+          label="Toggle password visibility"
+          bitIconButton
+          bitSuffix
+          bitPasswordInputToggle
+        ></button>
       </bit-form-field>
 
       <div class="tw-mb-6">
diff --git a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
index 8765eae9960..302d9f6c0a8 100644
--- a/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
+++ b/libs/components/src/stories/kitchen-sink/components/kitchen-sink-table.component.ts
@@ -23,6 +23,7 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
               type="button"
               bitIconButton="bwi-ellipsis-v"
               [bitMenuTriggerFor]="menu1"
+              label="Options"
             ></button>
             <bit-menu #menu1>
               <a href="#" bitMenuItem>Anchor link</a>
@@ -40,6 +41,7 @@ import { KitchenSinkSharedModule } from "../kitchen-sink-shared.module";
               type="button"
               bitIconButton="bwi-ellipsis-v"
               [bitMenuTriggerFor]="menu2"
+              label="Options"
             ></button>
             <bit-menu #menu2>
               <a href="#" bitMenuItem>Anchor link</a>
diff --git a/libs/components/src/toast/toast.component.html b/libs/components/src/toast/toast.component.html
index a110336856e..36d58dcdda7 100644
--- a/libs/components/src/toast/toast.component.html
+++ b/libs/components/src/toast/toast.component.html
@@ -25,6 +25,7 @@
       type="button"
       size="small"
       (click)="this.onClose.emit()"
+      [label]="'close' | i18n"
     ></button>
   </div>
   <div class="tw-h-1 tw-w-full tw-bg-text-main/30" [style.width]="progressWidth() + '%'"></div>
diff --git a/libs/eslint/components/index.mjs b/libs/eslint/components/index.mjs
new file mode 100644
index 00000000000..0a9b1d1481f
--- /dev/null
+++ b/libs/eslint/components/index.mjs
@@ -0,0 +1,3 @@
+import requireLabelOnBiticonbutton from "./require-label-on-biticonbutton.mjs";
+
+export default { rules: { "require-label-on-biticonbutton": requireLabelOnBiticonbutton } };
diff --git a/libs/eslint/components/require-label-on-biticonbutton.mjs b/libs/eslint/components/require-label-on-biticonbutton.mjs
new file mode 100644
index 00000000000..be177c65017
--- /dev/null
+++ b/libs/eslint/components/require-label-on-biticonbutton.mjs
@@ -0,0 +1,51 @@
+export const errorMessage =
+  "Elements with 'bitIconButton' must also have a 'label' attribute for accessibility.";
+
+export default {
+  meta: {
+    type: "problem",
+    docs: {
+      description:
+        "Require a label attribute on elements with bitIconButton, except when ignored attributes are present",
+      category: "Best Practices",
+      recommended: false,
+    },
+    schema: [
+      {
+        type: "object",
+        properties: {
+          ignoreIfHas: {
+            type: "array",
+            items: { type: "string" },
+            description: "Attributes that, if present, will skip the label requirement.",
+          },
+        },
+        additionalProperties: false,
+      },
+    ],
+  },
+  create(context) {
+    const [{ ignoreIfHas = [] } = {}] = context.options;
+
+    return {
+      Element(node) {
+        const allAttrNames = [
+          ...(node.attributes?.map((attr) => attr.name) ?? []),
+          ...(node.inputs?.map((input) => input.name) ?? []),
+          ...(node.templateAttrs?.map((attr) => attr.name) ?? []),
+        ];
+
+        const hasBitIconButton = allAttrNames.includes("bitIconButton");
+        const hasLabel = allAttrNames.includes("label");
+        const shouldIgnore = ignoreIfHas.some((attr) => allAttrNames.includes(attr));
+
+        if (hasBitIconButton && !shouldIgnore && !hasLabel) {
+          context.report({
+            node,
+            message: errorMessage,
+          });
+        }
+      },
+    };
+  },
+};
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
index 398085c135c..b33b01d3b13 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.html
@@ -89,6 +89,7 @@
             appStopClick
             bitSuffix
             (click)="generatePassword()"
+            [label]="'generatePassword' | i18n"
           ></button>
           <button
             type="button"
@@ -98,6 +99,7 @@
             bitSuffix
             [appCopyClick]="filePassword"
             [valueLabel]="'password' | i18n"
+            [label]="'password' | i18n"
             showToast
           ></button>
           <bit-hint>{{ "exportPasswordDescription" | i18n }}</bit-hint>
diff --git a/libs/tools/generator/components/src/credential-generator-history.component.html b/libs/tools/generator/components/src/credential-generator-history.component.html
index 05199763a15..1f2f3d99e00 100644
--- a/libs/tools/generator/components/src/credential-generator-history.component.html
+++ b/libs/tools/generator/components/src/credential-generator-history.component.html
@@ -12,7 +12,7 @@
         bitIconButton="bwi-clone"
         [appCopyClick]="credential.credential"
         [valueLabel]="getGeneratedValueText(credential)"
-        [appA11yTitle]="getCopyText(credential)"
+        [label]="getCopyText(credential)"
         showToast
       >
         {{ getCopyText(credential) }}
diff --git a/libs/tools/generator/components/src/credential-generator.component.html b/libs/tools/generator/components/src/credential-generator.component.html
index 3f9813f4384..124de1e3c45 100644
--- a/libs/tools/generator/components/src/credential-generator.component.html
+++ b/libs/tools/generator/components/src/credential-generator.component.html
@@ -23,7 +23,7 @@
       bitIconButton="bwi-generate"
       buttonType="main"
       (click)="generate(USER_REQUEST)"
-      [appA11yTitle]="credentialTypeGenerateLabel$ | async"
+      [label]="credentialTypeGenerateLabel$ | async"
       [disabled]="!(algorithm$ | async)"
     >
       {{ credentialTypeGenerateLabel$ | async }}
@@ -33,7 +33,7 @@
       bitIconButton="bwi-clone"
       buttonType="main"
       showToast
-      [appA11yTitle]="credentialTypeCopyLabel$ | async"
+      [label]="credentialTypeCopyLabel$ | async"
       [appCopyClick]="value$ | async"
       [valueLabel]="credentialTypeLabel$ | async"
       [disabled]="!(algorithm$ | async)"
diff --git a/libs/tools/generator/components/src/password-generator.component.html b/libs/tools/generator/components/src/password-generator.component.html
index ce0768fe128..9995613685b 100644
--- a/libs/tools/generator/components/src/password-generator.component.html
+++ b/libs/tools/generator/components/src/password-generator.component.html
@@ -20,7 +20,7 @@
       bitIconButton="bwi-generate"
       buttonType="main"
       (click)="generate(USER_REQUEST)"
-      [appA11yTitle]="credentialTypeGenerateLabel$ | async"
+      [label]="credentialTypeGenerateLabel$ | async"
       [disabled]="!(algorithm$ | async)"
     >
       {{ credentialTypeGenerateLabel$ | async }}
@@ -30,7 +30,7 @@
       bitIconButton="bwi-clone"
       buttonType="main"
       showToast
-      [appA11yTitle]="credentialTypeCopyLabel$ | async"
+      [label]="credentialTypeCopyLabel$ | async"
       [appCopyClick]="value$ | async"
       [valueLabel]="credentialTypeLabel$ | async"
       [disabled]="!(algorithm$ | async)"
diff --git a/libs/tools/generator/components/src/username-generator.component.html b/libs/tools/generator/components/src/username-generator.component.html
index 51b998f1d56..0f3182118a1 100644
--- a/libs/tools/generator/components/src/username-generator.component.html
+++ b/libs/tools/generator/components/src/username-generator.component.html
@@ -8,7 +8,7 @@
       bitIconButton="bwi-generate"
       buttonType="main"
       (click)="generate(USER_REQUEST)"
-      [appA11yTitle]="credentialTypeGenerateLabel$ | async"
+      [label]="credentialTypeGenerateLabel$ | async"
       [disabled]="!(algorithm$ | async)"
     >
       {{ credentialTypeGenerateLabel$ | async }}
@@ -18,7 +18,7 @@
       bitIconButton="bwi-clone"
       buttonType="main"
       showToast
-      [appA11yTitle]="credentialTypeCopyLabel$ | async"
+      [label]="credentialTypeCopyLabel$ | async"
       [appCopyClick]="value$ | async"
       [valueLabel]="credentialTypeLabel$ | async"
       [disabled]="!(algorithm$ | async)"
diff --git a/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.html b/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.html
index d3f3ebedf49..b0edbe12892 100644
--- a/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.html
+++ b/libs/tools/send/send-ui/src/add-edit/send-add-edit-dialog.component.html
@@ -28,7 +28,7 @@
         slot="end"
         bitIconButton="bwi-trash"
         [bitAction]="deleteSend"
-        appA11yTitle="{{ 'delete' | i18n }}"
+        label="{{ 'delete' | i18n }}"
       ></button>
     </div>
   </ng-container>
diff --git a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.html b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.html
index b9edf8eebcc..a271788b0ef 100644
--- a/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.html
+++ b/libs/tools/send/send-ui/src/send-form/components/options/send-options.component.html
@@ -26,7 +26,7 @@
         type="button"
         bitIconButton="bwi-generate"
         bitSuffix
-        [appA11yTitle]="'generatePassword' | i18n"
+        [label]="'generatePassword' | i18n"
         [disabled]="!config.areSendsAllowed"
         (click)="generatePassword()"
         data-testid="generate-password"
@@ -36,7 +36,7 @@
         type="button"
         bitIconButton="bwi-clone"
         bitSuffix
-        [appA11yTitle]="'copyPassword' | i18n"
+        [label]="'copyPassword' | i18n"
         [disabled]="!config.areSendsAllowed || !sendOptionsForm.get('password').value"
         [valueLabel]="'password' | i18n"
         [appCopyClick]="sendOptionsForm.get('password').value"
@@ -50,7 +50,7 @@
         type="button"
         buttonType="danger"
         bitIconButton="bwi-minus-circle"
-        [appA11yTitle]="'removePassword' | i18n"
+        [label]="'removePassword' | i18n"
         [bitAction]="removePassword"
         showToast
       ></button>
diff --git a/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.html b/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.html
index 214c978ad48..e650ca3a5df 100644
--- a/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.html
+++ b/libs/tools/send/send-ui/src/send-form/components/send-details/send-details.component.html
@@ -30,7 +30,7 @@
         showToast
         bitIconButton="bwi-clone"
         [appCopyClick]="sendLink"
-        [appA11yTitle]="'copySendLink' | i18n"
+        [label]="'copySendLink' | i18n"
       ></button>
     </bit-form-field>
 
diff --git a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
index 94ebfc3e5e6..3442375315a 100644
--- a/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
+++ b/libs/tools/send/send-ui/src/send-list-items-container/send-list-items-container.component.html
@@ -48,7 +48,7 @@
             size="small"
             type="button"
             (click)="copySendLink(send)"
-            appA11yTitle="{{ 'copyLink' | i18n }} - {{ send.name }}"
+            label="{{ 'copyLink' | i18n }} - {{ send.name }}"
           ></button>
         </bit-item-action>
         <bit-item-action>
@@ -57,7 +57,7 @@
             size="small"
             type="button"
             (click)="deleteSend(send)"
-            appA11yTitle="{{ 'delete' | i18n }} - {{ send.name }}"
+            label="{{ 'delete' | i18n }} - {{ send.name }}"
           ></button>
         </bit-item-action>
       </ng-container>
diff --git a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.html b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.html
index efbc1a0503c..71354a7c221 100644
--- a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.html
+++ b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.html
@@ -4,6 +4,6 @@
   size="small"
   type="button"
   class="tw-border-transparent"
-  [appA11yTitle]="'deleteAttachmentName' | i18n: attachment.fileName"
+  [label]="'deleteAttachmentName' | i18n: attachment.fileName"
   [bitAction]="delete"
 ></button>
diff --git a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
index 2e88a68a0d4..2390512c92d 100644
--- a/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
+++ b/libs/vault/src/cipher-form/components/autofill-options/uri-option.component.html
@@ -8,7 +8,7 @@
           type="button"
           [bitIconButton]="showMatchDetection ? 'bwi-cog-f' : 'bwi-cog'"
           bitSuffix
-          [appA11yTitle]="toggleTitle"
+          [label]="toggleTitle"
           (click)="toggleMatchDetection()"
           data-testid="toggle-match-detection-button"
         ></button>
@@ -17,7 +17,7 @@
           bitIconButton="bwi-minus-circle"
           buttonType="danger"
           bitSuffix
-          [appA11yTitle]="'deleteWebsite' | i18n"
+          [label]="'deleteWebsite' | i18n"
           *ngIf="canRemove"
           (click)="removeUri()"
           data-testid="remove-uri-button"
@@ -29,7 +29,7 @@
           bitIconButton="bwi-drag-and-drop"
           class="!tw-py-0 !tw-px-1"
           cdkDragHandle
-          [appA11yTitle]="'reorderToggleButton' | i18n: uriLabel"
+          [label]="'reorderToggleButton' | i18n: uriLabel"
           (keydown)="handleKeydown($event)"
           data-testid="reorder-toggle-button"
           *ngIf="canReorder"
diff --git a/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.html b/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.html
index f379f466b4a..4c0d567ad75 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.html
+++ b/libs/vault/src/cipher-form/components/custom-fields/add-edit-custom-field-dialog/add-edit-custom-field-dialog.component.html
@@ -40,7 +40,7 @@
         buttonType="danger"
         class="tw-ml-auto"
         bitIconButton="bwi-trash"
-        [appA11yTitle]="'deleteCustomField' | i18n: customFieldForm.value.label"
+        [label]="'deleteCustomField' | i18n: customFieldForm.value.label"
         (click)="removeField()"
       ></button>
     </ng-container>
diff --git a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
index 98cc6489bbd..c47f332375b 100644
--- a/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
+++ b/libs/vault/src/cipher-form/components/custom-fields/custom-fields.component.html
@@ -89,7 +89,7 @@
         <button
           type="button"
           (click)="openAddEditCustomFieldDialog({ index: i, label: field.value.name })"
-          [appA11yTitle]="'editFieldLabel' | i18n: field.value.name"
+          [label]="'editFieldLabel' | i18n: field.value.name"
           bitIconButton="bwi-pencil-square"
           class="tw-self-center tw-mt-2"
           data-testid="edit-custom-field-button"
@@ -101,7 +101,7 @@
           bitIconButton="bwi-drag-and-drop"
           class="tw-self-center tw-mt-2"
           cdkDragHandle
-          [appA11yTitle]="'reorderToggleButton' | i18n: field.value.name"
+          [label]="'reorderToggleButton' | i18n: field.value.name"
           (keydown)="handleKeyDown($event, field.value.name, i)"
           data-testid="reorder-toggle-button"
           *ngIf="canEdit(field.value.type)"
diff --git a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
index 4d575634b1c..fc208bd9b92 100644
--- a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
+++ b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
@@ -9,7 +9,7 @@
       [bitIconButton]="favoriteIcon"
       role="checkbox"
       [attr.aria-checked]="itemDetailsForm.value.favorite"
-      [appA11yTitle]="'favorite' | i18n"
+      [label]="'favorite' | i18n"
       (click)="toggleFavorite()"
     ></button>
   </bit-section-header>
diff --git a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
index b0c501c53ed..7fb19d3c4b2 100644
--- a/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
+++ b/libs/vault/src/cipher-form/components/login-details-section/login-details-section.component.html
@@ -15,7 +15,7 @@
         bitSuffix
         *ngIf="loginDetailsForm.controls.username.enabled"
         data-testid="generate-username-button"
-        [appA11yTitle]="'generateUsername' | i18n"
+        [label]="'generateUsername' | i18n"
         [bitAction]="generateUsername"
       ></button>
     </bit-form-field>
@@ -47,7 +47,7 @@
           loginDetailsForm.controls.password.value?.length > 0
         "
         data-testid="check-password-button"
-        [appA11yTitle]="'checkPassword' | i18n"
+        [label]="'checkPassword' | i18n"
         [bitAction]="checkPassword"
       ></button>
       <button
@@ -65,7 +65,7 @@
         bitSuffix
         *ngIf="loginDetailsForm.controls.password.enabled"
         data-testid="generate-password-button"
-        [appA11yTitle]="'generatePassword' | i18n"
+        [label]="'generatePassword' | i18n"
         [bitAction]="generatePassword"
       ></button>
     </bit-form-field>
@@ -86,7 +86,7 @@
         *ngIf="loginDetailsForm.enabled && viewHiddenFields"
         [bitAction]="removePasskey"
         data-testid="remove-passkey-button"
-        [appA11yTitle]="'removePasskey' | i18n"
+        [label]="'removePasskey' | i18n"
       ></button>
     </bit-form-field>
 
@@ -125,7 +125,7 @@
         *ngIf="canCaptureTotp"
         data-testid="capture-totp-button"
         [bitAction]="captureTotp"
-        [appA11yTitle]="'totpCapture' | i18n"
+        [label]="'totpCapture' | i18n"
       ></button>
     </bit-form-field>
   </bit-card>
diff --git a/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.html b/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.html
index de528267db0..ec9d715ff19 100644
--- a/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.html
+++ b/libs/vault/src/cipher-form/components/sshkey-section/sshkey-section.component.html
@@ -21,7 +21,7 @@
         bitSuffix
         data-testid="import-privateKey"
         *ngIf="showImport"
-        appA11yTitle="{{ 'importSshKeyFromClipboard' | i18n }}"
+        label="{{ 'importSshKeyFromClipboard' | i18n }}"
         (click)="importSshKeyFromClipboard()"
       ></button>
     </bit-form-field>
diff --git a/libs/vault/src/cipher-view/additional-options/additional-options.component.html b/libs/vault/src/cipher-view/additional-options/additional-options.component.html
index aa6d339dcd7..a53bfd239ca 100644
--- a/libs/vault/src/cipher-view/additional-options/additional-options.component.html
+++ b/libs/vault/src/cipher-view/additional-options/additional-options.component.html
@@ -14,7 +14,7 @@
         [appCopyClick]="notes"
         showToast
         [valueLabel]="'note' | i18n"
-        [appA11yTitle]="'copyNotes' | i18n"
+        [label]="'copyNotes' | i18n"
       ></button>
     </bit-form-field>
   </bit-card>
diff --git a/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.html b/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.html
index 1e17886f50b..1e8f7173167 100644
--- a/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.html
+++ b/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.html
@@ -26,7 +26,7 @@
           type="button"
           (click)="openWebsite(login.launchUri)"
           data-testid="launch-website"
-          [attr.aria-label]="('launch' | i18n) + ' ' + login.hostOrUri"
+          [label]="('launch' | i18n) + ' ' + login.hostOrUri"
         ></button>
         <button
           bitIconButton="bwi-clone"
@@ -35,7 +35,7 @@
           [appCopyClick]="login.uri"
           [valueLabel]="'website' | i18n"
           showToast
-          [appA11yTitle]="'copyWebsite' | i18n"
+          [label]="'copyWebsite' | i18n"
           data-testid="copy-website"
         ></button>
       </bit-form-field>
diff --git a/libs/vault/src/cipher-view/card-details/card-details-view.component.html b/libs/vault/src/cipher-view/card-details/card-details-view.component.html
index 9d2fa45ba9e..ef023b69079 100644
--- a/libs/vault/src/cipher-view/card-details/card-details-view.component.html
+++ b/libs/vault/src/cipher-view/card-details/card-details-view.component.html
@@ -43,7 +43,7 @@
         [appCopyClick]="card.number"
         showToast
         [valueLabel]="'number' | i18n"
-        [appA11yTitle]="'copyNumber' | i18n"
+        [label]="'copyNumber' | i18n"
         data-testid="copy-number"
       ></button>
     </bit-form-field>
@@ -87,7 +87,7 @@
         [appCopyClick]="card.code"
         showToast
         [valueLabel]="'securityCode' | i18n"
-        [appA11yTitle]="'copySecurityCode' | i18n"
+        [label]="'copySecurityCode' | i18n"
         data-testid="copy-code"
         (click)="logCardEvent(true, EventType.Cipher_ClientCopiedCardCode)"
       ></button>
diff --git a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
index 7c60d35965f..bc59c9058e2 100644
--- a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
+++ b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html
@@ -25,7 +25,7 @@
           [appCopyClick]="field.value"
           showToast
           [valueLabel]="field.name"
-          [appA11yTitle]="'copyCustomField' | i18n: field.name"
+          [label]="'copyCustomField' | i18n: field.name"
           data-testid="copy-custom-field"
         ></button>
       </bit-form-field>
@@ -57,7 +57,7 @@
           bitSuffix
           type="button"
           data-testid="toggle-hidden-field-value-count"
-          [appA11yTitle]="
+          [label]="
             (showHiddenValueCountFields.includes(i) ? 'hideCharacterCount' : 'showCharacterCount')
               | i18n
           "
@@ -81,7 +81,7 @@
           showToast
           [valueLabel]="field.name"
           *ngIf="canViewPassword"
-          [appA11yTitle]="'copyCustomField' | i18n: field.name"
+          [label]="'copyCustomField' | i18n: field.name"
           (click)="logCopyEvent()"
         ></button>
       </bit-form-field>
diff --git a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
index 76a2d466369..53fcab70506 100644
--- a/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
+++ b/libs/vault/src/cipher-view/login-credentials/login-credentials-view.component.html
@@ -23,7 +23,7 @@
         [appCopyClick]="cipher.login.username"
         [valueLabel]="'username' | i18n"
         showToast
-        [appA11yTitle]="'copyUsername' | i18n"
+        [label]="'copyUsername' | i18n"
         data-testid="copy-username"
       ></button>
     </bit-form-field>
@@ -63,7 +63,7 @@
         bitSuffix
         type="button"
         data-testid="toggle-password-count"
-        [appA11yTitle]="(showPasswordCount ? 'hideCharacterCount' : 'showCharacterCount') | i18n"
+        [label]="(showPasswordCount ? 'hideCharacterCount' : 'showCharacterCount') | i18n"
         [attr.aria-expanded]="showPasswordCount"
         appStopClick
         (click)="togglePasswordCount()"
@@ -86,7 +86,7 @@
         [appCopyClick]="cipher.login.password"
         [valueLabel]="'password' | i18n"
         showToast
-        [appA11yTitle]="'copyPassword' | i18n"
+        [label]="'copyPassword' | i18n"
         data-testid="copy-password"
         (click)="logCopyEvent()"
       ></button>
@@ -158,7 +158,7 @@
         [appCopyClick]="totpCodeCopyObj?.totpCode"
         [valueLabel]="'verificationCodeTotp' | i18n"
         showToast
-        [appA11yTitle]="'copyVerificationCode' | i18n"
+        [label]="'copyVerificationCode' | i18n"
         data-testid="copy-totp"
         [disabled]="!(isPremium$ | async)"
         class="disabled:tw-cursor-default"
diff --git a/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.html b/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.html
index e74c0b06818..555f59fd22f 100644
--- a/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.html
+++ b/libs/vault/src/cipher-view/sshkey-sections/sshkey-view.component.html
@@ -27,7 +27,7 @@
         type="button"
         [appCopyClick]="sshKey.privateKey"
         showToast
-        [appA11yTitle]="'copyValue' | i18n"
+        [label]="'copyValue' | i18n"
       ></button>
     </bit-form-field>
     <bit-form-field>
@@ -45,7 +45,7 @@
         type="button"
         [appCopyClick]="sshKey.publicKey"
         showToast
-        [appA11yTitle]="'copyValue' | i18n"
+        [label]="'copyValue' | i18n"
       ></button>
     </bit-form-field>
     <bit-form-field>
@@ -63,7 +63,7 @@
         type="button"
         [appCopyClick]="sshKey.keyFingerprint"
         showToast
-        [appA11yTitle]="'copyValue' | i18n"
+        [label]="'copyValue' | i18n"
       ></button>
     </bit-form-field>
   </read-only-cipher-card>
diff --git a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html
index 1b0a1f48f05..f3154994bbf 100644
--- a/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html
+++ b/libs/vault/src/cipher-view/view-identity-sections/view-identity-sections.component.html
@@ -17,7 +17,7 @@
         type="button"
         bitIconButton="bwi-clone"
         bitSuffix
-        [appA11yTitle]="'copyName' | i18n"
+        [label]="'copyName' | i18n"
         [appCopyClick]="cipher.identity.fullName"
         showToast
         [valueLabel]="'name' | i18n"
@@ -37,7 +37,7 @@
         type="button"
         bitIconButton="bwi-clone"
         bitSuffix
-        [appA11yTitle]="'copyUsername' | i18n"
+        [label]="'copyUsername' | i18n"
         [appCopyClick]="cipher.identity.username"
         showToast
         [valueLabel]="'username' | i18n"
@@ -56,7 +56,7 @@
         type="button"
         bitIconButton="bwi-clone"
         bitSuffix
-        [appA11yTitle]="'copyCompany' | i18n"
+        [label]="'copyCompany' | i18n"
         [appCopyClick]="cipher.identity.company"
         showToast
         [valueLabel]="'company' | i18n"
@@ -93,7 +93,7 @@
         type="button"
         bitIconButton="bwi-clone"
         bitSuffix
-        [appA11yTitle]="'copySSN' | i18n"
+        [label]="'copySSN' | i18n"
         [appCopyClick]="cipher.identity.ssn"
         showToast
         [valueLabel]="'ssn' | i18n"
@@ -123,7 +123,7 @@
         type="button"
         bitIconButton="bwi-clone"
         bitSuffix
-        [appA11yTitle]="'copyPassportNumber' | i18n"
+        [label]="'copyPassportNumber' | i18n"
         [appCopyClick]="cipher.identity.passportNumber"
         showToast
         [valueLabel]="'passportNumber' | i18n"
@@ -145,7 +145,7 @@
         type="button"
         bitIconButton="bwi-clone"
         bitSuffix
-        [appA11yTitle]="'copyLicenseNumber' | i18n"
+        [label]="'copyLicenseNumber' | i18n"
         [appCopyClick]="cipher.identity.licenseNumber"
         showToast
         [valueLabel]="'licenseNumber' | i18n"
@@ -168,7 +168,7 @@
         type="button"
         bitIconButton="bwi-clone"
         bitSuffix
-        [appA11yTitle]="'copyEmail' | i18n"
+        [label]="'copyEmail' | i18n"
         [appCopyClick]="cipher.identity.email"
         showToast
         [valueLabel]="'email' | i18n"
@@ -182,7 +182,7 @@
         type="button"
         bitIconButton="bwi-clone"
         bitSuffix
-        [appA11yTitle]="'copyPhone' | i18n"
+        [label]="'copyPhone' | i18n"
         [appCopyClick]="cipher.identity.phone"
         showToast
         [valueLabel]="'phone' | i18n"
@@ -204,7 +204,7 @@
         type="button"
         bitIconButton="bwi-clone"
         bitSuffix
-        [appA11yTitle]="'copyAddress' | i18n"
+        [label]="'copyAddress' | i18n"
         [appCopyClick]="addressFields"
         showToast
         [valueLabel]="'address' | i18n"
diff --git a/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.html b/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.html
index cefd6305973..1f385fffc93 100644
--- a/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.html
+++ b/libs/vault/src/components/add-edit-folder-dialog/add-edit-folder-dialog.component.html
@@ -33,7 +33,7 @@
         buttonType="danger"
         class="tw-ml-auto"
         bitIconButton="bwi-trash"
-        [appA11yTitle]="'deleteFolder' | i18n"
+        [label]="'deleteFolder' | i18n"
         [bitAction]="deleteFolder"
       ></button>
     </ng-container>
diff --git a/libs/vault/src/components/download-attachment/download-attachment.component.html b/libs/vault/src/components/download-attachment/download-attachment.component.html
index e6a20ba044b..47ee3c4761c 100644
--- a/libs/vault/src/components/download-attachment/download-attachment.component.html
+++ b/libs/vault/src/components/download-attachment/download-attachment.component.html
@@ -4,5 +4,5 @@
   buttonType="main"
   size="small"
   type="button"
-  [appA11yTitle]="'downloadAttachmentName' | i18n: attachment.fileName"
+  [label]="'downloadAttachmentName' | i18n: attachment.fileName"
 ></button>
diff --git a/libs/vault/src/components/password-history-view/password-history-view.component.html b/libs/vault/src/components/password-history-view/password-history-view.component.html
index 7510d80a549..05772fde461 100644
--- a/libs/vault/src/components/password-history-view/password-history-view.component.html
+++ b/libs/vault/src/components/password-history-view/password-history-view.component.html
@@ -13,7 +13,7 @@
         <button
           type="button"
           bitIconButton="bwi-clone"
-          [appA11yTitle]="'copyPassword' | i18n"
+          [label]="'copyPassword' | i18n"
           appStopClick
           [appCopyClick]="h.password"
           [valueLabel]="'password' | i18n"

From 9c95514b173400c1299dde63547763e8217ee7a7 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github.com>
Date: Tue, 19 Aug 2025 19:28:24 +0000
Subject: [PATCH 02/34] Bumped Desktop client to 2025.8.1

---
 apps/desktop/package.json          | 2 +-
 apps/desktop/src/package-lock.json | 4 ++--
 apps/desktop/src/package.json      | 2 +-
 package-lock.json                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 37650c08b95..42eb7017e03 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.8.0",
+  "version": "2025.8.1",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index 44ee6ec862d..6daff35e115 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2025.8.0",
+  "version": "2025.8.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.8.0",
+      "version": "2025.8.1",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-napi": "file:../desktop_native/napi"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index ffe70bb7bd7..ea2e8affda2 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.8.0",
+  "version": "2025.8.1",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/package-lock.json b/package-lock.json
index 4157e5ab9c7..b6041cc82ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -277,7 +277,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2025.8.0",
+      "version": "2025.8.1",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },

From 8182f6fa02a49d26fbc6dea0948b86dc044447a5 Mon Sep 17 00:00:00 2001
From: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Date: Tue, 19 Aug 2025 16:24:58 -0400
Subject: [PATCH 03/34] chore(deps): Add parse5 to Platform-owned deps

---
 .github/renovate.json5 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 906bbbd7125..e646049c3d6 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -197,6 +197,7 @@
         "nx",
         "oo7",
         "oslog",
+        "parse5",
         "pin-project",
         "pkg",
         "postcss",

From 603a7031c03dc07409057b6ab726657dbc3d896d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Aug 2025 17:56:17 -0400
Subject: [PATCH 04/34] [deps] Autofill: Update cross-env to v10 (#16051)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 26 ++++++++++++++++----------
 package.json      |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b6041cc82ba..d2d497d10b0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -129,7 +129,7 @@
         "chromatic": "13.1.2",
         "concurrently": "9.2.0",
         "copy-webpack-plugin": "13.0.0",
-        "cross-env": "7.0.3",
+        "cross-env": "10.0.0",
         "css-loader": "7.1.2",
         "electron": "36.4.0",
         "electron-builder": "26.0.12",
@@ -6034,6 +6034,13 @@
       "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==",
       "license": "MIT"
     },
+    "node_modules/@epic-web/invariant": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz",
+      "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.25.4",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
@@ -18973,22 +18980,21 @@
       "peer": true
     },
     "node_modules/cross-env": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
-      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.0.0.tgz",
+      "integrity": "sha512-aU8qlEK/nHYtVuN4p7UQgAwVljzMg8hB4YK5ThRqD2l/ziSnryncPNn7bMLt5cFYsKVKBh8HqLqyCoTupEUu7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cross-spawn": "^7.0.1"
+        "@epic-web/invariant": "^1.0.0",
+        "cross-spawn": "^7.0.6"
       },
       "bin": {
-        "cross-env": "src/bin/cross-env.js",
-        "cross-env-shell": "src/bin/cross-env-shell.js"
+        "cross-env": "dist/bin/cross-env.js",
+        "cross-env-shell": "dist/bin/cross-env-shell.js"
       },
       "engines": {
-        "node": ">=10.14",
-        "npm": ">=6",
-        "yarn": ">=1"
+        "node": ">=20"
       }
     },
     "node_modules/cross-spawn": {
diff --git a/package.json b/package.json
index bd407623b7a..331292b9076 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "chromatic": "13.1.2",
     "concurrently": "9.2.0",
     "copy-webpack-plugin": "13.0.0",
-    "cross-env": "7.0.3",
+    "cross-env": "10.0.0",
     "css-loader": "7.1.2",
     "electron": "36.4.0",
     "electron-builder": "26.0.12",

From 5483006ae4b2d18f09df4725ae0f1835b95f3e80 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:28:18 +0200
Subject: [PATCH 05/34] Fix old FrontendLayoutComponent logo, update 404 and
 index styling (#16076)

---
 apps/web/src/404.html          | 10 +++---
 apps/web/src/index.html        |  2 +-
 apps/web/src/scss/tailwind.css | 56 +++++++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/apps/web/src/404.html b/apps/web/src/404.html
index 1a01aee40c7..75e4641a0cc 100644
--- a/apps/web/src/404.html
+++ b/apps/web/src/404.html
@@ -16,16 +16,18 @@
   </head>
 
   <body class="tw-min-h-screen !tw-min-w-0 tw-text-center tw-bg-background-alt tw-flex tw-flex-col">
-    <img class="new-logo-themed tw-m-8" alt="Bitwarden" />
+    <img class="new-logo-themed tw-my-4 tw-mx-6" alt="Bitwarden" />
 
-    <main class="tw-max-w-3xl tw-mx-auto tw-px-2 tw-my-4">
+    <main class="tw-max-w-3xl tw-mx-auto tw-px-2 tw-my-8">
       <h1 class="tw-mb-0 tw-h1">Sorry, this page isn't available.</h1>
 
       <p class="tw-py-9 tw-mb-0">
         The link you followed may be broken, or the page may have been removed. Try going back to
         the previous page or see our
-        <a href="https://bitwarden.com/help/" target="_blank" rel="noreferrer">Help Center</a> for
-        more information.
+        <a href="https://bitwarden.com/help/" target="_blank" rel="noreferrer" class="tw-link"
+          >Help Center</a
+        >
+        for more information.
       </p>
 
       <a href="/" class="tw-btn-secondary tw-inline-block">Go to your web vault</a>
diff --git a/apps/web/src/index.html b/apps/web/src/index.html
index 0b8ea864914..1c81ae7a4e6 100644
--- a/apps/web/src/index.html
+++ b/apps/web/src/index.html
@@ -16,7 +16,7 @@
   <body class="layout_frontend">
     <app-root>
       <!-- Note: any changes to this html need to be made in the app.component.html as well -->
-      <div class="tw-p-8 tw-flex">
+      <div class="tw-px-6 tw-py-4 tw-flex">
         <img class="new-logo-themed" alt="Bitwarden" />
         <div class="spinner-container tw-justify-center">
           <i
diff --git a/apps/web/src/scss/tailwind.css b/apps/web/src/scss/tailwind.css
index 8d21a054fdb..57332e033b9 100644
--- a/apps/web/src/scss/tailwind.css
+++ b/apps/web/src/scss/tailwind.css
@@ -11,19 +11,9 @@
  * - Shared styles like Logo.
  */
 @layer components {
-  .tw-h1 {
-    @apply tw-text-3xl tw-font-semibold;
-  }
-
-  .tw-btn {
-    @apply tw-font-semibold tw-py-1.5 tw-px-3 tw-rounded tw-transition tw-border tw-border-solid tw-text-center tw-no-underline hover:tw-no-underline focus:tw-outline-none;
-  }
-
-  .tw-btn-secondary {
-    @apply tw-btn;
-
-    @apply tw-bg-transparent tw-border-text-muted hover:tw-bg-text-muted hover:tw-border-text-muted hover:!tw-text-contrast disabled:tw-bg-transparent disabled:tw-border-text-muted/60 disabled:!tw-text-muted/60 disabled:tw-cursor-not-allowed;
-    @apply tw-text-muted !important;
+  body {
+    @apply tw-bg-background;
+    @apply tw-text-main;
   }
 
   /**
@@ -49,11 +39,6 @@
     }
   }
 
-  body {
-    @apply tw-bg-background;
-    @apply tw-text-main;
-  }
-
   /**
    * Loading page
    */
@@ -70,6 +55,16 @@
     }
   }
 
+  /**
+   * Logo on old `FrontendLayoutComponent`. Remove when the component is gone.
+   */
+  img.logo {
+    display: block;
+    height: 43px;
+    margin: 0 auto;
+    width: 284px;
+  }
+
   /**
    * Logo, used both in loading and on "frontend" pages.
    */
@@ -85,3 +80,28 @@
     content: url("../images/logo-white.svg");
   }
 }
+
+/**
+ * 404 page styling.
+ */
+@layer components {
+  .tw-h1 {
+    @apply tw-text-3xl tw-font-semibold;
+  }
+
+  .tw-btn {
+    @apply tw-font-semibold tw-py-1.5 tw-px-3 tw-rounded-full tw-transition tw-border-2 tw-border-solid tw-text-center tw-no-underline focus:tw-outline-none;
+  }
+
+  .tw-btn-secondary {
+    @apply tw-btn;
+
+    @apply tw-bg-transparent tw-text-primary-600 tw-border-primary-600 hover:tw-bg-hover-default;
+  }
+
+  .tw-link {
+    @apply tw-font-semibold hover:tw-underline hover:tw-decoration-1;
+
+    @apply tw-text-primary-600 hover:tw-text-primary-700 focus-visible:before:tw-ring-primary-600;
+  }
+}

From ad145fc4ffd851e502a907a2ccd40d97c5559f49 Mon Sep 17 00:00:00 2001
From: cd-bitwarden <106776772+cd-bitwarden@users.noreply.github.com>
Date: Wed, 20 Aug 2025 10:45:58 -0400
Subject: [PATCH 06/34] [SM-1274] Add Project Events to the Log List in Admin
 Console (#15442)

* Adding enums for additional event logs for secrets

* updating messages

* Updating messages to be consistent for logs

* Displaying project logs, and fixing search query param searching in projects list, having deleted log for secrets and projects not show as a link

* Viewing secret and project event logs in event modal, adding to the context menu for secrets and projects the ability to view the logs if user has permission. Restricting logs to SM projs and Secs if the logged in user has event log access but not SM access.

* lint

* Lint Fixes

* fix to messages file

* fixing lint

* Bug fix, make sure event logs related to service accounts are still links that take you to the object

* removing unused import
---
 .../common/base.events.component.ts           | 53 +++++++++++-
 .../manage/entity-events.component.ts         | 22 ++++-
 .../organizations/manage/events.component.ts  | 22 +++--
 apps/web/src/app/core/event.service.ts        | 83 +++++++++++++++++--
 apps/web/src/locales/en/messages.json         | 81 ++++++++++++++++++
 .../providers/manage/events.component.ts      |  8 ++
 .../projects/projects/projects.component.ts   | 80 +++++++++++++++++-
 .../secrets/secrets.component.ts              | 75 ++++++++++++++++-
 .../service-accounts-events.component.ts      | 16 ++--
 .../service-accounts-list.component.ts        |  2 -
 .../shared/projects-list.component.html       |  9 ++
 .../shared/projects-list.component.ts         | 64 +++++++++++++-
 .../shared/secrets-list.component.html        |  9 ++
 .../shared/secrets-list.component.ts          | 62 ++++++++++++--
 libs/common/src/abstractions/api.service.ts   | 19 +++++
 libs/common/src/enums/event-type.enum.ts      |  7 ++
 .../src/models/response/event.response.ts     |  2 +
 libs/common/src/services/api.service.ts       | 44 ++++++++++
 18 files changed, 611 insertions(+), 47 deletions(-)

diff --git a/apps/web/src/app/admin-console/common/base.events.component.ts b/apps/web/src/app/admin-console/common/base.events.component.ts
index 9d06be92eb8..ba315dee7fb 100644
--- a/apps/web/src/app/admin-console/common/base.events.component.ts
+++ b/apps/web/src/app/admin-console/common/base.events.component.ts
@@ -1,8 +1,13 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Directive } from "@angular/core";
+import { Directive, OnDestroy } from "@angular/core";
 import { FormControl, FormGroup } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
+import { combineLatest, filter, map, Observable, Subject, switchMap, takeUntil } from "rxjs";
 
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { EventResponse } from "@bitwarden/common/models/response/event.response";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { EventView } from "@bitwarden/common/models/view/event.view";
@@ -12,16 +17,17 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { ToastService } from "@bitwarden/components";
 
-import { EventService } from "../../core";
+import { EventOptions, EventService } from "../../core";
 import { EventExportService } from "../../tools/event-export";
 
 @Directive()
-export abstract class BaseEventsComponent {
+export abstract class BaseEventsComponent implements OnDestroy {
   loading = true;
   loaded = false;
   events: EventView[];
   dirtyDates = true;
   continuationToken: string;
+  canUseSM = false;
 
   abstract readonly exportFileName: string;
 
@@ -30,6 +36,15 @@ export abstract class BaseEventsComponent {
     end: new FormControl(null),
   });
 
+  protected canUseSM$: Observable<boolean>;
+  protected activeOrganization$: Observable<Organization | undefined>;
+  protected organizations$: Observable<Organization[]>;
+  private destroySubject$ = new Subject<void>();
+
+  protected get destroy$(): Observable<void> {
+    return this.destroySubject$.asObservable();
+  }
+
   constructor(
     protected eventService: EventService,
     protected i18nService: I18nService,
@@ -38,12 +53,39 @@ export abstract class BaseEventsComponent {
     protected logService: LogService,
     protected fileDownloadService: FileDownloadService,
     private toastService: ToastService,
+    protected activeRoute: ActivatedRoute,
+    protected accountService: AccountService,
+    protected organizationService: OrganizationService,
   ) {
     const defaultDates = this.eventService.getDefaultDateFilters();
     this.start = defaultDates[0];
     this.end = defaultDates[1];
   }
 
+  protected initBase(): void {
+    this.organizations$ = this.accountService.activeAccount$.pipe(
+      filter((account): account is Account => !!account?.id),
+      switchMap((account) => this.organizationService.organizations$(account.id)),
+    );
+
+    this.activeOrganization$ = combineLatest([this.activeRoute.paramMap, this.organizations$]).pipe(
+      map(([params, orgs]) => orgs.find((org) => org.id === params.get("organizationId"))),
+    );
+
+    this.canUseSM$ = this.activeOrganization$.pipe(
+      map((org) => org?.canAccessSecretsManager ?? false),
+    );
+
+    this.canUseSM$.pipe(takeUntil(this.destroy$)).subscribe((value) => {
+      this.canUseSM = value;
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.destroySubject$.next();
+    this.destroySubject$.complete();
+  }
+
   get start(): string {
     return this.eventsForm.value.start;
   }
@@ -139,7 +181,10 @@ export abstract class BaseEventsComponent {
     const events = await Promise.all(
       response.data.map(async (r) => {
         const userId = r.actingUserId == null ? r.userId : r.actingUserId;
-        const eventInfo = await this.eventService.getEventInfo(r);
+        const options = new EventOptions();
+        options.disableLink = !this.canUseSM;
+
+        const eventInfo = await this.eventService.getEventInfo(r, options);
         const user = this.getUserName(r, userId);
         const userName = user != null ? user.name : this.i18nService.t("unknown");
 
diff --git a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
index 10f68695e88..8484b05283d 100644
--- a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts
@@ -8,6 +8,8 @@ import { firstValueFrom, switchMap } from "rxjs";
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { EventResponse } from "@bitwarden/common/models/response/event.response";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { EventView } from "@bitwarden/common/models/view/event.view";
@@ -26,7 +28,7 @@ import { EventService } from "../../../core";
 import { SharedModule } from "../../../shared";
 
 export interface EntityEventsDialogParams {
-  entity: "user" | "cipher";
+  entity: "user" | "cipher" | "secret" | "project";
   entityId: string;
 
   organizationId?: string;
@@ -72,6 +74,8 @@ export class EntityEventsComponent implements OnInit, OnDestroy {
     private toastService: ToastService,
     private router: Router,
     private activeRoute: ActivatedRoute,
+    private accountService: AccountService,
+    protected organizationService: OrganizationService,
   ) {}
 
   async ngOnInit() {
@@ -162,6 +166,22 @@ export class EntityEventsComponent implements OnInit, OnDestroy {
         dates[1],
         clearExisting ? null : this.continuationToken,
       );
+    } else if (this.params.entity === "secret") {
+      response = await this.apiService.getEventsSecret(
+        this.params.organizationId,
+        this.params.entityId,
+        dates[0],
+        dates[1],
+        clearExisting ? null : this.continuationToken,
+      );
+    } else if (this.params.entity === "project") {
+      response = await this.apiService.getEventsProject(
+        this.params.organizationId,
+        this.params.entityId,
+        dates[0],
+        dates[1],
+        clearExisting ? null : this.continuationToken,
+      );
     } else {
       response = await this.apiService.getEventsCipher(
         this.params.entityId,
diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
index 07f6be7d7f6..f442d429767 100644
--- a/apps/web/src/app/admin-console/organizations/manage/events.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
@@ -1,8 +1,8 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, OnDestroy, OnInit } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
-import { concatMap, firstValueFrom, lastValueFrom, Subject, takeUntil } from "rxjs";
+import { ActivatedRoute } from "@angular/router";
+import { concatMap, firstValueFrom, lastValueFrom, takeUntil } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
@@ -60,8 +60,6 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
   placeholderEvents = placeholderEvents as EventView[];
 
   private orgUsersUserIdMap = new Map<string, any>();
-  private destroy$ = new Subject<void>();
-
   readonly ProductTierType = ProductTierType;
 
   protected isBreadcrumbEventLogsEnabled$ = this.configService.getFeatureFlag$(
@@ -75,18 +73,18 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
     i18nService: I18nService,
     exportService: EventExportService,
     platformUtilsService: PlatformUtilsService,
-    private router: Router,
     logService: LogService,
     private userNamePipe: UserNamePipe,
-    private organizationService: OrganizationService,
+    protected organizationService: OrganizationService,
     private organizationUserApiService: OrganizationUserApiService,
     private organizationApiService: OrganizationApiServiceAbstraction,
     private providerService: ProviderService,
     fileDownloadService: FileDownloadService,
     toastService: ToastService,
-    private accountService: AccountService,
+    protected accountService: AccountService,
     private dialogService: DialogService,
     private configService: ConfigService,
+    protected activeRoute: ActivatedRoute,
   ) {
     super(
       eventService,
@@ -96,10 +94,15 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
       logService,
       fileDownloadService,
       toastService,
+      activeRoute,
+      accountService,
+      organizationService,
     );
   }
 
   async ngOnInit() {
+    this.initBase();
+
     const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
     this.route.params
       .pipe(
@@ -233,9 +236,4 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
     }
     await this.load();
   }
-
-  ngOnDestroy() {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
 }
diff --git a/apps/web/src/app/core/event.service.ts b/apps/web/src/app/core/event.service.ts
index 36d591cc390..ab4d21dab54 100644
--- a/apps/web/src/app/core/event.service.ts
+++ b/apps/web/src/app/core/event.service.ts
@@ -467,21 +467,60 @@ export class EventService {
         break;
       // Secrets Manager
       case EventType.Secret_Retrieved:
-        msg = this.i18nService.t("accessedSecretWithId", this.formatSecretId(ev));
+        msg = this.i18nService.t("accessedSecretWithId", this.formatSecretId(ev, options));
         humanReadableMsg = this.i18nService.t("accessedSecretWithId", this.getShortId(ev.secretId));
         break;
       case EventType.Secret_Created:
-        msg = this.i18nService.t("createdSecretWithId", this.formatSecretId(ev));
+        msg = this.i18nService.t("createdSecretWithId", this.formatSecretId(ev, options));
         humanReadableMsg = this.i18nService.t("createdSecretWithId", this.getShortId(ev.secretId));
         break;
       case EventType.Secret_Deleted:
-        msg = this.i18nService.t("deletedSecretWithId", this.formatSecretId(ev));
+        msg = this.i18nService.t("deletedSecretWithId", this.formatSecretId(ev, options));
         humanReadableMsg = this.i18nService.t("deletedSecretWithId", this.getShortId(ev.secretId));
         break;
+      case EventType.Secret_Permanently_Deleted:
+        msg = this.i18nService.t(
+          "permanentlyDeletedSecretWithId",
+          this.formatSecretId(ev, options),
+        );
+        humanReadableMsg = this.i18nService.t(
+          "permanentlyDeletedSecretWithId",
+          this.getShortId(ev.secretId),
+        );
+        break;
+      case EventType.Secret_Restored:
+        msg = this.i18nService.t("restoredSecretWithId", this.formatSecretId(ev, options));
+        humanReadableMsg = this.i18nService.t("restoredSecretWithId", this.getShortId(ev.secretId));
+        break;
       case EventType.Secret_Edited:
-        msg = this.i18nService.t("editedSecretWithId", this.formatSecretId(ev));
+        msg = this.i18nService.t("editedSecretWithId", this.formatSecretId(ev, options));
         humanReadableMsg = this.i18nService.t("editedSecretWithId", this.getShortId(ev.secretId));
         break;
+      case EventType.Project_Retrieved:
+        msg = this.i18nService.t("accessedProjectWithId", this.formatProjectId(ev, options));
+        humanReadableMsg = this.i18nService.t(
+          "accessedProjectWithId",
+          this.getShortId(ev.projectId),
+        );
+        break;
+      case EventType.Project_Created:
+        msg = this.i18nService.t("createdProjectWithId", this.formatProjectId(ev, options));
+        humanReadableMsg = this.i18nService.t(
+          "createdProjectWithId",
+          this.getShortId(ev.projectId),
+        );
+        break;
+      case EventType.Project_Deleted:
+        msg = this.i18nService.t("deletedProjectWithId", this.formatProjectId(ev, options));
+        humanReadableMsg = this.i18nService.t(
+          "deletedProjectWithId",
+          this.getShortId(ev.projectId),
+        );
+        break;
+      case EventType.Project_Edited:
+        msg = this.i18nService.t("editedProjectWithId", this.formatProjectId(ev, options));
+        humanReadableMsg = this.i18nService.t("editedProjectWithId", this.getShortId(ev.projectId));
+        break;
       default:
         break;
     }
@@ -637,10 +676,41 @@ export class EventService {
     return a.outerHTML;
   }
 
-  formatSecretId(ev: EventResponse): string {
+  formatSecretId(ev: EventResponse, options: EventOptions): string {
     const shortId = this.getShortId(ev.secretId);
+    if (options.disableLink) {
+      return shortId;
+    }
     const a = this.makeAnchor(shortId);
-    a.setAttribute("href", "#/sm/" + ev.organizationId + "/secrets?search=" + shortId);
+    a.setAttribute(
+      "href",
+      "#/sm/" +
+        ev.organizationId +
+        "/secrets?search=" +
+        shortId +
+        "&viewEvents=" +
+        ev.secretId +
+        "&type=all",
+    );
+    return a.outerHTML;
+  }
+
+  formatProjectId(ev: EventResponse, options: EventOptions): string {
+    const shortId = this.getShortId(ev.projectId);
+    if (options.disableLink) {
+      return shortId;
+    }
+    const a = this.makeAnchor(shortId);
+    a.setAttribute(
+      "href",
+      "#/sm/" +
+        ev.organizationId +
+        "/projects?search=" +
+        shortId +
+        "&viewEvents=" +
+        ev.projectId +
+        "&type=all",
+    );
     return a.outerHTML;
   }
 
@@ -684,4 +754,5 @@ export class EventInfo {
 
 export class EventOptions {
   cipherInfo = true;
+  disableLink = false;
 }
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 98e3a4d5d11..cdb6bdc1e7e 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -7039,6 +7039,12 @@
   "unknownCipher": {
     "message": "Unknown item, you may need to request permission to access this item."
   },
+  "unknownSecret": {
+    "message": "Unknown secret, you may need to request permission to access this secret."
+  },
+  "unknownProject": {
+    "message": "Unknown project, you may need to request permission to access this project."
+  },
   "cannotSponsorSelf": {
     "message": "You cannot redeem for the active account. Enter a different email."
   },
@@ -8361,6 +8367,24 @@
         "example": "4d34e8a8"
       }
     }
+  },
+  "permanentlyDeletedSecretWithId": {
+    "message": "Permanently deleted a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+   "restoredSecretWithId": {
+    "message": "Restored a secret with identifier: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
   },
    "createdSecretWithId": {
     "message": "Created a new secret with identifier: $SECRET_ID$",
@@ -8371,6 +8395,60 @@
       }
     }
   },
+  "accessedProjectWithId": {
+  "message": "Accessed a project with Id: $PROJECT_ID$.",
+    "placeholders": {
+      "project_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "nameUnavailableProjectDeleted": {
+  "message": "Deleted project Id: $PROJECT_ID$",
+    "placeholders": {
+      "project_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+  "nameUnavailableSecretDeleted": {
+  "message": "Deleted secret Id: $SECRET_ID$",
+    "placeholders": {
+      "secret_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+   "editedProjectWithId": {
+    "message": "Edited a project with identifier: $PROJECT_ID$",
+    "placeholders": {
+      "project_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+   "deletedProjectWithId": {
+    "message": "Deleted a project with identifier: $PROJECT_ID$",
+    "placeholders": {
+      "project_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
+   "createdProjectWithId": {
+    "message": "Created a new project with identifier: $PROJECT_ID$",
+    "placeholders": {
+      "project_id": {
+        "content": "$1",
+        "example": "4d34e8a8"
+      }
+    }
+  },
   "sdk": {
     "message": "SDK",
     "description": "Software Development Kit"
@@ -10755,6 +10833,9 @@
   "upgradeEventLogMessage":{
     "message" : "These events are examples only and do not reflect real events within your Bitwarden organization."
   },
+  "viewEvents":{
+    "message" : "View Events"
+  },
   "cannotCreateCollection": {
     "message": "Free organizations may have up to 2 collections. Upgrade to a paid plan to add more collections."
   },
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts
index 2ad2ecdccbd..d8ad2e01343 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/events.component.ts
@@ -5,7 +5,9 @@ import { ActivatedRoute, Router } from "@angular/router";
 
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { EventResponse } from "@bitwarden/common/models/response/event.response";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -41,6 +43,8 @@ export class EventsComponent extends BaseEventsComponent implements OnInit {
     private userNamePipe: UserNamePipe,
     fileDownloadService: FileDownloadService,
     toastService: ToastService,
+    accountService: AccountService,
+    organizationService: OrganizationService,
   ) {
     super(
       eventService,
@@ -50,6 +54,9 @@ export class EventsComponent extends BaseEventsComponent implements OnInit {
       logService,
       fileDownloadService,
       toastService,
+      route,
+      accountService,
+      organizationService,
     );
   }
 
@@ -69,6 +76,7 @@ export class EventsComponent extends BaseEventsComponent implements OnInit {
   }
 
   async load() {
+    this.initBase();
     const response = await this.apiService.getProviderUsers(this.providerId);
     response.data.forEach((u) => {
       const name = this.userNamePipe.transform(u);
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts
index ea5294624af..81a568f0c65 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 import {
   combineLatest,
   firstValueFrom,
@@ -17,9 +17,12 @@ import {
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { DialogService } from "@bitwarden/components";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
+import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component";
 
 import { ProjectListView } from "../../models/view/project-list.view";
+import { ProjectView } from "../../models/view/project.view";
 import {
   BulkConfirmationDetails,
   BulkConfirmationDialogComponent,
@@ -55,6 +58,9 @@ export class ProjectsComponent implements OnInit {
     private dialogService: DialogService,
     private organizationService: OrganizationService,
     private accountService: AccountService,
+    private toastService: ToastService,
+    private i18nService: I18nService,
+    private router: Router,
   ) {}
 
   ngOnInit() {
@@ -73,9 +79,53 @@ export class ProjectsComponent implements OnInit {
           )
         )?.enabled;
 
-        return await this.getProjects();
+        const projects = await this.getProjects();
+        const viewEvents = this.route.snapshot.queryParams.viewEvents;
+
+        if (viewEvents) {
+          const targetProject = projects.find((project) => project.id === viewEvents);
+
+          const userIsAdmin = (
+            await firstValueFrom(
+              this.organizationService
+                .organizations$(userId)
+                .pipe(getOrganizationById(params.organizationId)),
+            )
+          )?.isAdmin;
+
+          // They would fall into here if they don't have access to a project, or if it has been permanently deleted.
+          if (!targetProject) {
+            //If they are an admin it was permanently deleted and we can show the events with project name redacted
+            if (userIsAdmin) {
+              this.openEventsDialogFromEntityId(
+                this.i18nService.t("nameUnavailableProjectDeleted", viewEvents),
+                params.organizationId,
+                viewEvents,
+              );
+            } else {
+              //They aren't an admin so we don't know if they have access to it, lets show the unknown cipher toast.
+              this.toastService.showToast({
+                variant: "error",
+                title: null,
+                message: this.i18nService.t("unknownProject"),
+              });
+            }
+          } else {
+            this.openEventsDialog(targetProject);
+          }
+
+          await this.router.navigate([], {
+            queryParams: { search: this.search },
+          });
+        }
+
+        return projects;
       }),
     );
+
+    if (this.route.snapshot.queryParams.search) {
+      this.search = this.route.snapshot.queryParams.search;
+    }
   }
 
   private async getProjects(): Promise<ProjectListView[]> {
@@ -103,6 +153,30 @@ export class ProjectsComponent implements OnInit {
     });
   }
 
+  openEventsDialog = (project: ProjectView): DialogRef<void> =>
+    openEntityEventsDialog(this.dialogService, {
+      data: {
+        name: project.name,
+        organizationId: project.organizationId,
+        entityId: project.id,
+        entity: "project",
+      },
+    });
+
+  openEventsDialogFromEntityId = (
+    headerName: string,
+    organizationId: string,
+    entityId: string,
+  ): DialogRef<void> =>
+    openEntityEventsDialog(this.dialogService, {
+      data: {
+        name: headerName,
+        organizationId: organizationId,
+        entityId: entityId,
+        entity: "project",
+      },
+    });
+
   async openDeleteProjectDialog(projects: ProjectListView[]) {
     let projectsToDelete = projects;
     const readOnlyProjects = projects.filter((project) => project.write == false);
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts
index 18ecd2e3b51..ca093f449c9 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts
@@ -1,7 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 import { combineLatestWith, firstValueFrom, Observable, startWith, switchMap } from "rxjs";
 
 import {
@@ -13,7 +13,8 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { DialogService } from "@bitwarden/components";
+import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
+import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component";
 
 import { SecretListView } from "../models/view/secret-list.view";
 import { SecretsListComponent } from "../shared/secrets-list.component";
@@ -54,6 +55,8 @@ export class SecretsComponent implements OnInit {
     private organizationService: OrganizationService,
     private accountService: AccountService,
     private logService: LogService,
+    private toastService: ToastService,
+    private router: Router,
   ) {}
 
   ngOnInit() {
@@ -71,7 +74,53 @@ export class SecretsComponent implements OnInit {
           )
         )?.enabled;
 
-        return await this.getSecrets();
+        const secrets = await this.getSecrets();
+        const viewEvents = this.route.snapshot.queryParams.viewEvents;
+
+        if (viewEvents) {
+          let targetSecret = secrets.find((secret) => secret.id === viewEvents);
+
+          const userIsAdmin = (
+            await firstValueFrom(
+              this.organizationService
+                .organizations$(userId)
+                .pipe(getOrganizationById(params.organizationId)),
+            )
+          )?.isAdmin;
+
+          // Secret might be deleted, make sure they are an admin before checking the trashed secrets
+          if (!targetSecret && userIsAdmin) {
+            targetSecret = (await this.secretService.getTrashedSecrets(this.organizationId)).find(
+              (e) => e.id == viewEvents,
+            );
+          }
+
+          // They would fall into here if they don't have access to a secret, or if it has been permanently deleted.
+          if (!targetSecret) {
+            //If they are an admin it was permanently deleted and we can show the events even though we don't have the secret name
+            if (userIsAdmin) {
+              this.openEventsDialogByEntityId(
+                this.i18nService.t("nameUnavailableSecretDeleted", viewEvents),
+                viewEvents,
+              );
+            } else {
+              //They aren't an admin so we don't know if they have access to it, lets show the unknown secret toast.
+              this.toastService.showToast({
+                variant: "error",
+                title: null,
+                message: this.i18nService.t("unknownSecret"),
+              });
+            }
+          } else {
+            this.openEventsDialog(targetSecret);
+          }
+
+          await this.router.navigate([], {
+            queryParams: { search: this.search },
+          });
+        }
+
+        return secrets;
       }),
     );
 
@@ -80,6 +129,26 @@ export class SecretsComponent implements OnInit {
     }
   }
 
+  openEventsDialogByEntityId = (secretName: string, secretId: string): DialogRef<void> =>
+    openEntityEventsDialog(this.dialogService, {
+      data: {
+        name: secretName,
+        organizationId: this.organizationId,
+        entityId: secretId,
+        entity: "secret",
+      },
+    });
+
+  openEventsDialog = (secret: SecretListView): DialogRef<void> =>
+    openEntityEventsDialog(this.dialogService, {
+      data: {
+        name: secret.name,
+        organizationId: this.organizationId,
+        entityId: secret.id,
+        entity: "secret",
+      },
+    });
+
   private async getSecrets(): Promise<SecretListView[]> {
     return await this.secretService.getSecrets(this.organizationId);
   }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts
index ddaa0937e6f..2e364df1423 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts
@@ -2,8 +2,10 @@
 // @ts-strict-ignore
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { Subject, takeUntil } from "rxjs";
+import { takeUntil } from "rxjs";
 
+import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -25,7 +27,6 @@ export class ServiceAccountEventsComponent
   implements OnInit, OnDestroy
 {
   exportFileName = "machine-account-events";
-  private destroy$ = new Subject<void>();
   private serviceAccountId: string;
 
   constructor(
@@ -38,6 +39,8 @@ export class ServiceAccountEventsComponent
     logService: LogService,
     fileDownloadService: FileDownloadService,
     toastService: ToastService,
+    protected organizationService: OrganizationService,
+    protected accountService: AccountService,
   ) {
     super(
       eventService,
@@ -47,10 +50,14 @@ export class ServiceAccountEventsComponent
       logService,
       fileDownloadService,
       toastService,
+      route,
+      accountService,
+      organizationService,
     );
   }
 
   async ngOnInit() {
+    this.initBase();
     // eslint-disable-next-line rxjs/no-async-subscribe
     this.route.params.pipe(takeUntil(this.destroy$)).subscribe(async (params) => {
       this.serviceAccountId = params.serviceAccountId;
@@ -78,9 +85,4 @@ export class ServiceAccountEventsComponent
       email: "",
     };
   }
-
-  ngOnDestroy() {
-    this.destroy$.next();
-    this.destroy$.complete();
-  }
 }
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts
index 47d5dd63806..ac3defaf5dd 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.ts
@@ -5,7 +5,6 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from "@angular/core
 import { Subject, takeUntil } from "rxjs";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { TableDataSource, ToastService } from "@bitwarden/components";
 
 import {
@@ -49,7 +48,6 @@ export class ServiceAccountsListComponent implements OnDestroy {
 
   constructor(
     private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
     private toastService: ToastService,
   ) {
     this.selection.changed
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html
index 236af0d414c..9e31ff628fb 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html
@@ -114,6 +114,15 @@
           <i class="bwi bwi-fw bwi-trash tw-text-danger" aria-hidden="true"></i>
           <span class="tw-text-danger">{{ "deleteProject" | i18n }}</span>
         </button>
+        <button
+          type="button"
+          bitMenuItem
+          *ngIf="viewEventsAllowed$ | async as allowed"
+          (click)="openEventsDialog(project)"
+        >
+          <i class="bwi bwi-fw bwi-billing" aria-hidden="true"></i>
+          <span> {{ "viewEvents" | i18n }} </span>
+        </button>
       </bit-menu>
     </tr>
   </ng-template>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts
index 9774172cd4b..31114bcd1c4 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.ts
@@ -1,21 +1,31 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { SelectionModel } from "@angular/cdk/collections";
-import { Component, EventEmitter, Input, Output } from "@angular/core";
-import { map } from "rxjs";
+import { Component, EventEmitter, Input, Output, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { catchError, concatMap, map, Observable, of, Subject, switchMap, takeUntil } from "rxjs";
 
+import {
+  getOrganizationById,
+  OrganizationService,
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { TableDataSource, ToastService } from "@bitwarden/components";
+import { DialogRef, DialogService, TableDataSource, ToastService } from "@bitwarden/components";
+import { LogService } from "@bitwarden/logging";
+import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component";
 
 import { ProjectListView } from "../models/view/project-list.view";
+import { ProjectView } from "../models/view/project.view";
 
 @Component({
   selector: "sm-projects-list",
   templateUrl: "./projects-list.component.html",
   standalone: false,
 })
-export class ProjectsListComponent {
+export class ProjectsListComponent implements OnInit {
   @Input()
   get projects(): ProjectListView[] {
     return this._projects;
@@ -26,6 +36,9 @@ export class ProjectsListComponent {
     this.dataSource.data = projects;
   }
   private _projects: ProjectListView[];
+  protected viewEventsAllowed$: Observable<boolean>;
+  protected isAdmin$: Observable<boolean>;
+  private destroy$: Subject<void> = new Subject<void>();
 
   @Input() showMenus?: boolean = true;
 
@@ -50,8 +63,41 @@ export class ProjectsListComponent {
     private i18nService: I18nService,
     private platformUtilsService: PlatformUtilsService,
     private toastService: ToastService,
+    private dialogService: DialogService,
+    private organizationService: OrganizationService,
+    private activatedRoute: ActivatedRoute,
+    private accountService: AccountService,
+    private logService: LogService,
   ) {}
 
+  ngOnInit(): void {
+    this.viewEventsAllowed$ = this.activatedRoute.params.pipe(
+      concatMap((params) =>
+        getUserId(this.accountService.activeAccount$).pipe(
+          switchMap((userId) =>
+            this.organizationService
+              .organizations$(userId)
+              .pipe(getOrganizationById(params.organizationId)),
+          ),
+        ),
+      ),
+      map((org) => org.canAccessEventLogs),
+      catchError((error: unknown) => {
+        if (typeof error === "string") {
+          this.toastService.showToast({
+            message: error,
+            variant: "error",
+            title: "",
+          });
+        } else {
+          this.logService.error(error);
+        }
+        return of(false);
+      }),
+      takeUntil(this.destroy$),
+    );
+  }
+
   isAllSelected() {
     if (this.selection.selected?.length > 0) {
       const numSelected = this.selection.selected.length;
@@ -87,6 +133,16 @@ export class ProjectsListComponent {
     }
   }
 
+  openEventsDialog = (project: ProjectView): DialogRef<void> =>
+    openEntityEventsDialog(this.dialogService, {
+      data: {
+        name: project.name,
+        organizationId: project.organizationId,
+        entityId: project.id,
+        entity: "project",
+      },
+    });
+
   private selectedHasWriteAccess() {
     const selectedProjects = this.projects.filter((project) =>
       this.selection.isSelected(project.id),
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
index e5d22a01502..25f2447246a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
@@ -148,6 +148,15 @@
           <i class="bwi bwi-fw bwi-refresh" aria-hidden="true"></i>
           {{ "restoreSecret" | i18n }}
         </button>
+        <button
+          type="button"
+          bitMenuItem
+          *ngIf="viewEventsAllowed$ | async as allowed"
+          (click)="openEventsDialog(secret)"
+        >
+          <i class="bwi bwi-fw bwi-billing" aria-hidden="true"></i>
+          <span> {{ "viewEvents" | i18n }} </span>
+        </button>
         <button
           type="button"
           bitMenuItem
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
index 18ac0a80454..4ef7dbf22e7 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.ts
@@ -1,15 +1,24 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { SelectionModel } from "@angular/cdk/collections";
-import { Component, EventEmitter, Input, OnDestroy, Output } from "@angular/core";
-import { Subject, takeUntil } from "rxjs";
+import { Component, EventEmitter, Input, OnDestroy, Output, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { catchError, concatMap, map, Observable, of, Subject, switchMap, takeUntil } from "rxjs";
 
+import {
+  getOrganizationById,
+  OrganizationService,
+} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { TableDataSource, ToastService } from "@bitwarden/components";
+import { DialogRef, DialogService, TableDataSource, ToastService } from "@bitwarden/components";
+import { openEntityEventsDialog } from "@bitwarden/web-vault/app/admin-console/organizations/manage/entity-events.component";
 
 import { SecretListView } from "../models/view/secret-list.view";
+import { SecretView } from "../models/view/secret.view";
 import { SecretService } from "../secrets/secret.service";
 
 @Component({
@@ -17,7 +26,7 @@ import { SecretService } from "../secrets/secret.service";
   templateUrl: "./secrets-list.component.html",
   standalone: false,
 })
-export class SecretsListComponent implements OnDestroy {
+export class SecretsListComponent implements OnDestroy, OnInit {
   protected dataSource = new TableDataSource<SecretListView>();
 
   @Input()
@@ -52,17 +61,51 @@ export class SecretsListComponent implements OnDestroy {
   private destroy$: Subject<void> = new Subject<void>();
 
   selection = new SelectionModel<string>(true, []);
+  protected viewEventsAllowed$: Observable<boolean>;
+  protected isAdmin$: Observable<boolean>;
 
   constructor(
     private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
     private toastService: ToastService,
+    private dialogService: DialogService,
+    private organizationService: OrganizationService,
+    private activatedRoute: ActivatedRoute,
+    private accountService: AccountService,
+    private logService: LogService,
   ) {
     this.selection.changed
       .pipe(takeUntil(this.destroy$))
       .subscribe((_) => this.onSecretCheckedEvent.emit(this.selection.selected));
   }
 
+  ngOnInit(): void {
+    this.viewEventsAllowed$ = this.activatedRoute.params.pipe(
+      concatMap((params) =>
+        getUserId(this.accountService.activeAccount$).pipe(
+          switchMap((userId) =>
+            this.organizationService
+              .organizations$(userId)
+              .pipe(getOrganizationById(params.organizationId)),
+          ),
+        ),
+      ),
+      map((org) => org.canAccessEventLogs),
+      catchError((error: unknown) => {
+        if (typeof error === "string") {
+          this.toastService.showToast({
+            message: error,
+            variant: "error",
+            title: "",
+          });
+        } else {
+          this.logService.error(error);
+        }
+        return of(false);
+      }),
+      takeUntil(this.destroy$),
+    );
+  }
+
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
@@ -76,6 +119,15 @@ export class SecretsListComponent implements OnDestroy {
     }
     return false;
   }
+  openEventsDialog = (secret: SecretView): DialogRef<void> =>
+    openEntityEventsDialog(this.dialogService, {
+      data: {
+        name: secret.name,
+        organizationId: secret.organizationId,
+        entityId: secret.id,
+        entity: "secret",
+      },
+    });
 
   toggleAll() {
     if (this.isAllSelected()) {
diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts
index 015a742c1ac..d8b8c1c429f 100644
--- a/libs/common/src/abstractions/api.service.ts
+++ b/libs/common/src/abstractions/api.service.ts
@@ -388,19 +388,23 @@ export abstract class ApiService {
     id: string,
     request: ProviderUserAcceptRequest,
   ): Promise<any>;
+
   abstract postProviderUserConfirm(
     providerId: string,
     id: string,
     request: ProviderUserConfirmRequest,
   ): Promise<any>;
+
   abstract postProviderUsersPublicKey(
     providerId: string,
     request: ProviderUserBulkRequest,
   ): Promise<ListResponse<ProviderUserBulkPublicKeyResponse>>;
+
   abstract postProviderUserBulkConfirm(
     providerId: string,
     request: ProviderUserBulkConfirmRequest,
   ): Promise<ListResponse<ProviderUserBulkResponse>>;
+
   abstract putProviderUser(
     providerId: string,
     id: string,
@@ -435,6 +439,21 @@ export abstract class ApiService {
     end: string,
     token: string,
   ): Promise<ListResponse<EventResponse>>;
+
+  abstract getEventsSecret(
+    orgId: string,
+    id: string,
+    start: string,
+    end: string,
+    token: string,
+  ): Promise<ListResponse<EventResponse>>;
+  abstract getEventsProject(
+    orgId: string,
+    id: string,
+    start: string,
+    end: string,
+    token: string,
+  ): Promise<ListResponse<EventResponse>>;
   abstract getEventsOrganization(
     id: string,
     start: string,
diff --git a/libs/common/src/enums/event-type.enum.ts b/libs/common/src/enums/event-type.enum.ts
index 914dac00abb..7c8badec364 100644
--- a/libs/common/src/enums/event-type.enum.ts
+++ b/libs/common/src/enums/event-type.enum.ts
@@ -93,4 +93,11 @@ export enum EventType {
   Secret_Created = 2101,
   Secret_Edited = 2102,
   Secret_Deleted = 2103,
+  Secret_Permanently_Deleted = 2104,
+  Secret_Restored = 2105,
+
+  Project_Retrieved = 2200,
+  Project_Created = 2201,
+  Project_Edited = 2202,
+  Project_Deleted = 2203,
 }
diff --git a/libs/common/src/models/response/event.response.ts b/libs/common/src/models/response/event.response.ts
index 58551b34c2c..07124b3080c 100644
--- a/libs/common/src/models/response/event.response.ts
+++ b/libs/common/src/models/response/event.response.ts
@@ -22,6 +22,7 @@ export class EventResponse extends BaseResponse {
   systemUser: EventSystemUser;
   domainName: string;
   secretId: string;
+  projectId: string;
   serviceAccountId: string;
 
   constructor(response: any) {
@@ -45,6 +46,7 @@ export class EventResponse extends BaseResponse {
     this.systemUser = this.getResponseProperty("SystemUser");
     this.domainName = this.getResponseProperty("DomainName");
     this.secretId = this.getResponseProperty("SecretId");
+    this.projectId = this.getResponseProperty("ProjectId");
     this.serviceAccountId = this.getResponseProperty("ServiceAccountId");
   }
 }
diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts
index 9168f43b360..e48b941d4a0 100644
--- a/libs/common/src/services/api.service.ts
+++ b/libs/common/src/services/api.service.ts
@@ -1267,6 +1267,50 @@ export class ApiService implements ApiServiceAbstraction {
     return new ListResponse(r, EventResponse);
   }
 
+  async getEventsSecret(
+    orgId: string,
+    id: string,
+    start: string,
+    end: string,
+    token: string,
+  ): Promise<ListResponse<EventResponse>> {
+    const r = await this.send(
+      "GET",
+      this.addEventParameters(
+        "/organization/" + orgId + "/secrets/" + id + "/events",
+        start,
+        end,
+        token,
+      ),
+      null,
+      true,
+      true,
+    );
+    return new ListResponse(r, EventResponse);
+  }
+
+  async getEventsProject(
+    orgId: string,
+    id: string,
+    start: string,
+    end: string,
+    token: string,
+  ): Promise<ListResponse<EventResponse>> {
+    const r = await this.send(
+      "GET",
+      this.addEventParameters(
+        "/organization/" + orgId + "/projects/" + id + "/events",
+        start,
+        end,
+        token,
+      ),
+      null,
+      true,
+      true,
+    );
+    return new ListResponse(r, EventResponse);
+  }
+
   async getEventsOrganization(
     id: string,
     start: string,

From 999ade9707f87b4fbe8d933f132c70092a695285 Mon Sep 17 00:00:00 2001
From: Kyle Denney <4227399+kdenney@users.noreply.github.com>
Date: Wed, 20 Aug 2025 10:31:20 -0500
Subject: [PATCH 07/34] [PM-24552] - remove code for feature flag (#16022)

---
 .../providers/setup/setup.component.html      | 64 +++++++------------
 .../providers/setup/setup.component.ts        | 21 +-----
 libs/common/src/enums/feature-flag.enum.ts    |  2 -
 3 files changed, 25 insertions(+), 62 deletions(-)

diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
index 4c5a35ea58d..daae7e2ed2e 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
@@ -12,50 +12,30 @@
   </div>
   <p>{{ "setupProviderDesc" | i18n }}</p>
   <form [formGroup]="formGroup" [bitSubmit]="submit">
-    @if (!(requireProviderPaymentMethodDuringSetup$ | async)) {
-      <h2 class="tw-mt-5">{{ "generalInformation" | i18n }}</h2>
-      <div class="tw-grid tw-grid-flow-col tw-grid-cols-12 tw-gap-4">
-        <div class="tw-col-span-6">
-          <bit-form-field>
-            <bit-label>{{ "providerName" | i18n }}</bit-label>
-            <input type="text" bitInput formControlName="name" />
-          </bit-form-field>
-        </div>
-        <div class="tw-col-span-6">
-          <bit-form-field>
-            <bit-label>{{ "billingEmail" | i18n }}</bit-label>
-            <input type="email" bitInput formControlName="billingEmail" />
-            <bit-hint>{{ "providerBillingEmailHint" | i18n }}</bit-hint>
-          </bit-form-field>
-        </div>
+    <h2 class="tw-mt-5">{{ "billingInformation" | i18n }}</h2>
+    <div class="tw-grid tw-grid-flow-col tw-grid-cols-12 tw-gap-4">
+      <div class="tw-col-span-6">
+        <bit-form-field>
+          <bit-label>{{ "providerName" | i18n }}</bit-label>
+          <input type="text" bitInput formControlName="name" />
+        </bit-form-field>
       </div>
-      <app-manage-tax-information />
-    } @else {
-      <h2 class="tw-mt-5">{{ "billingInformation" | i18n }}</h2>
-      <div class="tw-grid tw-grid-flow-col tw-grid-cols-12 tw-gap-4">
-        <div class="tw-col-span-6">
-          <bit-form-field>
-            <bit-label>{{ "providerName" | i18n }}</bit-label>
-            <input type="text" bitInput formControlName="name" />
-          </bit-form-field>
-        </div>
-        <div class="tw-col-span-6">
-          <bit-form-field>
-            <bit-label>{{ "billingEmail" | i18n }}</bit-label>
-            <input type="email" bitInput formControlName="billingEmail" />
-            <bit-hint>{{ "providerBillingEmailHint" | i18n }}</bit-hint>
-          </bit-form-field>
-        </div>
+      <div class="tw-col-span-6">
+        <bit-form-field>
+          <bit-label>{{ "billingEmail" | i18n }}</bit-label>
+          <input type="email" bitInput formControlName="billingEmail" />
+          <bit-hint>{{ "providerBillingEmailHint" | i18n }}</bit-hint>
+        </bit-form-field>
       </div>
-      <h2 class="tw-mt-5">{{ "paymentMethod" | i18n }}</h2>
-      <app-payment
-        [showAccountCredit]="false"
-        [bankAccountWarningOverride]="
-          'verifyProviderBankAccountWithStatementDescriptorWarning' | i18n
-        "
-      />
-      <app-manage-tax-information />
-    }
+    </div>
+    <h2 class="tw-mt-5">{{ "paymentMethod" | i18n }}</h2>
+    <app-payment
+      [showAccountCredit]="false"
+      [bankAccountWarningOverride]="
+        'verifyProviderBankAccountWithStatementDescriptorWarning' | i18n
+      "
+    />
+    <app-manage-tax-information />
     <button class="tw-mt-8" bitButton bitFormButton buttonType="primary" type="submit">
       {{ "submit" | i18n }}
     </button>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
index 53b54e459ea..edad6616fb3 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
@@ -3,7 +3,7 @@
 import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
-import { firstValueFrom, Subject, switchMap } from "rxjs";
+import { Subject, switchMap } from "rxjs";
 import { first, takeUntil } from "rxjs/operators";
 
 import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
@@ -11,8 +11,6 @@ import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/a
 import { ProviderSetupRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-setup.request";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
 import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { ProviderKey } from "@bitwarden/common/types/key";
@@ -41,10 +39,6 @@ export class SetupComponent implements OnInit, OnDestroy {
 
   private destroy$ = new Subject<void>();
 
-  requireProviderPaymentMethodDuringSetup$ = this.configService.getFeatureFlag$(
-    FeatureFlag.PM19956_RequireProviderPaymentMethodDuringSetup,
-  );
-
   constructor(
     private router: Router,
     private i18nService: I18nService,
@@ -52,7 +46,6 @@ export class SetupComponent implements OnInit, OnDestroy {
     private keyService: KeyService,
     private syncService: SyncService,
     private validationService: ValidationService,
-    private configService: ConfigService,
     private providerApiService: ProviderApiServiceAbstraction,
     private formBuilder: FormBuilder,
     private toastService: ToastService,
@@ -117,15 +110,9 @@ export class SetupComponent implements OnInit, OnDestroy {
 
   submit = async () => {
     try {
-      const requireProviderPaymentMethodDuringSetup = await firstValueFrom(
-        this.requireProviderPaymentMethodDuringSetup$,
-      );
-
       this.formGroup.markAllAsTouched();
 
-      const paymentValid = requireProviderPaymentMethodDuringSetup
-        ? this.paymentComponent.validate()
-        : true;
+      const paymentValid = this.paymentComponent.validate();
       const taxInformationValid = this.taxInformationComponent.validate();
 
       if (!paymentValid || !taxInformationValid || !this.formGroup.valid) {
@@ -152,9 +139,7 @@ export class SetupComponent implements OnInit, OnDestroy {
       request.taxInfo.city = taxInformation.city;
       request.taxInfo.state = taxInformation.state;
 
-      if (requireProviderPaymentMethodDuringSetup) {
-        request.paymentSource = await this.paymentComponent.tokenize();
-      }
+      request.paymentSource = await this.paymentComponent.tokenize();
 
       const provider = await this.providerApiService.postProviderSetup(this.providerId, request);
 
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 5a4e5ff5dde..81cc3b305dc 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -27,7 +27,6 @@ export enum FeatureFlag {
   TrialPaymentOptional = "PM-8163-trial-payment",
   PM12276_BreadcrumbEventLogs = "pm-12276-breadcrumbing-for-business-features",
   PM17772_AdminInitiatedSponsorships = "pm-17772-admin-initiated-sponsorships",
-  PM19956_RequireProviderPaymentMethodDuringSetup = "pm-19956-require-provider-payment-method-during-setup",
   UseOrganizationWarningsService = "use-organization-warnings-service",
   AllowTrialLengthZero = "pm-20322-allow-trial-length-0",
   PM21881_ManagePaymentDetailsOutsideCheckout = "pm-21881-manage-payment-details-outside-checkout",
@@ -104,7 +103,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.TrialPaymentOptional]: FALSE,
   [FeatureFlag.PM12276_BreadcrumbEventLogs]: FALSE,
   [FeatureFlag.PM17772_AdminInitiatedSponsorships]: FALSE,
-  [FeatureFlag.PM19956_RequireProviderPaymentMethodDuringSetup]: FALSE,
   [FeatureFlag.UseOrganizationWarningsService]: FALSE,
   [FeatureFlag.AllowTrialLengthZero]: FALSE,
   [FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout]: FALSE,

From c1fab79ae3146a520a1a4cb4924c96c244d45632 Mon Sep 17 00:00:00 2001
From: Konrad <11725227+mKoonrad@users.noreply.github.com>
Date: Wed, 20 Aug 2025 18:09:19 +0200
Subject: [PATCH 08/34] [PM-24774] importTargetHint variable inflection fix
 (#16025)

* Prepare full string

* Format fix

* Fix lint: Execute `npm run prettier`

---------

Co-authored-by: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 apps/browser/src/_locales/en/messages.json         | 14 +++++---------
 apps/desktop/src/locales/en/messages.json          | 14 +++++---------
 apps/web/src/locales/en/messages.json              | 14 +++++---------
 libs/importer/src/components/import.component.html |  4 +---
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 1c27fab6971..8390bc59633 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -4131,15 +4131,11 @@
   "selectImportCollection": {
     "message": "Select a collection"
   },
-  "importTargetHint": {
-    "message": "Select this option if you want the imported file contents moved to a $DESTINATION$",
-    "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
-    "placeholders": {
-      "destination": {
-        "content": "$1",
-        "example": "folder or collection"
-      }
-    }
+  "importTargetHintCollection": {
+    "message": "Select this option if you want the imported file contents moved to a collection"
+  },
+  "importTargetHintFolder": {
+    "message": "Select this option if you want the imported file contents moved to a folder"
   },
   "importUnassignedItemsError": {
     "message": "File contains unassigned items."
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index d99d3686d12..83c021341b8 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -3491,15 +3491,11 @@
   "selectImportCollection": {
     "message": "Select a collection"
   },
-  "importTargetHint": {
-    "message": "Select this option if you want the imported file contents moved to a $DESTINATION$",
-    "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
-    "placeholders": {
-      "destination": {
-        "content": "$1",
-        "example": "folder or collection"
-      }
-    }
+    "importTargetHintCollection": {
+    "message": "Select this option if you want the imported file contents moved to a collection"
+  },
+  "importTargetHintFolder": {
+    "message": "Select this option if you want the imported file contents moved to a folder"
   },
   "importUnassignedItemsError": {
     "message": "File contains unassigned items."
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index cdb6bdc1e7e..e60d81d1982 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -2051,15 +2051,11 @@
   "selectImportCollection": {
     "message": "Select a collection"
   },
-  "importTargetHint": {
-    "message": "Select this option if you want the imported file contents moved to a $DESTINATION$",
-    "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.",
-    "placeholders": {
-      "destination": {
-        "content": "$1",
-        "example": "folder or collection"
-      }
-    }
+    "importTargetHintCollection": {
+    "message": "Select this option if you want the imported file contents moved to a collection"
+  },
+  "importTargetHintFolder": {
+    "message": "Select this option if you want the imported file contents moved to a folder"
   },
   "importUnassignedItemsError": {
     "message": "File contains unassigned items."
diff --git a/libs/importer/src/components/import.component.html b/libs/importer/src/components/import.component.html
index f6d6603dca9..d0107bb5808 100644
--- a/libs/importer/src/components/import.component.html
+++ b/libs/importer/src/components/import.component.html
@@ -54,9 +54,7 @@
           </ng-container>
         </bit-select>
         <bit-hint>{{
-          "importTargetHint"
-            | i18n
-              : (organizationId ? ("collection" | i18n | lowercase) : ("folder" | i18n | lowercase))
+          organizationId ? ("importTargetHintCollection" | i18n) : ("importTargetHintFolder" | i18n)
         }}</bit-hint>
       </bit-form-field>
     </bit-card>

From bcd73a9c00fba83725f0815e0083034e18ed1a8a Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Wed, 20 Aug 2025 18:18:59 +0200
Subject: [PATCH 09/34] Move auth key-generation-service imports (#16078)

---
 libs/common/src/auth/services/token.service.spec.ts | 2 +-
 libs/common/src/auth/services/token.service.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/common/src/auth/services/token.service.spec.ts b/libs/common/src/auth/services/token.service.spec.ts
index 7ed375da377..7274954c950 100644
--- a/libs/common/src/auth/services/token.service.spec.ts
+++ b/libs/common/src/auth/services/token.service.spec.ts
@@ -8,13 +8,13 @@ import { firstValueFrom } from "rxjs";
 import { LogoutReason } from "@bitwarden/auth/common";
 
 import { FakeSingleUserStateProvider, FakeGlobalStateProvider } from "../../../spec";
+import { KeyGenerationService } from "../../key-management/crypto";
 import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
 import {
   VaultTimeout,
   VaultTimeoutAction,
   VaultTimeoutStringType,
 } from "../../key-management/vault-timeout";
-import { KeyGenerationService } from "../../platform/abstractions/key-generation.service";
 import { LogService } from "../../platform/abstractions/log.service";
 import { AbstractStorageService } from "../../platform/abstractions/storage.service";
 import { StorageLocation } from "../../platform/enums";
diff --git a/libs/common/src/auth/services/token.service.ts b/libs/common/src/auth/services/token.service.ts
index 80e61d4636f..21ccd672056 100644
--- a/libs/common/src/auth/services/token.service.ts
+++ b/libs/common/src/auth/services/token.service.ts
@@ -7,6 +7,7 @@ import { Opaque } from "type-fest";
 // eslint-disable-next-line no-restricted-imports
 import { LogoutReason, decodeJwtTokenToJson } from "@bitwarden/auth/common";
 
+import { KeyGenerationService } from "../../key-management/crypto";
 import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
 import { EncString, EncryptedString } from "../../key-management/crypto/models/enc-string";
 import {
@@ -14,7 +15,6 @@ import {
   VaultTimeoutAction,
   VaultTimeoutStringType,
 } from "../../key-management/vault-timeout";
-import { KeyGenerationService } from "../../platform/abstractions/key-generation.service";
 import { LogService } from "../../platform/abstractions/log.service";
 import { AbstractStorageService } from "../../platform/abstractions/storage.service";
 import { StorageLocation } from "../../platform/enums";

From 719a43d050333ab14d30e5cc0bb8416e42669559 Mon Sep 17 00:00:00 2001
From: Patrick-Pimentel-Bitwarden <ppimentel@bitwarden.com>
Date: Wed, 20 Aug 2025 12:42:16 -0400
Subject: [PATCH 10/34] Feat PM-19877 System Notification Processing (#15611)

* feat(notification-processing): [PM-19877] System Notification Implementation - Minor changes to popup logic and removed content in login component.

* docs(notification-processing): [PM-19877] System Notification Implementation - Added more docs.

* docs(notification-processing): [PM-19877] System Notification Implementation - Added markdown document.

* fix(notification-processing): [PM-19877] System Notification Implementation - Updated condition for if notification is supported.

* fix(notification-processing): [PM-19877] System Notification Implementation - Updated services module with correct platform utils service.
---
 .../browser/src/background/idle.background.ts |  8 +--
 .../browser/src/background/main.background.ts | 50 +++++++++++-----
 .../src/background/runtime.background.ts      |  9 ++-
 .../actions/browser-actions.service.ts        | 48 +++++++++++++++
 .../src/platform/browser/from-chrome-event.ts |  6 +-
 ...oreground-server-notifications.service.ts} |  6 +-
 .../browser-platform-utils.service.spec.ts    |  6 +-
 .../browser-platform-utils.service.ts         |  2 +-
 .../browser-system-notification.service.ts    | 60 +++++++++++++++++++
 .../src/popup/services/services.module.ts     | 22 +++++--
 .../services/cli-platform-utils.service.ts    |  2 +-
 apps/desktop/src/app/app.component.ts         |  4 +-
 apps/desktop/src/app/services/init.service.ts |  4 +-
 .../electron-platform-utils.service.ts        |  2 +-
 apps/web/src/app/app.component.ts             | 12 ++--
 apps/web/src/app/core/core.module.ts          |  2 +-
 apps/web/src/app/core/init.service.ts         |  6 +-
 .../app/core/web-platform-utils.service.ts    |  2 +-
 .../permissions-webpush-connection.service.ts |  2 +-
 .../vault/individual-vault/vault.component.ts |  2 +-
 .../src/services/jslib-services.module.ts     | 37 +++++++-----
 .../auth-request.service.abstraction.ts       |  4 +-
 .../auth-request/auth-request-api.service.ts  |  2 +-
 libs/common/src/enums/push-technology.enum.ts |  4 +-
 .../services/vault-timeout.service.spec.ts    |  4 +-
 .../services/vault-timeout.service.ts         |  2 +-
 .../abstractions/platform-utils.service.ts    |  2 +-
 libs/common/src/platform/actions/README.md    | 40 +++++++++++++
 .../src/platform/actions/actions-service.ts   |  6 ++
 libs/common/src/platform/actions/index.ts     |  1 +
 .../actions/unsupported-actions.service.ts    |  7 +++
 .../src/platform/notifications/index.ts       |  1 -
 .../platform/server-notifications/index.ts    |  1 +
 .../default-notifications.service.spec.ts     | 16 ++---
 .../default-server-notifications.service.ts}  | 28 ++++-----
 .../internal/index.ts                         |  4 +-
 .../noop-server-notifications.service.ts}     |  6 +-
 .../internal/signalr-connection.service.ts    |  0
 .../unsupported-webpush-connection.service.ts |  0
 .../web-push-notifications-api.service.ts     |  2 +-
 .../internal/web-push.request.ts              |  0
 .../internal/webpush-connection.service.ts    |  0
 .../websocket-webpush-connection.service.ts   |  0
 .../worker-webpush-connection.service.spec.ts |  0
 .../worker-webpush-connection.service.ts      |  4 +-
 .../server-notifications.service.ts}          |  8 +--
 .../src/platform/sync/core-sync.service.ts    |  2 +-
 .../platform/system-notifications/index.ts    |  1 +
 .../system-notifications.service.ts           | 58 ++++++++++++++++++
 ...nsupported-system-notifications.service.ts | 23 +++++++
 ...ault-end-user-notification.service.spec.ts | 16 ++---
 .../default-end-user-notification.service.ts  |  4 +-
 .../services/default-task.service.spec.ts     |  6 +-
 .../tasks/services/default-task.service.ts    |  6 +-
 .../src/lock/components/lock.component.ts     |  2 +-
 55 files changed, 420 insertions(+), 132 deletions(-)
 create mode 100644 apps/browser/src/platform/actions/browser-actions.service.ts
 rename apps/browser/src/platform/notifications/{foreground-notifications.service.ts => foreground-server-notifications.service.ts} (80%)
 create mode 100644 apps/browser/src/platform/system-notifications/browser-system-notification.service.ts
 create mode 100644 libs/common/src/platform/actions/README.md
 create mode 100644 libs/common/src/platform/actions/actions-service.ts
 create mode 100644 libs/common/src/platform/actions/index.ts
 create mode 100644 libs/common/src/platform/actions/unsupported-actions.service.ts
 delete mode 100644 libs/common/src/platform/notifications/index.ts
 create mode 100644 libs/common/src/platform/server-notifications/index.ts
 rename libs/common/src/platform/{notifications => server-notifications}/internal/default-notifications.service.spec.ts (95%)
 rename libs/common/src/platform/{notifications/internal/default-notifications.service.ts => server-notifications/internal/default-server-notifications.service.ts} (91%)
 rename libs/common/src/platform/{notifications => server-notifications}/internal/index.ts (74%)
 rename libs/common/src/platform/{notifications/internal/noop-notifications.service.ts => server-notifications/internal/noop-server-notifications.service.ts} (74%)
 rename libs/common/src/platform/{notifications => server-notifications}/internal/signalr-connection.service.ts (100%)
 rename libs/common/src/platform/{notifications => server-notifications}/internal/unsupported-webpush-connection.service.ts (100%)
 rename libs/common/src/platform/{notifications => server-notifications}/internal/web-push-notifications-api.service.ts (94%)
 rename libs/common/src/platform/{notifications => server-notifications}/internal/web-push.request.ts (100%)
 rename libs/common/src/platform/{notifications => server-notifications}/internal/webpush-connection.service.ts (100%)
 rename libs/common/src/platform/{notifications => server-notifications}/internal/websocket-webpush-connection.service.ts (100%)
 rename libs/common/src/platform/{notifications => server-notifications}/internal/worker-webpush-connection.service.spec.ts (100%)
 rename libs/common/src/platform/{notifications => server-notifications}/internal/worker-webpush-connection.service.ts (98%)
 rename libs/common/src/platform/{notifications/notifications.service.ts => server-notifications/server-notifications.service.ts} (76%)
 create mode 100644 libs/common/src/platform/system-notifications/index.ts
 create mode 100644 libs/common/src/platform/system-notifications/system-notifications.service.ts
 create mode 100644 libs/common/src/platform/system-notifications/unsupported-system-notifications.service.ts

diff --git a/apps/browser/src/background/idle.background.ts b/apps/browser/src/background/idle.background.ts
index 5b3a7f7d163..81a869917a6 100644
--- a/apps/browser/src/background/idle.background.ts
+++ b/apps/browser/src/background/idle.background.ts
@@ -7,7 +7,7 @@ import {
   VaultTimeoutSettingsService,
   VaultTimeoutStringType,
 } from "@bitwarden/common/key-management/vault-timeout";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 
 const IdleInterval = 60 * 5; // 5 minutes
 
@@ -18,7 +18,7 @@ export default class IdleBackground {
 
   constructor(
     private vaultTimeoutService: VaultTimeoutService,
-    private notificationsService: NotificationsService,
+    private serverNotificationsService: ServerNotificationsService,
     private accountService: AccountService,
     private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
   ) {
@@ -32,9 +32,9 @@ export default class IdleBackground {
 
     const idleHandler = (newState: string) => {
       if (newState === "active") {
-        this.notificationsService.reconnectFromActivity();
+        this.serverNotificationsService.reconnectFromActivity();
       } else {
-        this.notificationsService.disconnectFromInactivity();
+        this.serverNotificationsService.disconnectFromInactivity();
       }
     };
     if (this.idle.onStateChanged && this.idle.setDetectionInterval) {
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 1558d9926fa..a5fb9397125 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -111,21 +111,22 @@ import {
   ObservableStorageService,
 } from "@bitwarden/common/platform/abstractions/storage.service";
 import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/platform/abstractions/system.service";
+import { ActionsService } from "@bitwarden/common/platform/actions/actions-service";
 import { IpcService } from "@bitwarden/common/platform/ipc";
 import { Message, MessageListener, MessageSender } from "@bitwarden/common/platform/messaging";
 // eslint-disable-next-line no-restricted-imports -- Used for dependency creation
 import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
 import { Lazy } from "@bitwarden/common/platform/misc/lazy";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 // eslint-disable-next-line no-restricted-imports -- Needed for service creation
 import {
-  DefaultNotificationsService,
+  DefaultServerNotificationsService,
   SignalRConnectionService,
   UnsupportedWebPushConnectionService,
   WebPushNotificationsApiService,
   WorkerWebPushConnectionService,
-} from "@bitwarden/common/platform/notifications/internal";
+} from "@bitwarden/common/platform/server-notifications/internal";
 import { AppIdService } from "@bitwarden/common/platform/services/app-id.service";
 import { ConfigApiService } from "@bitwarden/common/platform/services/config/config-api.service";
 import { DefaultConfigService } from "@bitwarden/common/platform/services/config/default-config.service";
@@ -164,6 +165,8 @@ import { WindowStorageService } from "@bitwarden/common/platform/storage/window-
 import { SyncService } from "@bitwarden/common/platform/sync";
 // eslint-disable-next-line no-restricted-imports -- Needed for service creation
 import { DefaultSyncService } from "@bitwarden/common/platform/sync/internal";
+import { SystemNotificationsService } from "@bitwarden/common/platform/system-notifications/";
+import { UnsupportedSystemNotificationsService } from "@bitwarden/common/platform/system-notifications/unsupported-system-notifications.service";
 import { DefaultThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 import { ApiService } from "@bitwarden/common/services/api.service";
 import { AuditService } from "@bitwarden/common/services/audit.service";
@@ -264,6 +267,7 @@ import { InlineMenuFieldQualificationService } from "../autofill/services/inline
 import { SafariApp } from "../browser/safariApp";
 import { BackgroundBrowserBiometricsService } from "../key-management/biometrics/background-browser-biometrics.service";
 import VaultTimeoutService from "../key-management/vault-timeout/vault-timeout.service";
+import { BrowserActionsService } from "../platform/actions/browser-actions.service";
 import { DefaultBadgeBrowserApi } from "../platform/badge/badge-browser-api";
 import { BadgeService } from "../platform/badge/badge.service";
 import { BrowserApi } from "../platform/browser/browser-api";
@@ -292,6 +296,7 @@ import { BackgroundMemoryStorageService } from "../platform/storage/background-m
 import { BrowserStorageServiceProvider } from "../platform/storage/browser-storage-service.provider";
 import { OffscreenStorageService } from "../platform/storage/offscreen-storage.service";
 import { SyncServiceListener } from "../platform/sync/sync-service.listener";
+import { BrowserSystemNotificationService } from "../platform/system-notifications/browser-system-notification.service";
 import { fromChromeRuntimeMessaging } from "../platform/utils/from-chrome-runtime-messaging";
 import { VaultFilterService } from "../vault/services/vault-filter.service";
 
@@ -337,7 +342,9 @@ export default class MainBackground {
   importService: ImportServiceAbstraction;
   exportService: VaultExportServiceAbstraction;
   searchService: SearchServiceAbstraction;
-  notificationsService: NotificationsService;
+  serverNotificationsService: ServerNotificationsService;
+  systemNotificationService: SystemNotificationsService;
+  actionsService: ActionsService;
   stateService: StateServiceAbstraction;
   userNotificationSettingsService: UserNotificationSettingsServiceAbstraction;
   autofillSettingsService: AutofillSettingsServiceAbstraction;
@@ -439,7 +446,6 @@ export default class MainBackground {
   private webRequestBackground: WebRequestBackground;
 
   private syncTimeout: any;
-  private isSafari: boolean;
   private nativeMessagingBackground: NativeMessagingBackground;
 
   private popupViewCacheBackgroundService: PopupViewCacheBackgroundService;
@@ -1109,7 +1115,18 @@ export default class MainBackground {
       this.webPushConnectionService = new UnsupportedWebPushConnectionService();
     }
 
-    this.notificationsService = new DefaultNotificationsService(
+    this.actionsService = new BrowserActionsService(this.logService, this.platformUtilsService);
+
+    if ("notifications" in chrome) {
+      this.systemNotificationService = new BrowserSystemNotificationService(
+        this.logService,
+        this.platformUtilsService,
+      );
+    } else {
+      this.systemNotificationService = new UnsupportedSystemNotificationsService();
+    }
+
+    this.serverNotificationsService = new DefaultServerNotificationsService(
       this.logService,
       this.syncService,
       this.appIdService,
@@ -1163,9 +1180,6 @@ export default class MainBackground {
       this.logService,
     );
 
-    // Other fields
-    this.isSafari = this.platformUtilsService.isSafari();
-
     // Background
 
     this.fido2Background = new Fido2Background(
@@ -1183,7 +1197,6 @@ export default class MainBackground {
       this,
       this.autofillService,
       this.platformUtilsService as BrowserPlatformUtilsService,
-      this.notificationsService,
       this.autofillSettingsService,
       this.processReloadService,
       this.environmentService,
@@ -1222,7 +1235,7 @@ export default class MainBackground {
       this.apiService,
       this.organizationService,
       this.authService,
-      this.notificationsService,
+      this.serverNotificationsService,
       messageListener,
     );
 
@@ -1296,7 +1309,7 @@ export default class MainBackground {
 
     this.idleBackground = new IdleBackground(
       this.vaultTimeoutService,
-      this.notificationsService,
+      this.serverNotificationsService,
       this.accountService,
       this.vaultTimeoutSettingsService,
     );
@@ -1354,7 +1367,7 @@ export default class MainBackground {
     this.endUserNotificationService = new DefaultEndUserNotificationService(
       this.stateProvider,
       this.apiService,
-      this.notificationsService,
+      this.serverNotificationsService,
       this.authService,
       this.logService,
     );
@@ -1433,7 +1446,7 @@ export default class MainBackground {
       setTimeout(async () => {
         await this.fullSync(false);
         this.backgroundSyncService.init();
-        this.notificationsService.startListening();
+        this.serverNotificationsService.startListening();
 
         this.taskService.listenForTaskNotifications();
         this.endUserNotificationService.listenForEndUserNotifications();
@@ -1656,6 +1669,11 @@ export default class MainBackground {
     );
   }
 
+  /**
+   * Opens the popup.
+   *
+   * @deprecated Migrating to the browser actions service.
+   */
   async openPopup() {
     const browserAction = BrowserApi.getBrowserAction();
 
@@ -1664,7 +1682,7 @@ export default class MainBackground {
       return;
     }
 
-    if (this.isSafari) {
+    if (this.platformUtilsService.isSafari()) {
       await SafariApp.sendMessageToApp("showPopover", null, true);
     }
   }
@@ -1691,7 +1709,9 @@ export default class MainBackground {
 
   /**
    * Opens the popup to the given page
+   *
    * @default ExtensionPageUrls.Index
+   * @deprecated Migrating to the browser actions service.
    */
   async openTheExtensionToPage(url: ExtensionPageUrls = ExtensionPageUrls.Index) {
     const isValidUrl = Object.values(ExtensionPageUrls).includes(url);
diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts
index 725ca1b2780..8a154c72bba 100644
--- a/apps/browser/src/background/runtime.background.ts
+++ b/apps/browser/src/background/runtime.background.ts
@@ -15,7 +15,6 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
 import { MessageListener, isExternalMessage } from "@bitwarden/common/platform/messaging";
 import { devFlagEnabled } from "@bitwarden/common/platform/misc/flags";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { VaultMessages } from "@bitwarden/common/vault/enums/vault-messages.enum";
 import { BiometricsCommands } from "@bitwarden/key-management";
@@ -46,7 +45,6 @@ export default class RuntimeBackground {
     private main: MainBackground,
     private autofillService: AutofillService,
     private platformUtilsService: BrowserPlatformUtilsService,
-    private notificationsService: NotificationsService,
     private autofillSettingsService: AutofillSettingsServiceAbstraction,
     private processReloadService: ProcessReloadServiceAbstraction,
     private environmentService: BrowserEnvironmentService,
@@ -424,6 +422,11 @@ export default class RuntimeBackground {
     return await BrowserApi.tabsQuery({ url: `${urlObj.href}*` });
   }
 
+  /**
+   * Opens the popup.
+   *
+   * @deprecated Migrating to the browser actions service.
+   */
   private async openPopup() {
     await this.main.openPopup();
   }
@@ -450,7 +453,7 @@ export default class RuntimeBackground {
   /** Sends a message to each tab that the popup was opened */
   private announcePopupOpen() {
     const announceToAllTabs = async () => {
-      const isOpen = await this.platformUtilsService.isViewOpen();
+      const isOpen = await this.platformUtilsService.isPopupOpen();
       const tabs = await this.getBwTabs();
 
       if (isOpen && tabs.length > 0) {
diff --git a/apps/browser/src/platform/actions/browser-actions.service.ts b/apps/browser/src/platform/actions/browser-actions.service.ts
new file mode 100644
index 00000000000..112a76cbe3f
--- /dev/null
+++ b/apps/browser/src/platform/actions/browser-actions.service.ts
@@ -0,0 +1,48 @@
+import { DeviceType } from "@bitwarden/common/enums";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { ActionsService } from "@bitwarden/common/platform/actions/actions-service";
+import { LogService } from "@bitwarden/logging";
+
+import { SafariApp } from "../../browser/safariApp";
+import { BrowserApi } from "../browser/browser-api";
+
+export class BrowserActionsService implements ActionsService {
+  constructor(
+    private logService: LogService,
+    private platformUtilsService: PlatformUtilsService,
+  ) {}
+
+  async openPopup(): Promise<void> {
+    const deviceType = this.platformUtilsService.getDevice();
+
+    try {
+      switch (deviceType) {
+        case DeviceType.FirefoxExtension:
+        case DeviceType.ChromeExtension: {
+          const browserAction = BrowserApi.getBrowserAction();
+
+          if ("openPopup" in browserAction && typeof browserAction.openPopup === "function") {
+            await browserAction.openPopup();
+            return;
+          } else {
+            this.logService.warning(
+              `No openPopup function found on browser actions. On browser: ${deviceType} and manifest version: ${BrowserApi.manifestVersion}`,
+            );
+          }
+          break;
+        }
+        case DeviceType.SafariExtension:
+          await SafariApp.sendMessageToApp("showPopover", null, true);
+          return;
+        default:
+          this.logService.warning(
+            `Tried to open the popup from an unsupported device type: ${deviceType}`,
+          );
+      }
+    } catch (e) {
+      this.logService.error(
+        `Failed to open the popup on ${DeviceType[deviceType]} with manifest ${BrowserApi.manifestVersion} and error: ${e}`,
+      );
+    }
+  }
+}
diff --git a/apps/browser/src/platform/browser/from-chrome-event.ts b/apps/browser/src/platform/browser/from-chrome-event.ts
index 28e57f58132..e0cd7a10b83 100644
--- a/apps/browser/src/platform/browser/from-chrome-event.ts
+++ b/apps/browser/src/platform/browser/from-chrome-event.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Observable } from "rxjs";
 
 import { BrowserApi } from "./browser-api";
@@ -26,13 +24,13 @@ export function fromChromeEvent<T extends unknown[]>(
   event: chrome.events.Event<(...args: T) => void>,
 ): Observable<T> {
   return new Observable<T>((subscriber) => {
-    const handler = (...args: T) => {
+    const handler = (...args: readonly unknown[]) => {
       if (chrome.runtime.lastError) {
         subscriber.error(chrome.runtime.lastError);
         return;
       }
 
-      subscriber.next(args);
+      subscriber.next(args as T);
     };
 
     BrowserApi.addListener(event, handler);
diff --git a/apps/browser/src/platform/notifications/foreground-notifications.service.ts b/apps/browser/src/platform/notifications/foreground-server-notifications.service.ts
similarity index 80%
rename from apps/browser/src/platform/notifications/foreground-notifications.service.ts
rename to apps/browser/src/platform/notifications/foreground-server-notifications.service.ts
index e7685d3fe50..6ab164d9c63 100644
--- a/apps/browser/src/platform/notifications/foreground-notifications.service.ts
+++ b/apps/browser/src/platform/notifications/foreground-server-notifications.service.ts
@@ -2,12 +2,12 @@ import { Observable, Subscription } from "rxjs";
 
 import { NotificationResponse } from "@bitwarden/common/models/response/notification.response";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 import { UserId } from "@bitwarden/common/types/guid";
 
-// Eventually if we want to support listening to notifications from browser foreground we
+// Eventually if we want to support listening to server notifications from browser foreground we
 // will only ever create a single SignalR connection, likely messaging to the background to reuse its connection.
-export class ForegroundNotificationsService implements NotificationsService {
+export class ForegroundServerNotificationsService implements ServerNotificationsService {
   notifications$: Observable<readonly [NotificationResponse, UserId]>;
 
   constructor(private readonly logService: LogService) {
diff --git a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.spec.ts b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.spec.ts
index f75e9cc29a5..f9a4221b3ef 100644
--- a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.spec.ts
+++ b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.spec.ts
@@ -150,7 +150,7 @@ describe("Browser Utils Service", () => {
         callback(undefined);
       });
 
-      const isViewOpen = await browserPlatformUtilsService.isViewOpen();
+      const isViewOpen = await browserPlatformUtilsService.isPopupOpen();
 
       expect(isViewOpen).toBe(false);
     });
@@ -160,7 +160,7 @@ describe("Browser Utils Service", () => {
         callback(message.command === "checkVaultPopupHeartbeat");
       });
 
-      const isViewOpen = await browserPlatformUtilsService.isViewOpen();
+      const isViewOpen = await browserPlatformUtilsService.isPopupOpen();
 
       expect(isViewOpen).toBe(true);
     });
@@ -173,7 +173,7 @@ describe("Browser Utils Service", () => {
         callback(undefined);
       });
 
-      const isViewOpen = await browserPlatformUtilsService.isViewOpen();
+      const isViewOpen = await browserPlatformUtilsService.isPopupOpen();
 
       expect(isViewOpen).toBe(false);
 
diff --git a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts
index beac7616d8d..4c5869054b2 100644
--- a/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts
+++ b/apps/browser/src/platform/services/platform-utils/browser-platform-utils.service.ts
@@ -150,7 +150,7 @@ export abstract class BrowserPlatformUtilsService implements PlatformUtilsServic
    * message to the popup and waiting for a response. If a response is received,
    * the view is open.
    */
-  async isViewOpen(): Promise<boolean> {
+  async isPopupOpen(): Promise<boolean> {
     if (this.isSafari()) {
       // Query views on safari since chrome.runtime.sendMessage does not timeout and will hang.
       return BrowserApi.isPopupOpen();
diff --git a/apps/browser/src/platform/system-notifications/browser-system-notification.service.ts b/apps/browser/src/platform/system-notifications/browser-system-notification.service.ts
new file mode 100644
index 00000000000..26b49515b82
--- /dev/null
+++ b/apps/browser/src/platform/system-notifications/browser-system-notification.service.ts
@@ -0,0 +1,60 @@
+import { map, merge, Observable } from "rxjs";
+
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import {
+  ButtonLocation,
+  SystemNotificationClearInfo,
+  SystemNotificationCreateInfo,
+  SystemNotificationEvent,
+  SystemNotificationsService,
+} from "@bitwarden/common/platform/system-notifications/system-notifications.service";
+
+import { fromChromeEvent } from "../browser/from-chrome-event";
+
+export class BrowserSystemNotificationService implements SystemNotificationsService {
+  notificationClicked$: Observable<SystemNotificationEvent>;
+
+  constructor(
+    private logService: LogService,
+    private platformUtilsService: PlatformUtilsService,
+  ) {
+    this.notificationClicked$ = merge(
+      fromChromeEvent(chrome.notifications.onButtonClicked).pipe(
+        map(([notificationId, buttonIndex]) => ({
+          id: notificationId,
+          buttonIdentifier: buttonIndex,
+        })),
+      ),
+      fromChromeEvent(chrome.notifications.onClicked).pipe(
+        map(([notificationId]: [string]) => ({
+          id: notificationId,
+          buttonIdentifier: ButtonLocation.NotificationButton,
+        })),
+      ),
+    );
+  }
+
+  async create(createInfo: SystemNotificationCreateInfo): Promise<string> {
+    return new Promise<string>((resolve) => {
+      chrome.notifications.create(
+        {
+          iconUrl: chrome.runtime.getURL("images/icon128.png"),
+          message: createInfo.body,
+          type: "basic",
+          title: createInfo.title,
+          buttons: createInfo.buttons.map((value) => ({ title: value.title })),
+        },
+        (notificationId) => resolve(notificationId),
+      );
+    });
+  }
+
+  async clear(clearInfo: SystemNotificationClearInfo): Promise<undefined> {
+    chrome.notifications.clear(clearInfo.id);
+  }
+
+  isSupported(): boolean {
+    return "notifications" in chrome;
+  }
+}
diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
index f531ebd5ca7..358ed33408c 100644
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -92,12 +92,13 @@ import {
   AbstractStorageService,
   ObservableStorageService,
 } from "@bitwarden/common/platform/abstractions/storage.service";
+import { ActionsService } from "@bitwarden/common/platform/actions";
 import { Message, MessageListener, MessageSender } from "@bitwarden/common/platform/messaging";
 // eslint-disable-next-line no-restricted-imports -- Used for dependency injection
 import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
 import { flagEnabled } from "@bitwarden/common/platform/misc/flags";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
 import { TaskSchedulerService } from "@bitwarden/common/platform/scheduling";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 import { ContainerService } from "@bitwarden/common/platform/services/container.service";
 import { DefaultSdkClientFactory } from "@bitwarden/common/platform/services/sdk/default-sdk-client-factory";
@@ -113,6 +114,7 @@ import { InlineDerivedStateProvider } from "@bitwarden/common/platform/state/imp
 import { PrimarySecondaryStorageService } from "@bitwarden/common/platform/storage/primary-secondary-storage.service";
 import { WindowStorageService } from "@bitwarden/common/platform/storage/window-storage.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
+import { SystemNotificationsService } from "@bitwarden/common/platform/system-notifications/system-notifications.service";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { InternalSendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -160,13 +162,14 @@ import { InlineMenuFieldQualificationService } from "../../autofill/services/inl
 import { ForegroundBrowserBiometricsService } from "../../key-management/biometrics/foreground-browser-biometrics";
 import { ExtensionLockComponentService } from "../../key-management/lock/services/extension-lock-component.service";
 import { ForegroundVaultTimeoutService } from "../../key-management/vault-timeout/foreground-vault-timeout.service";
+import { BrowserActionsService } from "../../platform/actions/browser-actions.service";
 import { BrowserApi } from "../../platform/browser/browser-api";
 import { runInsideAngular } from "../../platform/browser/run-inside-angular.operator";
 /* eslint-disable no-restricted-imports */
 import { ZonedMessageListenerService } from "../../platform/browser/zoned-message-listener.service";
 import { ChromeMessageSender } from "../../platform/messaging/chrome-message.sender";
 /* eslint-enable no-restricted-imports */
-import { ForegroundNotificationsService } from "../../platform/notifications/foreground-notifications.service";
+import { ForegroundServerNotificationsService } from "../../platform/notifications/foreground-server-notifications.service";
 import { OffscreenDocumentService } from "../../platform/offscreen-document/abstractions/offscreen-document";
 import { DefaultOffscreenDocumentService } from "../../platform/offscreen-document/offscreen-document.service";
 import { PopupCompactModeService } from "../../platform/popup/layout/popup-compact-mode.service";
@@ -184,6 +187,7 @@ import { ForegroundTaskSchedulerService } from "../../platform/services/task-sch
 import { BrowserStorageServiceProvider } from "../../platform/storage/browser-storage-service.provider";
 import { ForegroundMemoryStorageService } from "../../platform/storage/foreground-memory-storage.service";
 import { ForegroundSyncService } from "../../platform/sync/foreground-sync.service";
+import { BrowserSystemNotificationService } from "../../platform/system-notifications/browser-system-notification.service";
 import { fromChromeRuntimeMessaging } from "../../platform/utils/from-chrome-runtime-messaging";
 import { FilePopoutUtilsService } from "../../tools/popup/services/file-popout-utils.service";
 import { Fido2UserVerificationService } from "../../vault/services/fido2-user-verification.service";
@@ -253,6 +257,11 @@ const safeProviders: SafeProvider[] = [
     },
     deps: [GlobalStateProvider],
   }),
+  safeProvider({
+    provide: ActionsService,
+    useClass: BrowserActionsService,
+    deps: [LogService, PlatformUtilsService],
+  }),
   safeProvider({
     provide: KeyService,
     useFactory: (
@@ -609,6 +618,11 @@ const safeProviders: SafeProvider[] = [
     useClass: SsoUrlService,
     deps: [],
   }),
+  safeProvider({
+    provide: SystemNotificationsService,
+    useClass: BrowserSystemNotificationService,
+    deps: [LogService, PlatformUtilsService],
+  }),
   safeProvider({
     provide: LoginComponentService,
     useClass: ExtensionLoginComponentService,
@@ -674,8 +688,8 @@ const safeProviders: SafeProvider[] = [
     deps: [KeyService, MasterPasswordApiService, InternalMasterPasswordServiceAbstraction, WINDOW],
   }),
   safeProvider({
-    provide: NotificationsService,
-    useClass: ForegroundNotificationsService,
+    provide: ServerNotificationsService,
+    useClass: ForegroundServerNotificationsService,
     deps: [LogService],
   }),
   safeProvider({
diff --git a/apps/cli/src/platform/services/cli-platform-utils.service.ts b/apps/cli/src/platform/services/cli-platform-utils.service.ts
index 7bed495bbf5..9e02b9dcca9 100644
--- a/apps/cli/src/platform/services/cli-platform-utils.service.ts
+++ b/apps/cli/src/platform/services/cli-platform-utils.service.ts
@@ -75,7 +75,7 @@ export class CliPlatformUtilsService implements PlatformUtilsService {
     return false;
   }
 
-  isViewOpen() {
+  isPopupOpen() {
     return Promise.resolve(false);
   }
 
diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index 04651ed0c10..197290cf690 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -62,7 +62,7 @@ import { MessagingService } from "@bitwarden/common/platform/abstractions/messag
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { SystemService } from "@bitwarden/common/platform/abstractions/system.service";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 import { StateEventRunnerService } from "@bitwarden/common/platform/state";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { UserId } from "@bitwarden/common/types/guid";
@@ -155,7 +155,7 @@ export class AppComponent implements OnInit, OnDestroy {
     private messagingService: MessagingService,
     private collectionService: CollectionService,
     private searchService: SearchService,
-    private notificationsService: NotificationsService,
+    private notificationsService: ServerNotificationsService,
     private platformUtilsService: PlatformUtilsService,
     private systemService: SystemService,
     private processReloadService: ProcessReloadServiceAbstraction,
diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts
index 2c68821b6c7..6b511ff366d 100644
--- a/apps/desktop/src/app/services/init.service.ts
+++ b/apps/desktop/src/app/services/init.service.ts
@@ -13,7 +13,7 @@ import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platfor
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 import { ContainerService } from "@bitwarden/common/platform/services/container.service";
 import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
 import { UserAutoUnlockKeyService } from "@bitwarden/common/platform/services/user-auto-unlock-key.service";
@@ -38,7 +38,7 @@ export class InitService {
     private i18nService: I18nServiceAbstraction,
     private eventUploadService: EventUploadServiceAbstraction,
     private twoFactorService: TwoFactorServiceAbstraction,
-    private notificationsService: NotificationsService,
+    private notificationsService: ServerNotificationsService,
     private platformUtilsService: PlatformUtilsServiceAbstraction,
     private stateService: StateServiceAbstraction,
     private keyService: KeyServiceAbstraction,
diff --git a/apps/desktop/src/platform/services/electron-platform-utils.service.ts b/apps/desktop/src/platform/services/electron-platform-utils.service.ts
index 43b867b7a68..23fb29e932a 100644
--- a/apps/desktop/src/platform/services/electron-platform-utils.service.ts
+++ b/apps/desktop/src/platform/services/electron-platform-utils.service.ts
@@ -59,7 +59,7 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
     return ipc.platform.isMacAppStore;
   }
 
-  isViewOpen(): Promise<boolean> {
+  isPopupOpen(): Promise<boolean> {
     return Promise.resolve(false);
   }
 
diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts
index ae20670c2dd..1cb95250611 100644
--- a/apps/web/src/app/app.component.ts
+++ b/apps/web/src/app/app.component.ts
@@ -22,7 +22,7 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 import { StateEventRunnerService } from "@bitwarden/common/platform/state";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
@@ -76,7 +76,7 @@ export class AppComponent implements OnDestroy, OnInit {
     private keyService: KeyService,
     private collectionService: CollectionService,
     private searchService: SearchService,
-    private notificationsService: NotificationsService,
+    private serverNotificationsService: ServerNotificationsService,
     private stateService: StateService,
     private eventUploadService: EventUploadService,
     protected policyListService: PolicyListService,
@@ -88,14 +88,14 @@ export class AppComponent implements OnDestroy, OnInit {
     private accountService: AccountService,
     private processReloadService: ProcessReloadServiceAbstraction,
     private deviceTrustToastService: DeviceTrustToastService,
-    private readonly destoryRef: DestroyRef,
+    private readonly destroy: DestroyRef,
     private readonly documentLangSetter: DocumentLangSetter,
     private readonly tokenService: TokenService,
   ) {
     this.deviceTrustToastService.setupListeners$.pipe(takeUntilDestroyed()).subscribe();
 
     const langSubscription = this.documentLangSetter.start();
-    this.destoryRef.onDestroy(() => langSubscription.unsubscribe());
+    this.destroy.onDestroy(() => langSubscription.unsubscribe());
   }
 
   ngOnInit() {
@@ -347,9 +347,9 @@ export class AppComponent implements OnDestroy, OnInit {
 
   private idleStateChanged() {
     if (this.isIdle) {
-      this.notificationsService.disconnectFromInactivity();
+      this.serverNotificationsService.disconnectFromInactivity();
     } else {
-      this.notificationsService.reconnectFromActivity();
+      this.serverNotificationsService.reconnectFromActivity();
     }
   }
 }
diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts
index a222b668043..965a9d5c99d 100644
--- a/apps/web/src/app/core/core.module.ts
+++ b/apps/web/src/app/core/core.module.ts
@@ -84,7 +84,7 @@ import { IpcService } from "@bitwarden/common/platform/ipc";
 import {
   UnsupportedWebPushConnectionService,
   WebPushConnectionService,
-} from "@bitwarden/common/platform/notifications/internal";
+} from "@bitwarden/common/platform/server-notifications/internal";
 import { AppIdService as DefaultAppIdService } from "@bitwarden/common/platform/services/app-id.service";
 import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service";
 import { MigrationBuilderService } from "@bitwarden/common/platform/services/migration-builder.service";
diff --git a/apps/web/src/app/core/init.service.ts b/apps/web/src/app/core/init.service.ts
index 57d9918aad7..a3358ff7253 100644
--- a/apps/web/src/app/core/init.service.ts
+++ b/apps/web/src/app/core/init.service.ts
@@ -12,7 +12,7 @@ import { DefaultVaultTimeoutService } from "@bitwarden/common/key-management/vau
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
 import { IpcService } from "@bitwarden/common/platform/ipc";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 import { ContainerService } from "@bitwarden/common/platform/services/container.service";
 import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
 import { UserAutoUnlockKeyService } from "@bitwarden/common/platform/services/user-auto-unlock-key.service";
@@ -26,7 +26,7 @@ import { VersionService } from "../platform/version.service";
 export class InitService {
   constructor(
     @Inject(WINDOW) private win: Window,
-    private notificationsService: NotificationsService,
+    private serverNotificationsService: ServerNotificationsService,
     private vaultTimeoutService: DefaultVaultTimeoutService,
     private i18nService: I18nServiceAbstraction,
     private eventUploadService: EventUploadServiceAbstraction,
@@ -56,7 +56,7 @@ export class InitService {
         await this.userAutoUnlockKeyService.setUserKeyInMemoryIfAutoUserKeySet(activeAccount.id);
       }
 
-      this.notificationsService.startListening();
+      this.serverNotificationsService.startListening();
       await this.vaultTimeoutService.init(true);
       await this.i18nService.init();
       (this.eventUploadService as EventUploadService).init(true);
diff --git a/apps/web/src/app/core/web-platform-utils.service.ts b/apps/web/src/app/core/web-platform-utils.service.ts
index c3d1f5e3c1a..ada0b09aa17 100644
--- a/apps/web/src/app/core/web-platform-utils.service.ts
+++ b/apps/web/src/app/core/web-platform-utils.service.ts
@@ -98,7 +98,7 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
     return false;
   }
 
-  isViewOpen(): Promise<boolean> {
+  isPopupOpen(): Promise<boolean> {
     return Promise.resolve(false);
   }
 
diff --git a/apps/web/src/app/platform/notifications/permissions-webpush-connection.service.ts b/apps/web/src/app/platform/notifications/permissions-webpush-connection.service.ts
index 44866285251..c0bc9ed3e77 100644
--- a/apps/web/src/app/platform/notifications/permissions-webpush-connection.service.ts
+++ b/apps/web/src/app/platform/notifications/permissions-webpush-connection.service.ts
@@ -5,7 +5,7 @@ import { SupportStatus } from "@bitwarden/common/platform/misc/support-status";
 import {
   WebPushConnector,
   WorkerWebPushConnectionService,
-} from "@bitwarden/common/platform/notifications/internal";
+} from "@bitwarden/common/platform/server-notifications/internal";
 import { UserId } from "@bitwarden/common/types/guid";
 
 export class PermissionsWebPushConnectionService extends WorkerWebPushConnectionService {
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 658f829128d..ca8b05c2701 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -565,7 +565,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
           this.refreshing = false;
 
           // Explicitly mark for check to ensure the view is updated
-          // Some sources are not always emitted within the Angular zone (e.g. ciphers updated via WS notifications)
+          // Some sources are not always emitted within the Angular zone (e.g. ciphers updated via WS server notifications)
           this.changeDetectorRef.markForCheck();
         },
       );
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index d6e4e901b50..50d1c477c96 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -196,24 +196,26 @@ import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.serv
 import { StateService as StateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
 import { ValidationService as ValidationServiceAbstraction } from "@bitwarden/common/platform/abstractions/validation.service";
+import { ActionsService } from "@bitwarden/common/platform/actions";
+import { UnsupportedActionsService } from "@bitwarden/common/platform/actions/unsupported-actions.service";
 import { Message, MessageListener, MessageSender } from "@bitwarden/common/platform/messaging";
 // eslint-disable-next-line no-restricted-imports -- Used for dependency injection
 import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
 import { devFlagEnabled } from "@bitwarden/common/platform/misc/flags";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
-// eslint-disable-next-line no-restricted-imports -- Needed for service creation
-import {
-  DefaultNotificationsService,
-  NoopNotificationsService,
-  SignalRConnectionService,
-  UnsupportedWebPushConnectionService,
-  WebPushConnectionService,
-  WebPushNotificationsApiService,
-} from "@bitwarden/common/platform/notifications/internal";
 import {
   DefaultTaskSchedulerService,
   TaskSchedulerService,
 } from "@bitwarden/common/platform/scheduling";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
+// eslint-disable-next-line no-restricted-imports -- Needed for service creation
+import {
+  DefaultServerNotificationsService,
+  NoopServerNotificationsService,
+  SignalRConnectionService,
+  UnsupportedWebPushConnectionService,
+  WebPushConnectionService,
+  WebPushNotificationsApiService,
+} from "@bitwarden/common/platform/server-notifications/internal";
 import { AppIdService } from "@bitwarden/common/platform/services/app-id.service";
 import { ConfigApiService } from "@bitwarden/common/platform/services/config/config-api.service";
 import { DefaultConfigService } from "@bitwarden/common/platform/services/config/default-config.service";
@@ -919,10 +921,15 @@ const safeProviders: SafeProvider[] = [
     deps: [],
   }),
   safeProvider({
-    provide: NotificationsService,
+    provide: ActionsService,
+    useClass: UnsupportedActionsService,
+    deps: [],
+  }),
+  safeProvider({
+    provide: ServerNotificationsService,
     useClass: devFlagEnabled("noopNotifications")
-      ? NoopNotificationsService
-      : DefaultNotificationsService,
+      ? NoopServerNotificationsService
+      : DefaultServerNotificationsService,
     deps: [
       LogService,
       SyncService,
@@ -1513,7 +1520,7 @@ const safeProviders: SafeProvider[] = [
       ApiServiceAbstraction,
       OrganizationServiceAbstraction,
       AuthServiceAbstraction,
-      NotificationsService,
+      ServerNotificationsService,
       MessageListener,
     ],
   }),
@@ -1523,7 +1530,7 @@ const safeProviders: SafeProvider[] = [
     deps: [
       StateProvider,
       ApiServiceAbstraction,
-      NotificationsService,
+      ServerNotificationsService,
       AuthServiceAbstraction,
       LogService,
     ],
diff --git a/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts b/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts
index 9eea3fe7bb0..10cc643fd45 100644
--- a/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts
+++ b/libs/auth/src/common/abstractions/auth-request.service.abstraction.ts
@@ -109,9 +109,9 @@ export abstract class AuthRequestServiceAbstraction {
   ): Promise<{ masterKey: MasterKey; masterKeyHash: string }>;
 
   /**
-   * Handles incoming auth request push notifications.
+   * Handles incoming auth request push server notifications.
    * @param notification push notification.
-   * @remark We should only be receiving approved push notifications to prevent enumeration.
+   * @remark We should only be receiving approved push server notifications to prevent enumeration.
    */
   abstract sendAuthRequestPushNotification(notification: AuthRequestPushNotification): void;
 
diff --git a/libs/auth/src/common/services/auth-request/auth-request-api.service.ts b/libs/auth/src/common/services/auth-request/auth-request-api.service.ts
index 15517a9a0e5..52c8cff1b7f 100644
--- a/libs/auth/src/common/services/auth-request/auth-request-api.service.ts
+++ b/libs/auth/src/common/services/auth-request/auth-request-api.service.ts
@@ -63,7 +63,7 @@ export class DefaultAuthRequestApiService implements AuthRequestApiServiceAbstra
     try {
       // Submit the current device identifier in the header as well as in the POST body.
       // The value in the header will be used to build the request context and ensure that the resulting
-      // notifications have the current device as a source.
+      // server notifications have the current device as a source.
       const response = await this.apiService.send(
         "POST",
         "/auth-requests/",
diff --git a/libs/common/src/enums/push-technology.enum.ts b/libs/common/src/enums/push-technology.enum.ts
index 1bc4e62cc9d..83de1f5849a 100644
--- a/libs/common/src/enums/push-technology.enum.ts
+++ b/libs/common/src/enums/push-technology.enum.ts
@@ -5,11 +5,11 @@
 // eslint-disable-next-line @bitwarden/platform/no-enums
 export enum PushTechnology {
   /**
-   * Indicates that we should use SignalR over web sockets to receive push notifications from the server.
+   * Indicates that we should use SignalR over web sockets to receive push server notifications from the server.
    */
   SignalR = 0,
   /**
-   * Indicatates that we should use WebPush to receive push notifications from the server.
+   * Indicates that we should use WebPush to receive push server notifications from the server.
    */
   WebPush = 1,
 }
diff --git a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
index 26d263d7e72..da815f76f79 100644
--- a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
+++ b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
@@ -185,7 +185,7 @@ describe("VaultTimeoutService", () => {
       ),
     );
 
-    platformUtilsService.isViewOpen.mockResolvedValue(globalSetups?.isViewOpen ?? false);
+    platformUtilsService.isPopupOpen.mockResolvedValue(globalSetups?.isViewOpen ?? false);
 
     vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$.mockImplementation((userId) => {
       return new BehaviorSubject<VaultTimeoutAction>(accounts[userId]?.timeoutAction);
@@ -225,7 +225,7 @@ describe("VaultTimeoutService", () => {
     it.each([AuthenticationStatus.Locked, AuthenticationStatus.LoggedOut])(
       "should not try to log out or lock any user that has authStatus === %s.",
       async (authStatus) => {
-        platformUtilsService.isViewOpen.mockResolvedValue(false);
+        platformUtilsService.isPopupOpen.mockResolvedValue(false);
         setupAccounts({
           1: {
             authStatus: authStatus,
diff --git a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
index 98f6f76fbe7..8b523498c31 100644
--- a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
+++ b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
@@ -84,7 +84,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
 
   async checkVaultTimeout(): Promise<void> {
     // Get whether or not the view is open a single time so it can be compared for each user
-    const isViewOpen = await this.platformUtilsService.isViewOpen();
+    const isViewOpen = await this.platformUtilsService.isPopupOpen();
 
     await firstValueFrom(
       combineLatest([
diff --git a/libs/common/src/platform/abstractions/platform-utils.service.ts b/libs/common/src/platform/abstractions/platform-utils.service.ts
index 7586da5a564..4d3f032052b 100644
--- a/libs/common/src/platform/abstractions/platform-utils.service.ts
+++ b/libs/common/src/platform/abstractions/platform-utils.service.ts
@@ -22,7 +22,7 @@ export abstract class PlatformUtilsService {
   abstract isVivaldi(): boolean;
   abstract isSafari(): boolean;
   abstract isMacAppStore(): boolean;
-  abstract isViewOpen(): Promise<boolean>;
+  abstract isPopupOpen(): Promise<boolean>;
   abstract launchUri(uri: string, options?: any): void;
   abstract getApplicationVersion(): Promise<string>;
   abstract getApplicationVersionNumber(): Promise<string>;
diff --git a/libs/common/src/platform/actions/README.md b/libs/common/src/platform/actions/README.md
new file mode 100644
index 00000000000..19165d88b56
--- /dev/null
+++ b/libs/common/src/platform/actions/README.md
@@ -0,0 +1,40 @@
+# Platform Actions API
+
+## ActionsService.openPopup()
+
+This document outlines the current behavior of `ActionsService.openPopup()` across different browsers, specifically in two contexts:
+
+- **Window Context**: When the call is triggered from an active browser window (e.g., from a tab's script).
+- **Background Service Worker Context**: When the call is made from a background context, such as a service worker.
+
+The `openPopup()` method has limitations in some environments due to browser-specific restrictions or bugs. Below is a compatibility chart detailing the observed behavior.
+
+---
+
+## Compatibility Table
+
+| Browser | Window Context      | Background Service Worker Context |
+| ------- | ------------------- | --------------------------------- |
+| Safari  | ✅ Works            | ❌ Fails                          |
+| Firefox | ❌ Fails            | ❌ Fails                          |
+| Chrome  | ✅ Works            | ✅ Works                          |
+| Edge    | 🟡 Untested         | 🟡 Untested                       |
+| Vivaldi | ⚠️ Ambiguous (Bug?) | ⚠️ Ambiguous (Bug?)               |
+| Opera   | ✅ Works            | ❌ Fails silently                 |
+
+---
+
+## Notes
+
+- **Safari**: Only works when `openPopup()` is triggered from a window context. Attempts from background service workers fail.
+- **Firefox**: Does not appear to support `openPopup()` in either context.
+- **Chrome**: Fully functional in both contexts, but only on Mac. Windows it does not work in.
+- **Edge**: Behavior has not been tested.
+- **Vivaldi**: `openPopup()` results in an error that _might_ be related to running in a background context, but the cause is currently unclear.
+- **Opera**: Works from window context. Background calls fail silently with no error message.
+
+---
+
+## Summary
+
+When implementing `ActionsService.openPopup()`, prefer triggering it from a window context whenever possible to maximize cross-browser compatibility. Full background service worker support is only reliable in **Chrome**.
diff --git a/libs/common/src/platform/actions/actions-service.ts b/libs/common/src/platform/actions/actions-service.ts
new file mode 100644
index 00000000000..499f727ac81
--- /dev/null
+++ b/libs/common/src/platform/actions/actions-service.ts
@@ -0,0 +1,6 @@
+export abstract class ActionsService {
+  /**
+   * Opens the popup if it is supported.
+   */
+  abstract openPopup(): Promise<void>;
+}
diff --git a/libs/common/src/platform/actions/index.ts b/libs/common/src/platform/actions/index.ts
new file mode 100644
index 00000000000..4c3a6f2bf23
--- /dev/null
+++ b/libs/common/src/platform/actions/index.ts
@@ -0,0 +1 @@
+export { ActionsService } from "./actions-service";
diff --git a/libs/common/src/platform/actions/unsupported-actions.service.ts b/libs/common/src/platform/actions/unsupported-actions.service.ts
new file mode 100644
index 00000000000..15a8fa39261
--- /dev/null
+++ b/libs/common/src/platform/actions/unsupported-actions.service.ts
@@ -0,0 +1,7 @@
+import { ActionsService } from "./actions-service";
+
+export class UnsupportedActionsService implements ActionsService {
+  openPopup(): Promise<void> {
+    throw new Error("Open Popup unsupported.");
+  }
+}
diff --git a/libs/common/src/platform/notifications/index.ts b/libs/common/src/platform/notifications/index.ts
deleted file mode 100644
index b1b842f5152..00000000000
--- a/libs/common/src/platform/notifications/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { NotificationsService } from "./notifications.service";
diff --git a/libs/common/src/platform/server-notifications/index.ts b/libs/common/src/platform/server-notifications/index.ts
new file mode 100644
index 00000000000..a53fde948cf
--- /dev/null
+++ b/libs/common/src/platform/server-notifications/index.ts
@@ -0,0 +1 @@
+export { ServerNotificationsService } from "./server-notifications.service";
diff --git a/libs/common/src/platform/notifications/internal/default-notifications.service.spec.ts b/libs/common/src/platform/server-notifications/internal/default-notifications.service.spec.ts
similarity index 95%
rename from libs/common/src/platform/notifications/internal/default-notifications.service.spec.ts
rename to libs/common/src/platform/server-notifications/internal/default-notifications.service.spec.ts
index 9dca079bdba..567e0fbfc3d 100644
--- a/libs/common/src/platform/notifications/internal/default-notifications.service.spec.ts
+++ b/libs/common/src/platform/server-notifications/internal/default-notifications.service.spec.ts
@@ -21,9 +21,9 @@ import { SupportStatus } from "../../misc/support-status";
 import { SyncService } from "../../sync";
 
 import {
-  DefaultNotificationsService,
+  DefaultServerNotificationsService,
   DISABLED_NOTIFICATIONS_URL,
-} from "./default-notifications.service";
+} from "./default-server-notifications.service";
 import { SignalRConnectionService, SignalRNotification } from "./signalr-connection.service";
 import { WebPushConnectionService, WebPushConnector } from "./webpush-connection.service";
 import { WorkerWebPushConnectionService } from "./worker-webpush-connection.service";
@@ -52,7 +52,7 @@ describe("NotificationsService", () => {
     notificationsUrl: string,
   ) => Subject<SignalRNotification>;
 
-  let sut: DefaultNotificationsService;
+  let sut: DefaultServerNotificationsService;
 
   beforeEach(() => {
     syncService = mock<SyncService>();
@@ -93,7 +93,7 @@ describe("NotificationsService", () => {
       () => new Subject<SignalRNotification>(),
     );
 
-    sut = new DefaultNotificationsService(
+    sut = new DefaultServerNotificationsService(
       mock<LogService>(),
       syncService,
       appIdService,
@@ -134,7 +134,7 @@ describe("NotificationsService", () => {
     expect(actualNotification.type).toBe(expectedType);
   };
 
-  it("emits notifications through WebPush when supported", async () => {
+  it("emits server notifications through WebPush when supported", async () => {
     const notificationsPromise = firstValueFrom(sut.notifications$.pipe(bufferCount(2)));
 
     emitActiveUser(mockUser1);
@@ -227,7 +227,7 @@ describe("NotificationsService", () => {
   });
 
   it.each([
-    // Temporarily rolling back notifications being connected while locked
+    // Temporarily rolling back server notifications being connected while locked
     // { initialStatus: AuthenticationStatus.Locked, updatedStatus: AuthenticationStatus.Unlocked },
     // { initialStatus: AuthenticationStatus.Unlocked, updatedStatus: AuthenticationStatus.Locked },
     // { initialStatus: AuthenticationStatus.Locked, updatedStatus: AuthenticationStatus.Locked },
@@ -256,7 +256,7 @@ describe("NotificationsService", () => {
   );
 
   it.each([
-    // Temporarily disabling notifications connecting while in a locked state
+    // Temporarily disabling server notifications connecting while in a locked state
     // AuthenticationStatus.Locked,
     AuthenticationStatus.Unlocked,
   ])(
@@ -282,7 +282,7 @@ describe("NotificationsService", () => {
     },
   );
 
-  it("does not connect to any notification stream when notifications are disabled through special url", () => {
+  it("does not connect to any notification stream when server notifications are disabled through special url", () => {
     const subscription = sut.notifications$.subscribe();
     emitActiveUser(mockUser1);
     emitNotificationUrl(DISABLED_NOTIFICATIONS_URL);
diff --git a/libs/common/src/platform/notifications/internal/default-notifications.service.ts b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
similarity index 91%
rename from libs/common/src/platform/notifications/internal/default-notifications.service.ts
rename to libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
index ff22173a26e..4502d9663a3 100644
--- a/libs/common/src/platform/notifications/internal/default-notifications.service.ts
+++ b/libs/common/src/platform/server-notifications/internal/default-server-notifications.service.ts
@@ -32,14 +32,14 @@ import { EnvironmentService } from "../../abstractions/environment.service";
 import { LogService } from "../../abstractions/log.service";
 import { MessagingService } from "../../abstractions/messaging.service";
 import { supportSwitch } from "../../misc/support-status";
-import { NotificationsService as NotificationsServiceAbstraction } from "../notifications.service";
+import { ServerNotificationsService } from "../server-notifications.service";
 
 import { ReceiveMessage, SignalRConnectionService } from "./signalr-connection.service";
 import { WebPushConnectionService } from "./webpush-connection.service";
 
 export const DISABLED_NOTIFICATIONS_URL = "http://-";
 
-export class DefaultNotificationsService implements NotificationsServiceAbstraction {
+export class DefaultServerNotificationsService implements ServerNotificationsService {
   notifications$: Observable<readonly [NotificationResponse, UserId]>;
 
   private activitySubject = new BehaviorSubject<"active" | "inactive">("active");
@@ -61,7 +61,7 @@ export class DefaultNotificationsService implements NotificationsServiceAbstract
       distinctUntilChanged(),
       switchMap((activeAccountId) => {
         if (activeAccountId == null) {
-          // We don't emit notifications for inactive accounts currently
+          // We don't emit server-notifications for inactive accounts currently
           return EMPTY;
         }
 
@@ -74,8 +74,8 @@ export class DefaultNotificationsService implements NotificationsServiceAbstract
   }
 
   /**
-   * Retrieves a stream of push notifications for the given user.
-   * @param userId The user id of the user to get the push notifications for.
+   * Retrieves a stream of push server notifications for the given user.
+   * @param userId The user id of the user to get the push server notifications for.
    */
   private userNotifications$(userId: UserId) {
     return this.environmentService.environment$.pipe(
@@ -109,7 +109,7 @@ export class DefaultNotificationsService implements NotificationsServiceAbstract
       }),
       supportSwitch({
         supported: (service) => {
-          this.logService.info("Using WebPush for notifications");
+          this.logService.info("Using WebPush for server notifications");
           return service.notifications$.pipe(
             catchError((err: unknown) => {
               this.logService.warning("Issue with web push, falling back to SignalR", err);
@@ -118,7 +118,7 @@ export class DefaultNotificationsService implements NotificationsServiceAbstract
           );
         },
         notSupported: () => {
-          this.logService.info("Using SignalR for notifications");
+          this.logService.info("Using SignalR for server notifications");
           return this.connectSignalR$(userId, notificationsUrl);
         },
       }),
@@ -188,7 +188,6 @@ export class DefaultNotificationsService implements NotificationsServiceAbstract
       case NotificationType.SyncCiphers:
       case NotificationType.SyncSettings:
         await this.syncService.fullSync(false);
-
         break;
       case NotificationType.SyncOrganizations:
         // An organization update may not have bumped the user's account revision date, so force a sync
@@ -214,11 +213,11 @@ export class DefaultNotificationsService implements NotificationsServiceAbstract
         await this.syncService.syncDeleteSend(notification.payload as SyncSendNotification);
         break;
       case NotificationType.AuthRequest:
-        {
-          this.messagingService.send("openLoginApproval", {
-            notificationId: notification.payload.id,
-          });
-        }
+        // create notification
+
+        this.messagingService.send("openLoginApproval", {
+          notificationId: notification.payload.id,
+        });
         break;
       case NotificationType.SyncOrganizationStatusChanged:
         await this.syncService.fullSync(true);
@@ -237,7 +236,8 @@ export class DefaultNotificationsService implements NotificationsServiceAbstract
         mergeMap(async ([notification, userId]) => this.processNotification(notification, userId)),
       )
       .subscribe({
-        error: (e: unknown) => this.logService.warning("Error in notifications$ observable", e),
+        error: (e: unknown) =>
+          this.logService.warning("Error in server notifications$ observable", e),
       });
   }
 
diff --git a/libs/common/src/platform/notifications/internal/index.ts b/libs/common/src/platform/server-notifications/internal/index.ts
similarity index 74%
rename from libs/common/src/platform/notifications/internal/index.ts
rename to libs/common/src/platform/server-notifications/internal/index.ts
index 067320ee56c..daa89a79468 100644
--- a/libs/common/src/platform/notifications/internal/index.ts
+++ b/libs/common/src/platform/server-notifications/internal/index.ts
@@ -1,7 +1,7 @@
 export * from "./worker-webpush-connection.service";
 export * from "./signalr-connection.service";
-export * from "./default-notifications.service";
-export * from "./noop-notifications.service";
+export * from "./default-server-notifications.service";
+export * from "./noop-server-notifications.service";
 export * from "./unsupported-webpush-connection.service";
 export * from "./webpush-connection.service";
 export * from "./websocket-webpush-connection.service";
diff --git a/libs/common/src/platform/notifications/internal/noop-notifications.service.ts b/libs/common/src/platform/server-notifications/internal/noop-server-notifications.service.ts
similarity index 74%
rename from libs/common/src/platform/notifications/internal/noop-notifications.service.ts
rename to libs/common/src/platform/server-notifications/internal/noop-server-notifications.service.ts
index 9c2435fb1a7..6a6bb9e19ed 100644
--- a/libs/common/src/platform/notifications/internal/noop-notifications.service.ts
+++ b/libs/common/src/platform/server-notifications/internal/noop-server-notifications.service.ts
@@ -4,16 +4,16 @@ import { NotificationResponse } from "@bitwarden/common/models/response/notifica
 import { UserId } from "@bitwarden/common/types/guid";
 
 import { LogService } from "../../abstractions/log.service";
-import { NotificationsService } from "../notifications.service";
+import { ServerNotificationsService } from "../server-notifications.service";
 
-export class NoopNotificationsService implements NotificationsService {
+export class NoopServerNotificationsService implements ServerNotificationsService {
   notifications$: Observable<readonly [NotificationResponse, UserId]> = new Subject();
 
   constructor(private logService: LogService) {}
 
   startListening(): Subscription {
     this.logService.info(
-      "Initializing no-op notification service, no push notifications will be received",
+      "Initializing no-op notification service, no push server notifications will be received",
     );
     return Subscription.EMPTY;
   }
diff --git a/libs/common/src/platform/notifications/internal/signalr-connection.service.ts b/libs/common/src/platform/server-notifications/internal/signalr-connection.service.ts
similarity index 100%
rename from libs/common/src/platform/notifications/internal/signalr-connection.service.ts
rename to libs/common/src/platform/server-notifications/internal/signalr-connection.service.ts
diff --git a/libs/common/src/platform/notifications/internal/unsupported-webpush-connection.service.ts b/libs/common/src/platform/server-notifications/internal/unsupported-webpush-connection.service.ts
similarity index 100%
rename from libs/common/src/platform/notifications/internal/unsupported-webpush-connection.service.ts
rename to libs/common/src/platform/server-notifications/internal/unsupported-webpush-connection.service.ts
diff --git a/libs/common/src/platform/notifications/internal/web-push-notifications-api.service.ts b/libs/common/src/platform/server-notifications/internal/web-push-notifications-api.service.ts
similarity index 94%
rename from libs/common/src/platform/notifications/internal/web-push-notifications-api.service.ts
rename to libs/common/src/platform/server-notifications/internal/web-push-notifications-api.service.ts
index b824b8c7d65..891dab2c069 100644
--- a/libs/common/src/platform/notifications/internal/web-push-notifications-api.service.ts
+++ b/libs/common/src/platform/server-notifications/internal/web-push-notifications-api.service.ts
@@ -10,7 +10,7 @@ export class WebPushNotificationsApiService {
   ) {}
 
   /**
-   * Posts a device-user association to the server and ensures it's installed for push notifications
+   * Posts a device-user association to the server and ensures it's installed for push server notifications
    */
   async putSubscription(pushSubscription: PushSubscriptionJSON): Promise<void> {
     const request = WebPushRequest.from(pushSubscription);
diff --git a/libs/common/src/platform/notifications/internal/web-push.request.ts b/libs/common/src/platform/server-notifications/internal/web-push.request.ts
similarity index 100%
rename from libs/common/src/platform/notifications/internal/web-push.request.ts
rename to libs/common/src/platform/server-notifications/internal/web-push.request.ts
diff --git a/libs/common/src/platform/notifications/internal/webpush-connection.service.ts b/libs/common/src/platform/server-notifications/internal/webpush-connection.service.ts
similarity index 100%
rename from libs/common/src/platform/notifications/internal/webpush-connection.service.ts
rename to libs/common/src/platform/server-notifications/internal/webpush-connection.service.ts
diff --git a/libs/common/src/platform/notifications/internal/websocket-webpush-connection.service.ts b/libs/common/src/platform/server-notifications/internal/websocket-webpush-connection.service.ts
similarity index 100%
rename from libs/common/src/platform/notifications/internal/websocket-webpush-connection.service.ts
rename to libs/common/src/platform/server-notifications/internal/websocket-webpush-connection.service.ts
diff --git a/libs/common/src/platform/notifications/internal/worker-webpush-connection.service.spec.ts b/libs/common/src/platform/server-notifications/internal/worker-webpush-connection.service.spec.ts
similarity index 100%
rename from libs/common/src/platform/notifications/internal/worker-webpush-connection.service.spec.ts
rename to libs/common/src/platform/server-notifications/internal/worker-webpush-connection.service.spec.ts
diff --git a/libs/common/src/platform/notifications/internal/worker-webpush-connection.service.ts b/libs/common/src/platform/server-notifications/internal/worker-webpush-connection.service.ts
similarity index 98%
rename from libs/common/src/platform/notifications/internal/worker-webpush-connection.service.ts
rename to libs/common/src/platform/server-notifications/internal/worker-webpush-connection.service.ts
index 528ad90ed61..d8a2c33568e 100644
--- a/libs/common/src/platform/notifications/internal/worker-webpush-connection.service.ts
+++ b/libs/common/src/platform/server-notifications/internal/worker-webpush-connection.service.ts
@@ -40,7 +40,7 @@ interface PushEvent {
 }
 
 /**
- * An implementation for connecting to web push based notifications running in a Worker.
+ * An implementation for connecting to web push based server notifications running in a Worker.
  */
 export class WorkerWebPushConnectionService implements WebPushConnectionService {
   private pushEvent = new Subject<PushEvent>();
@@ -75,7 +75,7 @@ export class WorkerWebPushConnectionService implements WebPushConnectionService
   }
 
   supportStatus$(userId: UserId): Observable<SupportStatus<WebPushConnector>> {
-    // Check the server config to see if it supports sending WebPush notifications
+    // Check the server config to see if it supports sending WebPush server notifications
     // FIXME: get config of server for the specified userId, once ConfigService supports it
     return this.configService.serverConfig$.pipe(
       map((config) =>
diff --git a/libs/common/src/platform/notifications/notifications.service.ts b/libs/common/src/platform/server-notifications/server-notifications.service.ts
similarity index 76%
rename from libs/common/src/platform/notifications/notifications.service.ts
rename to libs/common/src/platform/server-notifications/server-notifications.service.ts
index 9e72b4de493..97431290d7a 100644
--- a/libs/common/src/platform/notifications/notifications.service.ts
+++ b/libs/common/src/platform/server-notifications/server-notifications.service.ts
@@ -4,20 +4,20 @@ import { NotificationResponse } from "@bitwarden/common/models/response/notifica
 import { UserId } from "@bitwarden/common/types/guid";
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars -- Needed to link to API
-import type { DefaultNotificationsService } from "./internal";
+import type { DefaultServerNotificationsService } from "./internal";
 
 /**
  * A service offering abilities to interact with push notifications from the server.
  */
-export abstract class NotificationsService {
+export abstract class ServerNotificationsService {
   /**
    * @deprecated This method should not be consumed, an observable to listen to server
    * notifications will be available one day but it is not ready to be consumed generally.
-   * Please add code reacting to notifications in {@link DefaultNotificationsService.processNotification}
+   * Please add code reacting to server notifications in {@link DefaultServerNotificationsService.processNotification}
    */
   abstract notifications$: Observable<readonly [NotificationResponse, UserId]>;
   /**
-   * Starts automatic listening and processing of notifications, should only be called once per application,
+   * Starts automatic listening and processing of server notifications, should only be called once per application,
    * or you will risk notifications being processed multiple times.
    */
   abstract startListening(): Subscription;
diff --git a/libs/common/src/platform/sync/core-sync.service.ts b/libs/common/src/platform/sync/core-sync.service.ts
index 45a127c599a..30831fd73ef 100644
--- a/libs/common/src/platform/sync/core-sync.service.ts
+++ b/libs/common/src/platform/sync/core-sync.service.ts
@@ -230,7 +230,7 @@ export abstract class CoreSyncService implements SyncService {
         }),
       ),
     );
-    // Process only notifications for currently active user when user is not logged out
+    // Process only server notifications for currently active user when user is not logged out
     // TODO: once send service allows data manipulation of non-active users, this should process any received notification
     if (activeUserId === notification.userId && status !== AuthenticationStatus.LoggedOut) {
       try {
diff --git a/libs/common/src/platform/system-notifications/index.ts b/libs/common/src/platform/system-notifications/index.ts
new file mode 100644
index 00000000000..1209f1b42eb
--- /dev/null
+++ b/libs/common/src/platform/system-notifications/index.ts
@@ -0,0 +1 @@
+export { SystemNotificationsService } from "./system-notifications.service";
diff --git a/libs/common/src/platform/system-notifications/system-notifications.service.ts b/libs/common/src/platform/system-notifications/system-notifications.service.ts
new file mode 100644
index 00000000000..54369231967
--- /dev/null
+++ b/libs/common/src/platform/system-notifications/system-notifications.service.ts
@@ -0,0 +1,58 @@
+import { Observable } from "rxjs";
+
+// This is currently tailored for chrome extension's api, if safari works
+// differently where clicking a notification button produces a different
+// identifier we need to reconcile that here.
+export const ButtonLocation = Object.freeze({
+  FirstOptionalButton: 0, // this is the first optional button we can set
+  SecondOptionalButton: 1, // this is the second optional button we can set
+  NotificationButton: 2, // this is when you click the notification as a whole
+});
+
+export type ButtonLocationKeys = (typeof ButtonLocation)[keyof typeof ButtonLocation];
+
+export type SystemNotificationsButton = {
+  title: string;
+};
+
+export type SystemNotificationCreateInfo = {
+  id?: string;
+  title: string;
+  body: string;
+  buttons: SystemNotificationsButton[];
+};
+
+export type SystemNotificationClearInfo = {
+  id: string;
+};
+
+export type SystemNotificationEvent = {
+  id: string;
+  buttonIdentifier: number;
+};
+
+/**
+ * A service responsible for displaying operating system level server notifications.
+ */
+export abstract class SystemNotificationsService {
+  abstract notificationClicked$: Observable<SystemNotificationEvent>;
+
+  /**
+   * Creates a notification.
+   * @param createInfo
+   * @returns If a notification is successfully created it will respond back with an
+   *          id that refers to a notification.
+   */
+  abstract create(createInfo: SystemNotificationCreateInfo): Promise<string>;
+
+  /**
+   * Clears a notification.
+   * @param clearInfo Any info needed required to clear a notification.
+   */
+  abstract clear(clearInfo: SystemNotificationClearInfo): Promise<void>;
+
+  /**
+   * Used to know if a given platform supports server notifications.
+   */
+  abstract isSupported(): boolean;
+}
diff --git a/libs/common/src/platform/system-notifications/unsupported-system-notifications.service.ts b/libs/common/src/platform/system-notifications/unsupported-system-notifications.service.ts
new file mode 100644
index 00000000000..b3627b2b07b
--- /dev/null
+++ b/libs/common/src/platform/system-notifications/unsupported-system-notifications.service.ts
@@ -0,0 +1,23 @@
+import { throwError } from "rxjs";
+
+import {
+  SystemNotificationClearInfo,
+  SystemNotificationCreateInfo,
+  SystemNotificationsService,
+} from "./system-notifications.service";
+
+export class UnsupportedSystemNotificationsService implements SystemNotificationsService {
+  notificationClicked$ = throwError(() => new Error("Notification clicked is not supported."));
+
+  async create(createInfo: SystemNotificationCreateInfo): Promise<string> {
+    throw new Error("Create OS Notification unsupported.");
+  }
+
+  clear(clearInfo: SystemNotificationClearInfo): Promise<undefined> {
+    throw new Error("Clear OS Notification unsupported.");
+  }
+
+  isSupported(): boolean {
+    return false;
+  }
+}
diff --git a/libs/common/src/vault/notifications/services/default-end-user-notification.service.spec.ts b/libs/common/src/vault/notifications/services/default-end-user-notification.service.spec.ts
index 89a78d6f7d2..9eecf5eb496 100644
--- a/libs/common/src/vault/notifications/services/default-end-user-notification.service.spec.ts
+++ b/libs/common/src/vault/notifications/services/default-end-user-notification.service.spec.ts
@@ -4,7 +4,7 @@ import { firstValueFrom, of } from "rxjs";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { NotificationId, UserId } from "@bitwarden/common/types/guid";
 
@@ -20,7 +20,7 @@ import {
 describe("End User Notification Center Service", () => {
   let fakeStateProvider: FakeStateProvider;
   let mockApiService: jest.Mocked<ApiService>;
-  let mockNotificationsService: jest.Mocked<NotificationsService>;
+  let mockNotificationsService: jest.Mocked<ServerNotificationsService>;
   let mockAuthService: jest.Mocked<AuthService>;
   let mockLogService: jest.Mocked<LogService>;
   let service: DefaultEndUserNotificationService;
@@ -48,7 +48,7 @@ describe("End User Notification Center Service", () => {
   });
 
   describe("notifications$", () => {
-    it("should return notifications from state when not null", async () => {
+    it("should return server notifications from state when not null", async () => {
       fakeStateProvider.singleUser.mockFor("user-id" as UserId, NOTIFICATIONS, [
         {
           id: "notification-id" as NotificationId,
@@ -62,7 +62,7 @@ describe("End User Notification Center Service", () => {
       expect(mockLogService.warning).not.toHaveBeenCalled();
     });
 
-    it("should return notifications API when state is null", async () => {
+    it("should return server notifications API when state is null", async () => {
       mockApiService.send.mockResolvedValue({
         data: [
           {
@@ -86,7 +86,7 @@ describe("End User Notification Center Service", () => {
       expect(mockLogService.warning).not.toHaveBeenCalled();
     });
 
-    it("should log a warning if there are more notifications available", async () => {
+    it("should log a warning if there are more server notifications available", async () => {
       mockApiService.send.mockResolvedValue({
         data: [
           ...new Array(DEFAULT_NOTIFICATION_PAGE_SIZE + 1).fill({ id: "notification-id" }),
@@ -120,7 +120,7 @@ describe("End User Notification Center Service", () => {
   });
 
   describe("unreadNotifications$", () => {
-    it("should return unread notifications from state when read value is null", async () => {
+    it("should return unread server notifications from state when read value is null", async () => {
       fakeStateProvider.singleUser.mockFor("user-id" as UserId, NOTIFICATIONS, [
         {
           id: "notification-id" as NotificationId,
@@ -136,7 +136,7 @@ describe("End User Notification Center Service", () => {
   });
 
   describe("getNotifications", () => {
-    it("should call getNotifications returning notifications from API", async () => {
+    it("should call getNotifications returning server notifications from API", async () => {
       mockApiService.send.mockResolvedValue({
         data: [
           {
@@ -156,7 +156,7 @@ describe("End User Notification Center Service", () => {
       );
     });
 
-    it("should update local state when notifications are updated", async () => {
+    it("should update local state when server notifications are updated", async () => {
       mockApiService.send.mockResolvedValue({
         data: [
           {
diff --git a/libs/common/src/vault/notifications/services/default-end-user-notification.service.ts b/libs/common/src/vault/notifications/services/default-end-user-notification.service.ts
index 87f97b48c27..e3be4c19b0a 100644
--- a/libs/common/src/vault/notifications/services/default-end-user-notification.service.ts
+++ b/libs/common/src/vault/notifications/services/default-end-user-notification.service.ts
@@ -6,7 +6,7 @@ import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authenticatio
 import { NotificationType } from "@bitwarden/common/enums";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { NotificationId, UserId } from "@bitwarden/common/types/guid";
 import {
@@ -36,7 +36,7 @@ export class DefaultEndUserNotificationService implements EndUserNotificationSer
   constructor(
     private stateProvider: StateProvider,
     private apiService: ApiService,
-    private notificationService: NotificationsService,
+    private notificationService: ServerNotificationsService,
     private authService: AuthService,
     private logService: LogService,
   ) {}
diff --git a/libs/common/src/vault/tasks/services/default-task.service.spec.ts b/libs/common/src/vault/tasks/services/default-task.service.spec.ts
index a1f9872266e..df755dd9f90 100644
--- a/libs/common/src/vault/tasks/services/default-task.service.spec.ts
+++ b/libs/common/src/vault/tasks/services/default-task.service.spec.ts
@@ -8,7 +8,7 @@ import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authenticatio
 import { NotificationType } from "@bitwarden/common/enums";
 import { NotificationResponse } from "@bitwarden/common/models/response/notification.response";
 import { Message, MessageListener } from "@bitwarden/common/platform/messaging";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 import { SecurityTaskId, UserId } from "@bitwarden/common/types/guid";
 
 import { FakeStateProvider, mockAccountServiceWith } from "../../../../spec";
@@ -39,7 +39,9 @@ describe("Default task service", () => {
       { send: mockApiSend } as unknown as ApiService,
       { organizations$: mockGetAllOrgs$ } as unknown as OrganizationService,
       { authStatuses$: mockAuthStatuses$.asObservable() } as unknown as AuthService,
-      { notifications$: mockNotifications$.asObservable() } as unknown as NotificationsService,
+      {
+        notifications$: mockNotifications$.asObservable(),
+      } as unknown as ServerNotificationsService,
       { allMessages$: mockMessages$.asObservable() } as unknown as MessageListener,
     );
   });
diff --git a/libs/common/src/vault/tasks/services/default-task.service.ts b/libs/common/src/vault/tasks/services/default-task.service.ts
index 35a7561d63d..6238076ccf5 100644
--- a/libs/common/src/vault/tasks/services/default-task.service.ts
+++ b/libs/common/src/vault/tasks/services/default-task.service.ts
@@ -17,7 +17,7 @@ import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authenticatio
 import { NotificationType } from "@bitwarden/common/enums";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { MessageListener } from "@bitwarden/common/platform/messaging";
-import { NotificationsService } from "@bitwarden/common/platform/notifications";
+import { ServerNotificationsService } from "@bitwarden/common/platform/server-notifications";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { SecurityTaskId, UserId } from "@bitwarden/common/types/guid";
 import {
@@ -42,7 +42,7 @@ export class DefaultTaskService implements TaskService {
     private apiService: ApiService,
     private organizationService: OrganizationService,
     private authService: AuthService,
-    private notificationService: NotificationsService,
+    private notificationService: ServerNotificationsService,
     private messageListener: MessageListener,
   ) {}
 
@@ -171,7 +171,7 @@ export class DefaultTaskService implements TaskService {
   }
 
   /**
-   * Creates a subscription for pending security task notifications or completed syncs for unlocked users.
+   * Creates a subscription for pending security task server notifications or completed syncs for unlocked users.
    */
   listenForTaskNotifications(): Subscription {
     return this.authService.authStatuses$
diff --git a/libs/key-management-ui/src/lock/components/lock.component.ts b/libs/key-management-ui/src/lock/components/lock.component.ts
index 92c8004e4c9..c7aa8969660 100644
--- a/libs/key-management-ui/src/lock/components/lock.component.ts
+++ b/libs/key-management-ui/src/lock/components/lock.component.ts
@@ -625,7 +625,7 @@ export class LockComponent implements OnInit, OnDestroy {
       }
     }
 
-    // Vault can be de-synced since notifications get ignored while locked. Need to check whether sync is required using the sync service.
+    // Vault can be de-synced since server notifications get ignored while locked. Need to check whether sync is required using the sync service.
     const startSync = new Date().getTime();
     // TODO: This should probably not be blocking
     await this.syncService.fullSync(false);

From 487a04f579ca7d7af17318be619532df3d2f495a Mon Sep 17 00:00:00 2001
From: Vicki League <vleague@bitwarden.com>
Date: Wed, 20 Aug 2025 13:41:39 -0400
Subject: [PATCH 11/34] [PM-25022] Fix squished avatar (#16097)

---
 libs/components/src/avatar/avatar.component.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/components/src/avatar/avatar.component.ts b/libs/components/src/avatar/avatar.component.ts
index 59a9492f8c8..6f83c9ca101 100644
--- a/libs/components/src/avatar/avatar.component.ts
+++ b/libs/components/src/avatar/avatar.component.ts
@@ -7,11 +7,11 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 type SizeTypes = "xlarge" | "large" | "default" | "small" | "xsmall";
 
 const SizeClasses: Record<SizeTypes, string[]> = {
-  xlarge: ["tw-h-24", "tw-w-24"],
-  large: ["tw-h-16", "tw-w-16"],
-  default: ["tw-h-10", "tw-w-10"],
-  small: ["tw-h-7", "tw-w-7"],
-  xsmall: ["tw-h-6", "tw-w-6"],
+  xlarge: ["tw-h-24", "tw-w-24", "tw-min-w-24"],
+  large: ["tw-h-16", "tw-w-16", "tw-min-w-16"],
+  default: ["tw-h-10", "tw-w-10", "tw-min-w-10"],
+  small: ["tw-h-7", "tw-w-7", "tw-min-w-7"],
+  xsmall: ["tw-h-6", "tw-w-6", "tw-min-w-6"],
 };
 
 /**

From 3901cf2859706b8994c3f362ad9ef343a7c74785 Mon Sep 17 00:00:00 2001
From: Bryan Cunningham <bcunningham@bitwarden.com>
Date: Wed, 20 Aug 2025 15:06:24 -0400
Subject: [PATCH 12/34] [CL-805] [CL-521] anon layout illustrations (#16002)

* Add illustrations to anon layout

* update ids and fill classes

* Add illustrations to 404 page

* update svg sizes

* update logo size and placement to match loaded state

* update anon layout logo size to match loading screens

* update 404 logo size and spacing

* update svgIcon imports

* remove 404 footer

* absolutely position svg to fix random positioning issues

* update logo placement

* add padding to battom of logo container

* add back tw-link class

* update anon layout padding
---
 apps/web/src/404.html                         | 217 ++++++++++++++++--
 apps/web/src/app/app.component.html           | 190 ++++++++++++++-
 apps/web/src/index.html                       | 190 ++++++++++++++-
 .../anon-layout/anon-layout.component.html    |  21 +-
 .../src/anon-layout/anon-layout.component.ts  |   5 +
 .../src/anon-layout/illustrations/index.ts    |   2 +
 .../illustrations/left-illustration.ts        |   5 +
 .../illustrations/right-illustration.ts       |   5 +
 .../src/navigation/nav-logo.component.html    |   4 +-
 9 files changed, 610 insertions(+), 29 deletions(-)
 create mode 100644 libs/components/src/anon-layout/illustrations/index.ts
 create mode 100644 libs/components/src/anon-layout/illustrations/left-illustration.ts
 create mode 100644 libs/components/src/anon-layout/illustrations/right-illustration.ts

diff --git a/apps/web/src/404.html b/apps/web/src/404.html
index 75e4641a0cc..b3b5a5713ca 100644
--- a/apps/web/src/404.html
+++ b/apps/web/src/404.html
@@ -15,25 +15,206 @@
     <link rel="manifest" href="manifest.json" />
   </head>
 
-  <body class="tw-min-h-screen !tw-min-w-0 tw-text-center tw-bg-background-alt tw-flex tw-flex-col">
-    <img class="new-logo-themed tw-my-4 tw-mx-6" alt="Bitwarden" />
+  <body
+    class="tw-relative tw-min-h-screen !tw-min-w-0 tw-text-center tw-bg-background-alt tw-flex tw-flex-col"
+  >
+    <img class="new-logo-themed !tw-w-[200px] tw-ms-5 tw-my-5" alt="Bitwarden" />
+    <div class="tw-relative tw-grow">
+      <main class="tw-max-w-3xl tw-mx-auto tw-px-2 tw-my-8">
+        <h1 class="tw-mb-0 tw-h1">Sorry, this page isn't available.</h1>
 
-    <main class="tw-max-w-3xl tw-mx-auto tw-px-2 tw-my-8">
-      <h1 class="tw-mb-0 tw-h1">Sorry, this page isn't available.</h1>
+        <p class="tw-py-9 tw-mb-0">
+          The link you followed may be broken, or the page may have been removed. Try going back to
+          the previous page or see our
+          <a href="https://bitwarden.com/help/" target="_blank" rel="noreferrer" class="tw-link"
+            >Help Center</a
+          >
+          for more information.
+        </p>
+        <a href="/" class="tw-btn-secondary tw-inline-block">Go to your web vault</a>
+      </main>
+      <div
+        class="tw-hidden md:tw-block [&_svg]:tw-absolute [&_svg]:tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-start-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
+      >
+        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 501 226">
+          <g clip-path="url(#left-a)">
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M-71.691 6.821a4 4 0 0 1 4-4h296.5a4 4 0 0 1 4 4v188a4 4 0 0 1-4 4h-296.5a4 4 0 0 1-4-4v-188Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M-48.941 25.821a2 2 0 0 1 2-2h127.5v154h-127.5a2 2 0 0 1-2-2v-150Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="M80.559 25.82a2 2 0 0 1 2-2h125.5a2 2 0 0 1 2 2v150.001a2 2 0 0 1-2 2h-125.5a2 2 0 0 1-2-2v-150ZM45.871 89.854c0 17.155-13.96 31.062-31.182 31.062-17.221 0-31.182-13.907-31.182-31.062s13.96-31.062 31.182-31.062c17.221 0 31.182 13.907 31.182 31.062Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="M72.396 153.443a57.243 57.243 0 0 1 4.663 22.604v1.222a2 2 0 0 1-2 2h-118.5a2 2 0 0 1-2-2v-1.222a57.243 57.243 0 0 1 4.662-22.604c3.078-7.167 7.59-13.678 13.277-19.163 5.688-5.485 12.44-9.836 19.871-12.805a63.228 63.228 0 0 1 23.44-4.496 63.227 63.227 0 0 1 23.439 4.496c7.431 2.969 14.183 7.32 19.87 12.805 5.688 5.485 10.2 11.996 13.278 19.163Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M161.629 57.193c0 9.182-7.579 16.625-16.927 16.625-9.349 0-16.928-7.443-16.928-16.625 0-9.181 7.579-16.625 16.928-16.625 9.348 0 16.927 7.444 16.927 16.625Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M176.028 89.071a29.33 29.33 0 0 1 2.531 11.894c0 .937-.759 1.696-1.696 1.696h-63.109a1.695 1.695 0 0 1-1.695-1.696c0-4.081.86-8.123 2.531-11.894 1.671-3.77 4.12-7.197 7.207-10.083 3.088-2.886 6.753-5.176 10.787-6.738a35.275 35.275 0 0 1 12.725-2.366c4.366 0 8.69.804 12.724 2.366 4.034 1.562 7.699 3.852 10.787 6.738 3.087 2.886 5.537 6.312 7.208 10.083ZM161.629 134.193c0 9.182-7.579 16.625-16.927 16.625-9.349 0-16.928-7.443-16.928-16.625s7.579-16.625 16.928-16.625c9.348 0 16.927 7.443 16.927 16.625Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M176.028 165.953a28.993 28.993 0 0 1 2.531 11.821c0 .93-.755 1.684-1.685 1.684h-63.131c-.93 0-1.684-.754-1.684-1.684 0-4.057.86-8.074 2.531-11.821 1.671-3.748 4.12-7.153 7.207-10.021 3.088-2.869 6.753-5.144 10.787-6.696a35.456 35.456 0 0 1 12.725-2.352c4.366 0 8.69.799 12.724 2.352 4.034 1.552 7.699 3.827 10.787 6.696 3.087 2.868 5.537 6.273 7.208 10.021ZM-87.441 199.521h332.5v14.5c0 5.523-4.478 10-10 10h-312.5c-5.523 0-10-4.477-10-10v-14.5Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M208.059 21.82a4 4 0 0 1 4 4v150.001a4 4 0 0 1-4 4l-255 .001a4 4 0 0 1-4-4v-150a4 4 0 0 1 4-4l255-.001Zm-255 154.002h1.5a57.23 57.23 0 0 1 4.378-21.706l.284-.673c2.982-6.943 7.31-13.27 12.748-18.646l.529-.517c5.688-5.485 12.44-9.836 19.871-12.805a62.937 62.937 0 0 1 10.036-3.065c-11.113-4.751-18.897-15.747-18.897-28.556 0-17.155 13.96-31.061 31.182-31.062 17.22 0 31.18 13.907 31.181 31.062 0 12.537-7.457 23.338-18.192 28.245a62.952 62.952 0 0 1 11.569 3.376c7.431 2.969 14.184 7.32 19.871 12.805 5.688 5.485 10.2 11.996 13.278 19.163a57.251 57.251 0 0 1 4.66 22.379h1.502v-150h-125.5v150Zm129.5-.001h29.568a29.02 29.02 0 0 1 2.159-9.161l.304-.706c1.671-3.748 4.12-7.154 7.207-10.022 2.894-2.689 6.297-4.857 10.035-6.396l.752-.299c.996-.383 2.01-.721 3.037-1.012-4.602-2.879-7.693-7.881-7.841-13.602l-.006-.429c0-9.182 7.579-16.625 16.928-16.625l.437.006c9.146.227 16.49 7.581 16.49 16.619l-.006.429c-.144 5.571-3.08 10.461-7.484 13.372 1.321.338 2.622.752 3.894 1.242 4.034 1.552 7.7 3.827 10.787 6.695 3.088 2.868 5.536 6.274 7.207 10.022a29.066 29.066 0 0 1 2.462 9.867h29.57v-73h-125.5v73Zm62.75-24.936c-3.881 0-7.718.71-11.288 2.084-3.571 1.374-6.797 3.382-9.501 5.894-2.704 2.511-4.831 5.478-6.277 8.72a25.125 25.125 0 0 0-2.074 7.876h58.279a25.125 25.125 0 0 0-2.074-7.876c-1.445-3.242-3.573-6.209-6.276-8.72-2.705-2.512-5.931-4.52-9.501-5.894a31.473 31.473 0 0 0-11.288-2.084Zm-129.5-29.906a59.215 59.215 0 0 0-21.955 4.211c-6.957 2.779-13.269 6.848-18.579 11.969-5.31 5.12-9.513 11.191-12.378 17.862a53.266 53.266 0 0 0-4.332 20.248H73.053a53.266 53.266 0 0 0-4.332-20.248c-2.866-6.671-7.07-12.742-12.38-17.862-5.31-5.121-11.621-9.19-18.577-11.969a59.215 59.215 0 0 0-21.955-4.211Zm128.893.59c-7.208 0-12.928 5.72-12.928 12.625.001 6.904 5.721 12.624 12.928 12.624 7.208 0 12.926-5.72 12.927-12.624 0-6.905-5.719-12.625-12.927-12.625ZM14.69 62.792c-15.027 0-27.182 12.13-27.182 27.062 0 14.931 12.155 27.062 27.181 27.063 15.027-.001 27.182-12.132 27.182-27.063S29.716 62.793 14.69 62.792Zm67.869 36.029h29.579c.229-3.094.952-6.141 2.148-9.04l.304-.71a30.936 30.936 0 0 1 6.636-9.536l.571-.547a33.416 33.416 0 0 1 10.035-6.437l.752-.3a34.78 34.78 0 0 1 3.047-1.021c-4.607-2.878-7.703-7.883-7.851-13.607l-.006-.43c0-9.18 7.579-16.624 16.928-16.624l.437.006c9.146.227 16.49 7.58 16.49 16.619l-.006.429c-.144 5.574-3.082 10.465-7.49 13.376 1.324.34 2.626.758 3.9 1.252 4.034 1.561 7.7 3.85 10.787 6.737 3.088 2.886 5.536 6.312 7.207 10.083a29.407 29.407 0 0 1 2.451 9.75h29.581v-73h-125.5v73Zm62.75-24.937c-3.878 0-7.712.714-11.281 2.096-3.568 1.382-6.795 3.401-9.5 5.93-2.704 2.528-4.833 5.515-6.281 8.782a25.432 25.432 0 0 0-2.08 7.969h58.283a25.432 25.432 0 0 0-2.08-7.97c-1.447-3.266-3.577-6.253-6.281-8.781-2.705-2.529-5.931-4.548-9.5-5.93a31.275 31.275 0 0 0-11.28-2.096Zm-.607-29.315c-7.208 0-12.928 5.72-12.928 12.625.001 6.904 5.721 12.624 12.928 12.624 7.208 0 12.926-5.72 12.927-12.624 0-6.905-5.719-12.625-12.927-12.625Z"
+              clip-rule="evenodd"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M228.809.822a6 6 0 0 1 6 6v188a5.97 5.97 0 0 1-.643 2.699h12.893v16.5c0 6.627-5.373 12-12 12h-312.5c-6.628 0-12-5.373-12-12v-16.5h16.391a5.966 5.966 0 0 1-.634-2.391l-.007-.308v-188a6 6 0 0 1 6-6h296.5ZM-85.441 214.02a8 8 0 0 0 8 8h312.5a8 8 0 0 0 8-8v-12.5h-328.5v12.5Zm17.75-209.2a2 2 0 0 0-2 2v188.001l.01.204a2 2 0 0 0 1.99 1.796h296.5a2.001 2.001 0 0 0 2-2v-188a2 2 0 0 0-2-2h-296.5Z"
+              clip-rule="evenodd"
+            />
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M378.821 114.003a1.997 1.997 0 0 0-.675 1.497v8.396c0 .583.254 1.136.697 1.515l11.455 9.825a2 2 0 0 1 .543 2.286l-4.203 10.056a1.998 1.998 0 0 1-1.936 1.224l-15.288-.717a1.997 1.997 0 0 0-1.501.579l-6.014 5.979a1.995 1.995 0 0 0-.583 1.569l1.145 14.942a1.997 1.997 0 0 1-1.22 1.995l-9.958 4.169a1.997 1.997 0 0 1-2.252-.503l-10.221-11.309a1.998 1.998 0 0 0-1.482-.658h-8.474c-.579 0-1.129.252-1.508.689l-9.889 11.4a1.998 1.998 0 0 1-2.28.534l-9.969-4.174a1.998 1.998 0 0 1-1.224-1.937l.721-15.182a2 2 0 0 0-.587-1.51l-6.014-5.98a1.996 1.996 0 0 0-1.559-.575l-15.049 1.14a1.997 1.997 0 0 1-1.993-1.221l-4.198-10.045a1.997 1.997 0 0 1 .512-2.258l11.363-10.155c.424-.379.666-.92.666-1.489v-8.403c0-.583-.254-1.136-.696-1.516l-11.456-9.824a1.997 1.997 0 0 1-.542-2.286L279.354 92a1.998 1.998 0 0 1 1.936-1.224l15.288.717a1.998 1.998 0 0 0 1.502-.579l6.007-5.974c.418-.415.631-.995.582-1.582l-1.292-15.419a1.995 1.995 0 0 1 1.218-2.008l9.942-4.163a1.996 1.996 0 0 1 2.258.51l10.552 11.786c.379.423.92.665 1.488.665h8.469c.579 0 1.129-.25 1.508-.688l9.889-11.4a1.996 1.996 0 0 1 2.279-.534l9.97 4.174a1.999 1.999 0 0 1 1.224 1.937l-.721 15.181a2 2 0 0 0 .587 1.51l6.014 5.98c.411.41.98.62 1.558.576l15.049-1.14a1.996 1.996 0 0 1 1.993 1.22l4.195 10.036c.33.79.12 1.702-.521 2.268l-11.507 10.154Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M313.765 59.926a3.994 3.994 0 0 1 4.518 1.02l10.552 11.786h8.469l9.888-11.4a3.994 3.994 0 0 1 4.559-1.067l9.97 4.174a3.994 3.994 0 0 1 2.447 3.873l-.72 15.182 6.013 5.98 15.049-1.14a3.995 3.995 0 0 1 3.987 2.442l4.194 10.035a3.992 3.992 0 0 1-1.042 4.534L380.142 115.5v8.396l11.456 9.824a3.995 3.995 0 0 1 1.085 4.571l-4.203 10.056a3.993 3.993 0 0 1-3.872 2.449l-15.288-.717-6.013 5.98 1.145 14.943a3.994 3.994 0 0 1-2.44 3.988l-9.958 4.169a3.992 3.992 0 0 1-4.505-1.005l-10.221-11.309h-8.474l-9.889 11.4a3.993 3.993 0 0 1-4.559 1.067l-9.97-4.174a3.993 3.993 0 0 1-2.446-3.873l.72-15.181-6.014-5.98-15.049 1.14a3.993 3.993 0 0 1-3.986-2.442l-4.198-10.045a3.993 3.993 0 0 1 1.023-4.517l11.363-10.155v-8.403l-11.455-9.825a3.992 3.992 0 0 1-1.085-4.571l4.203-10.056a3.993 3.993 0 0 1 3.872-2.45l15.287.718 6.008-5.974-1.292-15.418a3.992 3.992 0 0 1 2.437-4.017l9.941-4.163Zm1.543 3.684-9.942 4.162 1.292 15.419a3.992 3.992 0 0 1-1.163 3.165l-6.008 5.974a3.994 3.994 0 0 1-3.003 1.157l-15.288-.717-4.202 10.056 11.455 9.824a3.993 3.993 0 0 1 1.394 3.032v8.403c0 1.137-.485 2.22-1.332 2.978l-11.364 10.154 4.198 10.045 15.049-1.14a3.994 3.994 0 0 1 3.118 1.15l6.014 5.98a3.996 3.996 0 0 1 1.173 3.021l-.72 15.181 9.969 4.175 9.889-11.401a3.994 3.994 0 0 1 3.017-1.377h8.474c1.129 0 2.206.478 2.963 1.316l10.221 11.309 9.958-4.169-1.145-14.943a3.996 3.996 0 0 1 1.166-3.137l6.013-5.979a3.997 3.997 0 0 1 3.003-1.158l15.288.717 4.203-10.056-11.456-9.824a3.995 3.995 0 0 1-1.393-3.031V115.5c0-1.146.492-2.236 1.351-2.994l11.506-10.155-4.194-10.035-15.049 1.14a3.991 3.991 0 0 1-3.117-1.15l-6.014-5.98a3.99 3.99 0 0 1-1.173-3.022l.72-15.181-9.97-4.174-9.889 11.4a3.992 3.992 0 0 1-3.016 1.377h-8.469a3.992 3.992 0 0 1-2.975-1.33L315.308 63.61Z"
+              clip-rule="evenodd"
+            />
+            <path
+              class="tw-fill-illustration-logo"
+              d="M353.438 119.624c0 11.289-9.152 20.441-20.442 20.441-11.289 0-20.441-9.152-20.441-20.441 0-11.29 9.152-20.442 20.441-20.442 11.29 0 20.442 9.152 20.442 20.442Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M332.996 101.179c-10.186 0-18.444 8.258-18.444 18.444 0 10.187 8.258 18.445 18.444 18.445 10.187 0 18.445-8.258 18.445-18.445 0-10.186-8.258-18.444-18.445-18.444Zm-22.438 18.444c0-12.392 10.046-22.438 22.438-22.438 12.393 0 22.439 10.046 22.439 22.438 0 12.393-10.046 22.439-22.439 22.439-12.392 0-22.438-10.046-22.438-22.439Z"
+              clip-rule="evenodd"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="m497.152 164.106-7.588-7.587a3.004 3.004 0 0 0-4.245-.003l-4.055 4.047 11.83 11.83 4.055-4.047a2.996 2.996 0 0 0 .003-4.24Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M500.922 194.274c0 22.644-18.356 41-41 41s-41-18.356-41-41 18.356-41 41-41 41 18.356 41 41Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              d="M459.03 177.416a2 2 0 1 1 4 0v18.469c0 .613-.282 1.192-.763 1.571l-12.032 9.48a2.001 2.001 0 0 1-2.809-.333 2.002 2.002 0 0 1 .334-2.809l11.27-8.881v-17.497Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="M450.936 144.041a2 2 0 0 1 2-2h13.972a2 2 0 0 1 2 2v3.863a2 2 0 0 1-2 2h-13.972a2 2 0 0 1-2-2v-3.863Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M467.114 140.046a4 4 0 0 1 3.794 3.995v3.863a3.999 3.999 0 0 1-3.931 3.998v1.978a40.72 40.72 0 0 1 13.484 4.903l3.69-3.68a5.008 5.008 0 0 1 7.076.003l7.587 7.588.177.186a4.994 4.994 0 0 1-.181 6.881l-3.615 3.606a40.801 40.801 0 0 1 5.727 20.907c0 22.644-18.357 41-41 41-22.644 0-41-18.356-41-41 0-20.434 14.949-37.375 34.507-40.487v-1.883h-.493a4 4 0 0 1-4-4v-3.863a4 4 0 0 1 4-4h13.972l.206.005Zm-7.192 17.228c-20.435 0-37 16.566-37 37 0 20.435 16.565 37 37 37 20.434 0 37-16.565 37-37 0-20.434-16.566-37-37-37Zm28.473.658a1.002 1.002 0 0 0-1.416-.001l-2.638 2.633 9.001 9.002 2.639-2.633a1 1 0 0 0 .07-1.338l-.069-.075-7.587-7.588Zm-30.966-6.028v1.447a41.171 41.171 0 0 1 5.548.036v-1.483h-5.548Zm-4.493-4h13.972v-3.863h-13.972v3.863Z"
+              clip-rule="evenodd"
+            />
+          </g>
+          <defs>
+            <clipPath id="left-a">
+              <path class="tw-fill-illustration-bg-tertiary" d="M0 0h501v226H0z" />
+            </clipPath>
+          </defs>
+        </svg>
+        `;
+      </div>
 
-      <p class="tw-py-9 tw-mb-0">
-        The link you followed may be broken, or the page may have been removed. Try going back to
-        the previous page or see our
-        <a href="https://bitwarden.com/help/" target="_blank" rel="noreferrer" class="tw-link"
-          >Help Center</a
-        >
-        for more information.
-      </p>
-
-      <a href="/" class="tw-btn-secondary tw-inline-block">Go to your web vault</a>
-    </main>
-    <footer class="tw-mt-auto tw-h-40 tw-bg-primary-600 tw-flex tw-justify-center tw-items-center">
-      <i class="bwi bwi-shield tw-text-contrast tw-text-4xl"></i>
-    </footer>
+      <div
+        class="tw-hidden md:tw-block [&_svg]:tw-absolute tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-end-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
+      >
+        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 506 297">
+          <g clip-path="url(#right-a)">
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M45.673 294.742v-29.124l22.323 16.198-15.395 15.75a4.04 4.04 0 0 1-6.928-2.824Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="m4.978 240.865 95.568-44.738c3.52-1.648 7.492 1.175 7.093 5.041l-9.608 93.173c-.395 3.823-4.774 5.79-7.893 3.547l-43.43-31.233-41.47-16.621c-4.06-1.627-4.221-7.315-.26-9.169Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              d="M99.698 194.315c4.929-2.306 10.489 1.645 9.931 7.058l-9.608 93.174c-.552 5.351-6.683 8.105-11.05 4.965l-20.832-14.983-14.107 14.435a6.04 6.04 0 0 1-10.359-4.222v-27.151l-39.178-15.7c-5.684-2.278-5.91-10.242-.364-12.838l95.567-44.738Zm5.953 6.648c.239-2.32-2.144-4.013-4.256-3.025L5.827 242.676c-2.376 1.112-2.28 4.525.156 5.502l40.159 16.093 26.703-30.327a2.001 2.001 0 0 1 3.002 2.644l-26.178 29.731 41.637 29.945c1.872 1.346 4.5.165 4.736-2.128l9.609-93.173Zm-57.978 93.779a2.04 2.04 0 0 0 3.498 1.426l13.684-14.001-17.182-12.357v24.932Z"
+            />
+            <circle
+              cx="86.719"
+              cy="86.719"
+              r="84.719"
+              class="tw-fill-illustration-bg-tertiary"
+              stroke="#020F66"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="4"
+              transform="scale(-1 1) rotate(45.035 -184.565 -565.488)"
+            />
+            <circle
+              cx="69.752"
+              cy="69.752"
+              r="69.752"
+              class="tw-fill-illustration-bg-secondary"
+              transform="scale(-1 1) rotate(45.035 -213.255 -553.709)"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              d="m445.838 353.214 2.95-180.467 12.372-.007 3.078 180.465a4.64 4.64 0 0 1-4.637 4.72l-9.12.005a4.64 4.64 0 0 1-4.643-4.716ZM453.82 52.947a2 2 0 0 1 1.998-2.001l35.638-.023a2 2 0 0 1 2.001 2.015l-.268 35.637a2 2 0 1 1-4-.03l.252-33.62-33.62.02a1.999 1.999 0 0 1-2.001-1.998ZM415.689 86.49a2 2 0 0 1 4.001.03l-.254 33.62 33.622-.021a2 2 0 0 1 .003 4l-35.637.022a2 2 0 0 1-2.001-2.015l.266-35.636Zm25.457-19.997a2 2 0 0 1 3.461-2.006l23.124 39.885a2 2 0 0 1-3.461 2.006l-23.124-39.885Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M259.264 277.271c21.107-4.293 34.791-24.62 30.565-45.402-4.227-20.782-24.764-34.15-45.871-29.857-21.107 4.293-34.791 24.62-30.565 45.402 4.227 20.783 24.764 34.15 45.871 29.857ZM299.993 173.472c7.793-1.585 12.826-9.188 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.187-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M329.869 242.094c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.188-12.826-16.981-11.241-7.794 1.585-12.827 9.188-11.241 16.981 1.585 7.794 9.187 12.827 16.981 11.241Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="M330.088 309.401c7.794-1.585 12.826-9.188 11.241-16.981-1.585-7.794-9.187-12.827-16.981-11.242-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.827 16.981 11.242Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M234.598 327.597c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.826 16.981 11.241Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M176.919 248.71c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.794-9.188-12.827-16.982-11.242-7.793 1.586-12.826 9.188-11.241 16.982 1.585 7.793 9.188 12.826 16.981 11.241Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="M206.836 185.071c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.793-9.188-12.826-16.982-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M200.699 154.89c8.875-1.805 17.533 3.927 19.339 12.803 1.165 5.732-.814 11.372-4.752 15.135.131.223.29.502.489.845l14.805 21.386a41.483 41.483 0 0 1 12.979-5.007c9.276-1.886 18.455-.523 26.321 3.303.038-.221.111-.441.227-.648l17.035-30.333a16.337 16.337 0 0 1-6.09-9.744c-1.805-8.876 3.928-17.535 12.803-19.34 8.876-1.805 17.534 3.928 19.339 12.803 1.805 8.876-3.926 17.534-12.802 19.339-3.427.697-6.822.27-9.803-1.028l-16.994 30.262a1.98 1.98 0 0 1-.397.497c8.774 5.316 15.487 13.883 18.16 24.43l19.238-1.61c-.007-7.642 5.356-14.488 13.135-16.07 8.875-1.805 17.534 3.927 19.339 12.803 1.805 8.875-3.927 17.533-12.802 19.339-8.639 1.757-17.072-3.627-19.18-12.099l-18.935 1.585c1.474 9.839-.81 19.465-5.834 27.387l29.108 22.962a16.324 16.324 0 0 1 8.523-4.671c8.876-1.804 17.534 3.928 19.339 12.803 1.805 8.876-3.927 17.534-12.802 19.339-8.875 1.805-17.534-3.926-19.34-12.802a16.338 16.338 0 0 1 1.872-11.474l-29.007-22.882c-5.828 7.464-14.29 12.983-24.349 15.028a41.442 41.442 0 0 1-14.045.441l-6.224 19.317a16.365 16.365 0 0 1 8.405 11.229c1.805 8.876-3.927 17.534-12.802 19.339-8.876 1.805-17.535-3.926-19.34-12.802-1.805-8.875 3.927-17.534 12.803-19.34 2.461-.5 4.906-.42 7.192.145l6.007-18.641c-14.851-3.594-27.011-15.301-30.225-31.105a40.043 40.043 0 0 1-.808-8.184l-20.473-1.442c-.032-.002-.064-.008-.096-.011-1.37 6.114-6.201 11.162-12.739 12.492-8.875 1.805-17.534-3.926-19.339-12.802-1.805-8.875 3.927-17.534 12.802-19.34 8.876-1.804 17.534 3.928 19.339 12.803.196.962.302 1.921.327 2.869l20.401 1.436c1.206-11.333 7.247-21.627 16.399-28.363l-14.76-21.321a20.41 20.41 0 0 0-.435-.719 16.428 16.428 0 0 1-4.816 1.8c-8.876 1.805-17.535-3.927-19.34-12.802-1.805-8.876 3.927-17.535 12.803-19.34Zm124.048 128.249c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.364-6.71-7.911-11.044-14.622-9.68Zm-95.49 18.196c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.621-1.365-6.711-7.911-11.045-14.622-9.681Zm15.1-97.363c-20.054 4.079-33.004 23.373-29.004 43.044 4.001 19.672 23.459 32.374 43.513 28.296 9.593-1.951 17.558-7.386 22.822-14.676a1.986 1.986 0 0 1 .612-.873c5.306-7.813 7.58-17.606 5.569-27.495-4.001-19.671-23.459-32.374-43.512-28.296Zm80.171 11.861c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.365-6.711-7.911-11.045-14.622-9.68Zm-152.949 6.614c-6.711 1.365-11.045 7.912-9.681 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.621-1.365-6.711-7.912-11.045-14.622-9.681Zm123.073-75.237c-6.71 1.365-11.044 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.622-1.365-6.71-7.912-11.045-14.623-9.68Zm-93.156 11.6c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.622 9.679 6.711-1.365 11.044-7.912 9.68-14.622-1.365-6.711-7.911-11.045-14.622-9.68Z"
+              clip-rule="evenodd"
+            />
+            <path
+              class="tw-fill-illustration-logo"
+              d="M272.266 232.544a1.998 1.998 0 0 0-.353 1.589l.554 2.725a2.002 2.002 0 0 0 1.002 1.357l4.786 2.611a2 2 0 0 1 1.003 2.15l-.667 3.313a1.998 1.998 0 0 1-1.647 1.58l-5.641.896a1.998 1.998 0 0 0-1.352.867l-1.524 2.291a2 2 0 0 0-.252 1.678l1.555 5.227a2 2 0 0 1-.794 2.224l-2.799 1.902a2 2 0 0 1-2.309-.043l-4.524-3.327a2 2 0 0 0-1.583-.348l-2.754.56a1.997 1.997 0 0 0-1.352.994l-2.638 4.785a2 2 0 0 1-2.14.996l-3.339-.661a2 2 0 0 1-1.587-1.649l-.886-5.597a2.003 2.003 0 0 0-.875-1.358l-2.298-1.514a2 2 0 0 0-1.669-.247l-5.272 1.563a2 2 0 0 1-2.22-.788l-1.897-2.774a2.001 2.001 0 0 1 .045-2.321l3.339-4.498a2.004 2.004 0 0 0 .354-1.591l-.557-2.736a2.001 2.001 0 0 0-.983-1.347l-4.848-2.715a2 2 0 0 1-.983-2.14l.669-3.329a2.001 2.001 0 0 1 1.648-1.581l5.641-.895a1.999 1.999 0 0 0 1.352-.868l1.526-2.293c.327-.493.42-1.105.253-1.673l-1.608-5.457a2 2 0 0 1 .794-2.22l2.793-1.897a2 2 0 0 1 2.322.053l4.676 3.5a1.999 1.999 0 0 0 1.597.359l2.744-.558a2.002 2.002 0 0 0 1.353-.995l2.637-4.784a1.997 1.997 0 0 1 2.14-.996l3.339.661a2 2 0 0 1 1.587 1.649l.886 5.597c.088.555.406 1.048.875 1.357l2.298 1.514a2.002 2.002 0 0 0 1.669.248l5.272-1.564a2 2 0 0 1 2.22.789l1.898 2.775a2 2 0 0 1-.044 2.319l-3.432 4.635Zm-24.977-.064c-4.049 2.702-5.078 8.076-2.395 11.991 2.705 4.028 8.1 5.044 12.035 2.365 3.936-2.678 5.078-8.076 2.395-11.991-2.592-4.051-7.986-5.067-12.035-2.365Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              d="m270.507 237.256-.554-2.724a4.004 4.004 0 0 1 .705-3.178l3.433-4.636-1.897-2.775-5.273 1.564a4 4 0 0 1-3.337-.494l-2.298-1.515a4 4 0 0 1-1.751-2.714l-.886-5.597-3.339-.661-2.637 4.784a4.001 4.001 0 0 1-2.706 1.989l-2.744.558a4 4 0 0 1-3.194-.718l-4.676-3.5-2.792 1.898 1.608 5.457a3.998 3.998 0 0 1-.507 3.345l-1.525 2.294c-.62.931-1.6 1.56-2.704 1.736l-5.642.895-.669 3.329 4.848 2.715a4 4 0 0 1 1.965 2.693l.557 2.737a3.999 3.999 0 0 1-.708 3.18l-3.338 4.499 1.897 2.774 5.272-1.563a3.998 3.998 0 0 1 3.338.494l2.298 1.514a4.001 4.001 0 0 1 1.75 2.715l.886 5.597 3.339.661 2.638-4.785a4 4 0 0 1 2.706-1.988l2.753-.56a4 4 0 0 1 3.166.697l4.524 3.327 2.8-1.902-1.555-5.227a4.002 4.002 0 0 1 .504-3.355l1.524-2.291a3.998 3.998 0 0 1 2.703-1.736l5.642-.895.667-3.313-4.787-2.611a4.004 4.004 0 0 1-2.004-2.714Zm-24.328-6.439c4.915-3.28 11.556-2.099 14.795 2.898h.001v.001l.034.051h-.001c3.294 4.868 1.835 11.464-2.953 14.723-4.855 3.304-11.499 2.043-14.821-2.903l.001-.001c-3.308-4.845-2.013-11.461 2.944-14.769Zm11.461 5.106c-1.959-3.06-6.075-3.891-9.24-1.779-3.036 2.026-3.85 5.957-2.039 8.913l.183.284.01.015c2.089 3.109 6.234 3.879 9.25 1.827 3.066-2.087 3.897-6.25 1.871-9.207a.97.97 0 0 1-.035-.053Zm16.787.536 4.787 2.611a4 4 0 0 1 2.005 4.3l-.666 3.313a4.001 4.001 0 0 1-3.295 3.161l-5.641.896-1.525 2.291 1.555 5.227a4.002 4.002 0 0 1-1.586 4.449l-2.8 1.901a4 4 0 0 1-4.618-.086l-4.523-3.326-2.753.56-2.638 4.784a4 4 0 0 1-4.279 1.993l-3.34-.661a4.002 4.002 0 0 1-3.174-3.298l-.886-5.598-2.298-1.514-5.273 1.564a3.999 3.999 0 0 1-4.438-1.577l-1.897-2.774a3.998 3.998 0 0 1 .09-4.641l3.338-4.499-.557-2.737-4.848-2.715a3.998 3.998 0 0 1-1.966-4.279l.669-3.329a4.002 4.002 0 0 1 3.294-3.162l5.642-.895 1.526-2.294-1.609-5.457a4.001 4.001 0 0 1 1.59-4.439l2.792-1.897a4 4 0 0 1 4.645.106l4.676 3.5 2.744-.558 2.636-4.785a4 4 0 0 1 4.281-1.992l3.339.661a4 4 0 0 1 3.174 3.298l.886 5.597 2.298 1.514 5.272-1.563a4 4 0 0 1 4.439 1.576l1.898 2.775a4.001 4.001 0 0 1-.087 4.639l-3.433 4.636.554 2.724Z"
+            />
+          </g>
+          <defs>
+            <clipPath id="right-a">
+              <path class="tw-fill-illustration-bg-tertiary" d="M0 0h506v297H0z" />
+            </clipPath>
+          </defs>
+        </svg>
+      </div>
+    </div>
   </body>
 </html>
diff --git a/apps/web/src/app/app.component.html b/apps/web/src/app/app.component.html
index 471d89be1c1..638ad47fe4e 100644
--- a/apps/web/src/app/app.component.html
+++ b/apps/web/src/app/app.component.html
@@ -2,8 +2,10 @@
   <!-- This is the same html from index.html which presents the bitwarden logo and loading spinny properly
    when the body has the layout_frontend class. Having this match the index allows for a duplicative yet seamless
    loading state here for process reloading. -->
-  <div class="tw-p-8 tw-flex">
-    <img class="new-logo-themed" alt="Bitwarden" />
+  <div class="tw-flex tw-flex-col tw-min-h-[100vh]">
+    <div class="tw-pt-5 tw-px-5 tw-fixed">
+      <img class="new-logo-themed !tw-w-[200px]" alt="Bitwarden" />
+    </div>
     <div class="spinner-container tw-justify-center">
       <i
         class="bwi bwi-spinner bwi-spin bwi-3x tw-text-muted"
@@ -11,6 +13,190 @@
         aria-hidden="true"
       ></i>
     </div>
+    <div class="tw-relative tw-grow">
+      <div
+        class="tw-hidden md:tw-block [&_svg]:tw-absolute [&_svg]:tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-start-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
+      >
+        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 501 226">
+          <g clip-path="url(#left-a)">
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M-71.691 6.821a4 4 0 0 1 4-4h296.5a4 4 0 0 1 4 4v188a4 4 0 0 1-4 4h-296.5a4 4 0 0 1-4-4v-188Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M-48.941 25.821a2 2 0 0 1 2-2h127.5v154h-127.5a2 2 0 0 1-2-2v-150Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="M80.559 25.82a2 2 0 0 1 2-2h125.5a2 2 0 0 1 2 2v150.001a2 2 0 0 1-2 2h-125.5a2 2 0 0 1-2-2v-150ZM45.871 89.854c0 17.155-13.96 31.062-31.182 31.062-17.221 0-31.182-13.907-31.182-31.062s13.96-31.062 31.182-31.062c17.221 0 31.182 13.907 31.182 31.062Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="M72.396 153.443a57.243 57.243 0 0 1 4.663 22.604v1.222a2 2 0 0 1-2 2h-118.5a2 2 0 0 1-2-2v-1.222a57.243 57.243 0 0 1 4.662-22.604c3.078-7.167 7.59-13.678 13.277-19.163 5.688-5.485 12.44-9.836 19.871-12.805a63.228 63.228 0 0 1 23.44-4.496 63.227 63.227 0 0 1 23.439 4.496c7.431 2.969 14.183 7.32 19.87 12.805 5.688 5.485 10.2 11.996 13.278 19.163Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M161.629 57.193c0 9.182-7.579 16.625-16.927 16.625-9.349 0-16.928-7.443-16.928-16.625 0-9.181 7.579-16.625 16.928-16.625 9.348 0 16.927 7.444 16.927 16.625Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M176.028 89.071a29.33 29.33 0 0 1 2.531 11.894c0 .937-.759 1.696-1.696 1.696h-63.109a1.695 1.695 0 0 1-1.695-1.696c0-4.081.86-8.123 2.531-11.894 1.671-3.77 4.12-7.197 7.207-10.083 3.088-2.886 6.753-5.176 10.787-6.738a35.275 35.275 0 0 1 12.725-2.366c4.366 0 8.69.804 12.724 2.366 4.034 1.562 7.699 3.852 10.787 6.738 3.087 2.886 5.537 6.312 7.208 10.083ZM161.629 134.193c0 9.182-7.579 16.625-16.927 16.625-9.349 0-16.928-7.443-16.928-16.625s7.579-16.625 16.928-16.625c9.348 0 16.927 7.443 16.927 16.625Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M176.028 165.953a28.993 28.993 0 0 1 2.531 11.821c0 .93-.755 1.684-1.685 1.684h-63.131c-.93 0-1.684-.754-1.684-1.684 0-4.057.86-8.074 2.531-11.821 1.671-3.748 4.12-7.153 7.207-10.021 3.088-2.869 6.753-5.144 10.787-6.696a35.456 35.456 0 0 1 12.725-2.352c4.366 0 8.69.799 12.724 2.352 4.034 1.552 7.699 3.827 10.787 6.696 3.087 2.868 5.537 6.273 7.208 10.021ZM-87.441 199.521h332.5v14.5c0 5.523-4.478 10-10 10h-312.5c-5.523 0-10-4.477-10-10v-14.5Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M208.059 21.82a4 4 0 0 1 4 4v150.001a4 4 0 0 1-4 4l-255 .001a4 4 0 0 1-4-4v-150a4 4 0 0 1 4-4l255-.001Zm-255 154.002h1.5a57.23 57.23 0 0 1 4.378-21.706l.284-.673c2.982-6.943 7.31-13.27 12.748-18.646l.529-.517c5.688-5.485 12.44-9.836 19.871-12.805a62.937 62.937 0 0 1 10.036-3.065c-11.113-4.751-18.897-15.747-18.897-28.556 0-17.155 13.96-31.061 31.182-31.062 17.22 0 31.18 13.907 31.181 31.062 0 12.537-7.457 23.338-18.192 28.245a62.952 62.952 0 0 1 11.569 3.376c7.431 2.969 14.184 7.32 19.871 12.805 5.688 5.485 10.2 11.996 13.278 19.163a57.251 57.251 0 0 1 4.66 22.379h1.502v-150h-125.5v150Zm129.5-.001h29.568a29.02 29.02 0 0 1 2.159-9.161l.304-.706c1.671-3.748 4.12-7.154 7.207-10.022 2.894-2.689 6.297-4.857 10.035-6.396l.752-.299c.996-.383 2.01-.721 3.037-1.012-4.602-2.879-7.693-7.881-7.841-13.602l-.006-.429c0-9.182 7.579-16.625 16.928-16.625l.437.006c9.146.227 16.49 7.581 16.49 16.619l-.006.429c-.144 5.571-3.08 10.461-7.484 13.372 1.321.338 2.622.752 3.894 1.242 4.034 1.552 7.7 3.827 10.787 6.695 3.088 2.868 5.536 6.274 7.207 10.022a29.066 29.066 0 0 1 2.462 9.867h29.57v-73h-125.5v73Zm62.75-24.936c-3.881 0-7.718.71-11.288 2.084-3.571 1.374-6.797 3.382-9.501 5.894-2.704 2.511-4.831 5.478-6.277 8.72a25.125 25.125 0 0 0-2.074 7.876h58.279a25.125 25.125 0 0 0-2.074-7.876c-1.445-3.242-3.573-6.209-6.276-8.72-2.705-2.512-5.931-4.52-9.501-5.894a31.473 31.473 0 0 0-11.288-2.084Zm-129.5-29.906a59.215 59.215 0 0 0-21.955 4.211c-6.957 2.779-13.269 6.848-18.579 11.969-5.31 5.12-9.513 11.191-12.378 17.862a53.266 53.266 0 0 0-4.332 20.248H73.053a53.266 53.266 0 0 0-4.332-20.248c-2.866-6.671-7.07-12.742-12.38-17.862-5.31-5.121-11.621-9.19-18.577-11.969a59.215 59.215 0 0 0-21.955-4.211Zm128.893.59c-7.208 0-12.928 5.72-12.928 12.625.001 6.904 5.721 12.624 12.928 12.624 7.208 0 12.926-5.72 12.927-12.624 0-6.905-5.719-12.625-12.927-12.625ZM14.69 62.792c-15.027 0-27.182 12.13-27.182 27.062 0 14.931 12.155 27.062 27.181 27.063 15.027-.001 27.182-12.132 27.182-27.063S29.716 62.793 14.69 62.792Zm67.869 36.029h29.579c.229-3.094.952-6.141 2.148-9.04l.304-.71a30.936 30.936 0 0 1 6.636-9.536l.571-.547a33.416 33.416 0 0 1 10.035-6.437l.752-.3a34.78 34.78 0 0 1 3.047-1.021c-4.607-2.878-7.703-7.883-7.851-13.607l-.006-.43c0-9.18 7.579-16.624 16.928-16.624l.437.006c9.146.227 16.49 7.58 16.49 16.619l-.006.429c-.144 5.574-3.082 10.465-7.49 13.376 1.324.34 2.626.758 3.9 1.252 4.034 1.561 7.7 3.85 10.787 6.737 3.088 2.886 5.536 6.312 7.207 10.083a29.407 29.407 0 0 1 2.451 9.75h29.581v-73h-125.5v73Zm62.75-24.937c-3.878 0-7.712.714-11.281 2.096-3.568 1.382-6.795 3.401-9.5 5.93-2.704 2.528-4.833 5.515-6.281 8.782a25.432 25.432 0 0 0-2.08 7.969h58.283a25.432 25.432 0 0 0-2.08-7.97c-1.447-3.266-3.577-6.253-6.281-8.781-2.705-2.529-5.931-4.548-9.5-5.93a31.275 31.275 0 0 0-11.28-2.096Zm-.607-29.315c-7.208 0-12.928 5.72-12.928 12.625.001 6.904 5.721 12.624 12.928 12.624 7.208 0 12.926-5.72 12.927-12.624 0-6.905-5.719-12.625-12.927-12.625Z"
+              clip-rule="evenodd"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M228.809.822a6 6 0 0 1 6 6v188a5.97 5.97 0 0 1-.643 2.699h12.893v16.5c0 6.627-5.373 12-12 12h-312.5c-6.628 0-12-5.373-12-12v-16.5h16.391a5.966 5.966 0 0 1-.634-2.391l-.007-.308v-188a6 6 0 0 1 6-6h296.5ZM-85.441 214.02a8 8 0 0 0 8 8h312.5a8 8 0 0 0 8-8v-12.5h-328.5v12.5Zm17.75-209.2a2 2 0 0 0-2 2v188.001l.01.204a2 2 0 0 0 1.99 1.796h296.5a2.001 2.001 0 0 0 2-2v-188a2 2 0 0 0-2-2h-296.5Z"
+              clip-rule="evenodd"
+            />
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M378.821 114.003a1.997 1.997 0 0 0-.675 1.497v8.396c0 .583.254 1.136.697 1.515l11.455 9.825a2 2 0 0 1 .543 2.286l-4.203 10.056a1.998 1.998 0 0 1-1.936 1.224l-15.288-.717a1.997 1.997 0 0 0-1.501.579l-6.014 5.979a1.995 1.995 0 0 0-.583 1.569l1.145 14.942a1.997 1.997 0 0 1-1.22 1.995l-9.958 4.169a1.997 1.997 0 0 1-2.252-.503l-10.221-11.309a1.998 1.998 0 0 0-1.482-.658h-8.474c-.579 0-1.129.252-1.508.689l-9.889 11.4a1.998 1.998 0 0 1-2.28.534l-9.969-4.174a1.998 1.998 0 0 1-1.224-1.937l.721-15.182a2 2 0 0 0-.587-1.51l-6.014-5.98a1.996 1.996 0 0 0-1.559-.575l-15.049 1.14a1.997 1.997 0 0 1-1.993-1.221l-4.198-10.045a1.997 1.997 0 0 1 .512-2.258l11.363-10.155c.424-.379.666-.92.666-1.489v-8.403c0-.583-.254-1.136-.696-1.516l-11.456-9.824a1.997 1.997 0 0 1-.542-2.286L279.354 92a1.998 1.998 0 0 1 1.936-1.224l15.288.717a1.998 1.998 0 0 0 1.502-.579l6.007-5.974c.418-.415.631-.995.582-1.582l-1.292-15.419a1.995 1.995 0 0 1 1.218-2.008l9.942-4.163a1.996 1.996 0 0 1 2.258.51l10.552 11.786c.379.423.92.665 1.488.665h8.469c.579 0 1.129-.25 1.508-.688l9.889-11.4a1.996 1.996 0 0 1 2.279-.534l9.97 4.174a1.999 1.999 0 0 1 1.224 1.937l-.721 15.181a2 2 0 0 0 .587 1.51l6.014 5.98c.411.41.98.62 1.558.576l15.049-1.14a1.996 1.996 0 0 1 1.993 1.22l4.195 10.036c.33.79.12 1.702-.521 2.268l-11.507 10.154Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M313.765 59.926a3.994 3.994 0 0 1 4.518 1.02l10.552 11.786h8.469l9.888-11.4a3.994 3.994 0 0 1 4.559-1.067l9.97 4.174a3.994 3.994 0 0 1 2.447 3.873l-.72 15.182 6.013 5.98 15.049-1.14a3.995 3.995 0 0 1 3.987 2.442l4.194 10.035a3.992 3.992 0 0 1-1.042 4.534L380.142 115.5v8.396l11.456 9.824a3.995 3.995 0 0 1 1.085 4.571l-4.203 10.056a3.993 3.993 0 0 1-3.872 2.449l-15.288-.717-6.013 5.98 1.145 14.943a3.994 3.994 0 0 1-2.44 3.988l-9.958 4.169a3.992 3.992 0 0 1-4.505-1.005l-10.221-11.309h-8.474l-9.889 11.4a3.993 3.993 0 0 1-4.559 1.067l-9.97-4.174a3.993 3.993 0 0 1-2.446-3.873l.72-15.181-6.014-5.98-15.049 1.14a3.993 3.993 0 0 1-3.986-2.442l-4.198-10.045a3.993 3.993 0 0 1 1.023-4.517l11.363-10.155v-8.403l-11.455-9.825a3.992 3.992 0 0 1-1.085-4.571l4.203-10.056a3.993 3.993 0 0 1 3.872-2.45l15.287.718 6.008-5.974-1.292-15.418a3.992 3.992 0 0 1 2.437-4.017l9.941-4.163Zm1.543 3.684-9.942 4.162 1.292 15.419a3.992 3.992 0 0 1-1.163 3.165l-6.008 5.974a3.994 3.994 0 0 1-3.003 1.157l-15.288-.717-4.202 10.056 11.455 9.824a3.993 3.993 0 0 1 1.394 3.032v8.403c0 1.137-.485 2.22-1.332 2.978l-11.364 10.154 4.198 10.045 15.049-1.14a3.994 3.994 0 0 1 3.118 1.15l6.014 5.98a3.996 3.996 0 0 1 1.173 3.021l-.72 15.181 9.969 4.175 9.889-11.401a3.994 3.994 0 0 1 3.017-1.377h8.474c1.129 0 2.206.478 2.963 1.316l10.221 11.309 9.958-4.169-1.145-14.943a3.996 3.996 0 0 1 1.166-3.137l6.013-5.979a3.997 3.997 0 0 1 3.003-1.158l15.288.717 4.203-10.056-11.456-9.824a3.995 3.995 0 0 1-1.393-3.031V115.5c0-1.146.492-2.236 1.351-2.994l11.506-10.155-4.194-10.035-15.049 1.14a3.991 3.991 0 0 1-3.117-1.15l-6.014-5.98a3.99 3.99 0 0 1-1.173-3.022l.72-15.181-9.97-4.174-9.889 11.4a3.992 3.992 0 0 1-3.016 1.377h-8.469a3.992 3.992 0 0 1-2.975-1.33L315.308 63.61Z"
+              clip-rule="evenodd"
+            />
+            <path
+              class="tw-fill-illustration-logo"
+              d="M353.438 119.624c0 11.289-9.152 20.441-20.442 20.441-11.289 0-20.441-9.152-20.441-20.441 0-11.29 9.152-20.442 20.441-20.442 11.29 0 20.442 9.152 20.442 20.442Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M332.996 101.179c-10.186 0-18.444 8.258-18.444 18.444 0 10.187 8.258 18.445 18.444 18.445 10.187 0 18.445-8.258 18.445-18.445 0-10.186-8.258-18.444-18.445-18.444Zm-22.438 18.444c0-12.392 10.046-22.438 22.438-22.438 12.393 0 22.439 10.046 22.439 22.438 0 12.393-10.046 22.439-22.439 22.439-12.392 0-22.438-10.046-22.438-22.439Z"
+              clip-rule="evenodd"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="m497.152 164.106-7.588-7.587a3.004 3.004 0 0 0-4.245-.003l-4.055 4.047 11.83 11.83 4.055-4.047a2.996 2.996 0 0 0 .003-4.24Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M500.922 194.274c0 22.644-18.356 41-41 41s-41-18.356-41-41 18.356-41 41-41 41 18.356 41 41Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              d="M459.03 177.416a2 2 0 1 1 4 0v18.469c0 .613-.282 1.192-.763 1.571l-12.032 9.48a2.001 2.001 0 0 1-2.809-.333 2.002 2.002 0 0 1 .334-2.809l11.27-8.881v-17.497Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="M450.936 144.041a2 2 0 0 1 2-2h13.972a2 2 0 0 1 2 2v3.863a2 2 0 0 1-2 2h-13.972a2 2 0 0 1-2-2v-3.863Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M467.114 140.046a4 4 0 0 1 3.794 3.995v3.863a3.999 3.999 0 0 1-3.931 3.998v1.978a40.72 40.72 0 0 1 13.484 4.903l3.69-3.68a5.008 5.008 0 0 1 7.076.003l7.587 7.588.177.186a4.994 4.994 0 0 1-.181 6.881l-3.615 3.606a40.801 40.801 0 0 1 5.727 20.907c0 22.644-18.357 41-41 41-22.644 0-41-18.356-41-41 0-20.434 14.949-37.375 34.507-40.487v-1.883h-.493a4 4 0 0 1-4-4v-3.863a4 4 0 0 1 4-4h13.972l.206.005Zm-7.192 17.228c-20.435 0-37 16.566-37 37 0 20.435 16.565 37 37 37 20.434 0 37-16.565 37-37 0-20.434-16.566-37-37-37Zm28.473.658a1.002 1.002 0 0 0-1.416-.001l-2.638 2.633 9.001 9.002 2.639-2.633a1 1 0 0 0 .07-1.338l-.069-.075-7.587-7.588Zm-30.966-6.028v1.447a41.171 41.171 0 0 1 5.548.036v-1.483h-5.548Zm-4.493-4h13.972v-3.863h-13.972v3.863Z"
+              clip-rule="evenodd"
+            />
+          </g>
+          <defs>
+            <clipPath id="left-a">
+              <path class="tw-fill-illustration-bg-tertiary" d="M0 0h501v226H0z" />
+            </clipPath>
+          </defs>
+        </svg>
+        `;
+      </div>
+
+      <div
+        class="tw-hidden md:tw-block [&_svg]:tw-absolute tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-end-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
+      >
+        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 506 297">
+          <g clip-path="url(#right-a)">
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M45.673 294.742v-29.124l22.323 16.198-15.395 15.75a4.04 4.04 0 0 1-6.928-2.824Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="m4.978 240.865 95.568-44.738c3.52-1.648 7.492 1.175 7.093 5.041l-9.608 93.173c-.395 3.823-4.774 5.79-7.893 3.547l-43.43-31.233-41.47-16.621c-4.06-1.627-4.221-7.315-.26-9.169Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              d="M99.698 194.315c4.929-2.306 10.489 1.645 9.931 7.058l-9.608 93.174c-.552 5.351-6.683 8.105-11.05 4.965l-20.832-14.983-14.107 14.435a6.04 6.04 0 0 1-10.359-4.222v-27.151l-39.178-15.7c-5.684-2.278-5.91-10.242-.364-12.838l95.567-44.738Zm5.953 6.648c.239-2.32-2.144-4.013-4.256-3.025L5.827 242.676c-2.376 1.112-2.28 4.525.156 5.502l40.159 16.093 26.703-30.327a2.001 2.001 0 0 1 3.002 2.644l-26.178 29.731 41.637 29.945c1.872 1.346 4.5.165 4.736-2.128l9.609-93.173Zm-57.978 93.779a2.04 2.04 0 0 0 3.498 1.426l13.684-14.001-17.182-12.357v24.932Z"
+            />
+            <circle
+              cx="86.719"
+              cy="86.719"
+              r="84.719"
+              class="tw-fill-illustration-bg-tertiary"
+              stroke="#020F66"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="4"
+              transform="scale(-1 1) rotate(45.035 -184.565 -565.488)"
+            />
+            <circle
+              cx="69.752"
+              cy="69.752"
+              r="69.752"
+              class="tw-fill-illustration-bg-secondary"
+              transform="scale(-1 1) rotate(45.035 -213.255 -553.709)"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              d="m445.838 353.214 2.95-180.467 12.372-.007 3.078 180.465a4.64 4.64 0 0 1-4.637 4.72l-9.12.005a4.64 4.64 0 0 1-4.643-4.716ZM453.82 52.947a2 2 0 0 1 1.998-2.001l35.638-.023a2 2 0 0 1 2.001 2.015l-.268 35.637a2 2 0 1 1-4-.03l.252-33.62-33.62.02a1.999 1.999 0 0 1-2.001-1.998ZM415.689 86.49a2 2 0 0 1 4.001.03l-.254 33.62 33.622-.021a2 2 0 0 1 .003 4l-35.637.022a2 2 0 0 1-2.001-2.015l.266-35.636Zm25.457-19.997a2 2 0 0 1 3.461-2.006l23.124 39.885a2 2 0 0 1-3.461 2.006l-23.124-39.885Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M259.264 277.271c21.107-4.293 34.791-24.62 30.565-45.402-4.227-20.782-24.764-34.15-45.871-29.857-21.107 4.293-34.791 24.62-30.565 45.402 4.227 20.783 24.764 34.15 45.871 29.857ZM299.993 173.472c7.793-1.585 12.826-9.188 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.187-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M329.869 242.094c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.188-12.826-16.981-11.241-7.794 1.585-12.827 9.188-11.241 16.981 1.585 7.794 9.187 12.827 16.981 11.241Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="M330.088 309.401c7.794-1.585 12.826-9.188 11.241-16.981-1.585-7.794-9.187-12.827-16.981-11.242-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.827 16.981 11.242Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-primary"
+              d="M234.598 327.597c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.826 16.981 11.241Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-secondary"
+              d="M176.919 248.71c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.794-9.188-12.827-16.982-11.242-7.793 1.586-12.826 9.188-11.241 16.982 1.585 7.793 9.188 12.826 16.981 11.241Z"
+            />
+            <path
+              class="tw-fill-illustration-bg-tertiary"
+              d="M206.836 185.071c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.793-9.188-12.826-16.982-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              fill-rule="evenodd"
+              d="M200.699 154.89c8.875-1.805 17.533 3.927 19.339 12.803 1.165 5.732-.814 11.372-4.752 15.135.131.223.29.502.489.845l14.805 21.386a41.483 41.483 0 0 1 12.979-5.007c9.276-1.886 18.455-.523 26.321 3.303.038-.221.111-.441.227-.648l17.035-30.333a16.337 16.337 0 0 1-6.09-9.744c-1.805-8.876 3.928-17.535 12.803-19.34 8.876-1.805 17.534 3.928 19.339 12.803 1.805 8.876-3.926 17.534-12.802 19.339-3.427.697-6.822.27-9.803-1.028l-16.994 30.262a1.98 1.98 0 0 1-.397.497c8.774 5.316 15.487 13.883 18.16 24.43l19.238-1.61c-.007-7.642 5.356-14.488 13.135-16.07 8.875-1.805 17.534 3.927 19.339 12.803 1.805 8.875-3.927 17.533-12.802 19.339-8.639 1.757-17.072-3.627-19.18-12.099l-18.935 1.585c1.474 9.839-.81 19.465-5.834 27.387l29.108 22.962a16.324 16.324 0 0 1 8.523-4.671c8.876-1.804 17.534 3.928 19.339 12.803 1.805 8.876-3.927 17.534-12.802 19.339-8.875 1.805-17.534-3.926-19.34-12.802a16.338 16.338 0 0 1 1.872-11.474l-29.007-22.882c-5.828 7.464-14.29 12.983-24.349 15.028a41.442 41.442 0 0 1-14.045.441l-6.224 19.317a16.365 16.365 0 0 1 8.405 11.229c1.805 8.876-3.927 17.534-12.802 19.339-8.876 1.805-17.535-3.926-19.34-12.802-1.805-8.875 3.927-17.534 12.803-19.34 2.461-.5 4.906-.42 7.192.145l6.007-18.641c-14.851-3.594-27.011-15.301-30.225-31.105a40.043 40.043 0 0 1-.808-8.184l-20.473-1.442c-.032-.002-.064-.008-.096-.011-1.37 6.114-6.201 11.162-12.739 12.492-8.875 1.805-17.534-3.926-19.339-12.802-1.805-8.875 3.927-17.534 12.802-19.34 8.876-1.804 17.534 3.928 19.339 12.803.196.962.302 1.921.327 2.869l20.401 1.436c1.206-11.333 7.247-21.627 16.399-28.363l-14.76-21.321a20.41 20.41 0 0 0-.435-.719 16.428 16.428 0 0 1-4.816 1.8c-8.876 1.805-17.535-3.927-19.34-12.802-1.805-8.876 3.927-17.535 12.803-19.34Zm124.048 128.249c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.364-6.71-7.911-11.044-14.622-9.68Zm-95.49 18.196c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.621-1.365-6.711-7.911-11.045-14.622-9.681Zm15.1-97.363c-20.054 4.079-33.004 23.373-29.004 43.044 4.001 19.672 23.459 32.374 43.513 28.296 9.593-1.951 17.558-7.386 22.822-14.676a1.986 1.986 0 0 1 .612-.873c5.306-7.813 7.58-17.606 5.569-27.495-4.001-19.671-23.459-32.374-43.512-28.296Zm80.171 11.861c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.365-6.711-7.911-11.045-14.622-9.68Zm-152.949 6.614c-6.711 1.365-11.045 7.912-9.681 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.621-1.365-6.711-7.912-11.045-14.622-9.681Zm123.073-75.237c-6.71 1.365-11.044 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.622-1.365-6.71-7.912-11.045-14.623-9.68Zm-93.156 11.6c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.622 9.679 6.711-1.365 11.044-7.912 9.68-14.622-1.365-6.711-7.911-11.045-14.622-9.68Z"
+              clip-rule="evenodd"
+            />
+            <path
+              class="tw-fill-illustration-logo"
+              d="M272.266 232.544a1.998 1.998 0 0 0-.353 1.589l.554 2.725a2.002 2.002 0 0 0 1.002 1.357l4.786 2.611a2 2 0 0 1 1.003 2.15l-.667 3.313a1.998 1.998 0 0 1-1.647 1.58l-5.641.896a1.998 1.998 0 0 0-1.352.867l-1.524 2.291a2 2 0 0 0-.252 1.678l1.555 5.227a2 2 0 0 1-.794 2.224l-2.799 1.902a2 2 0 0 1-2.309-.043l-4.524-3.327a2 2 0 0 0-1.583-.348l-2.754.56a1.997 1.997 0 0 0-1.352.994l-2.638 4.785a2 2 0 0 1-2.14.996l-3.339-.661a2 2 0 0 1-1.587-1.649l-.886-5.597a2.003 2.003 0 0 0-.875-1.358l-2.298-1.514a2 2 0 0 0-1.669-.247l-5.272 1.563a2 2 0 0 1-2.22-.788l-1.897-2.774a2.001 2.001 0 0 1 .045-2.321l3.339-4.498a2.004 2.004 0 0 0 .354-1.591l-.557-2.736a2.001 2.001 0 0 0-.983-1.347l-4.848-2.715a2 2 0 0 1-.983-2.14l.669-3.329a2.001 2.001 0 0 1 1.648-1.581l5.641-.895a1.999 1.999 0 0 0 1.352-.868l1.526-2.293c.327-.493.42-1.105.253-1.673l-1.608-5.457a2 2 0 0 1 .794-2.22l2.793-1.897a2 2 0 0 1 2.322.053l4.676 3.5a1.999 1.999 0 0 0 1.597.359l2.744-.558a2.002 2.002 0 0 0 1.353-.995l2.637-4.784a1.997 1.997 0 0 1 2.14-.996l3.339.661a2 2 0 0 1 1.587 1.649l.886 5.597c.088.555.406 1.048.875 1.357l2.298 1.514a2.002 2.002 0 0 0 1.669.248l5.272-1.564a2 2 0 0 1 2.22.789l1.898 2.775a2 2 0 0 1-.044 2.319l-3.432 4.635Zm-24.977-.064c-4.049 2.702-5.078 8.076-2.395 11.991 2.705 4.028 8.1 5.044 12.035 2.365 3.936-2.678 5.078-8.076 2.395-11.991-2.592-4.051-7.986-5.067-12.035-2.365Z"
+            />
+            <path
+              class="tw-fill-illustration-outline"
+              d="m270.507 237.256-.554-2.724a4.004 4.004 0 0 1 .705-3.178l3.433-4.636-1.897-2.775-5.273 1.564a4 4 0 0 1-3.337-.494l-2.298-1.515a4 4 0 0 1-1.751-2.714l-.886-5.597-3.339-.661-2.637 4.784a4.001 4.001 0 0 1-2.706 1.989l-2.744.558a4 4 0 0 1-3.194-.718l-4.676-3.5-2.792 1.898 1.608 5.457a3.998 3.998 0 0 1-.507 3.345l-1.525 2.294c-.62.931-1.6 1.56-2.704 1.736l-5.642.895-.669 3.329 4.848 2.715a4 4 0 0 1 1.965 2.693l.557 2.737a3.999 3.999 0 0 1-.708 3.18l-3.338 4.499 1.897 2.774 5.272-1.563a3.998 3.998 0 0 1 3.338.494l2.298 1.514a4.001 4.001 0 0 1 1.75 2.715l.886 5.597 3.339.661 2.638-4.785a4 4 0 0 1 2.706-1.988l2.753-.56a4 4 0 0 1 3.166.697l4.524 3.327 2.8-1.902-1.555-5.227a4.002 4.002 0 0 1 .504-3.355l1.524-2.291a3.998 3.998 0 0 1 2.703-1.736l5.642-.895.667-3.313-4.787-2.611a4.004 4.004 0 0 1-2.004-2.714Zm-24.328-6.439c4.915-3.28 11.556-2.099 14.795 2.898h.001v.001l.034.051h-.001c3.294 4.868 1.835 11.464-2.953 14.723-4.855 3.304-11.499 2.043-14.821-2.903l.001-.001c-3.308-4.845-2.013-11.461 2.944-14.769Zm11.461 5.106c-1.959-3.06-6.075-3.891-9.24-1.779-3.036 2.026-3.85 5.957-2.039 8.913l.183.284.01.015c2.089 3.109 6.234 3.879 9.25 1.827 3.066-2.087 3.897-6.25 1.871-9.207a.97.97 0 0 1-.035-.053Zm16.787.536 4.787 2.611a4 4 0 0 1 2.005 4.3l-.666 3.313a4.001 4.001 0 0 1-3.295 3.161l-5.641.896-1.525 2.291 1.555 5.227a4.002 4.002 0 0 1-1.586 4.449l-2.8 1.901a4 4 0 0 1-4.618-.086l-4.523-3.326-2.753.56-2.638 4.784a4 4 0 0 1-4.279 1.993l-3.34-.661a4.002 4.002 0 0 1-3.174-3.298l-.886-5.598-2.298-1.514-5.273 1.564a3.999 3.999 0 0 1-4.438-1.577l-1.897-2.774a3.998 3.998 0 0 1 .09-4.641l3.338-4.499-.557-2.737-4.848-2.715a3.998 3.998 0 0 1-1.966-4.279l.669-3.329a4.002 4.002 0 0 1 3.294-3.162l5.642-.895 1.526-2.294-1.609-5.457a4.001 4.001 0 0 1 1.59-4.439l2.792-1.897a4 4 0 0 1 4.645.106l4.676 3.5 2.744-.558 2.636-4.785a4 4 0 0 1 4.281-1.992l3.339.661a4 4 0 0 1 3.174 3.298l.886 5.597 2.298 1.514 5.272-1.563a4 4 0 0 1 4.439 1.576l1.898 2.775a4.001 4.001 0 0 1-.087 4.639l-3.433 4.636.554 2.724Z"
+            />
+          </g>
+          <defs>
+            <clipPath id="right-a">
+              <path class="tw-fill-illustration-bg-tertiary" d="M0 0h506v297H0z" />
+            </clipPath>
+          </defs>
+        </svg>
+      </div>
+    </div>
   </div>
 </ng-template>
 
diff --git a/apps/web/src/index.html b/apps/web/src/index.html
index 1c81ae7a4e6..06f7587a123 100644
--- a/apps/web/src/index.html
+++ b/apps/web/src/index.html
@@ -16,8 +16,10 @@
   <body class="layout_frontend">
     <app-root>
       <!-- Note: any changes to this html need to be made in the app.component.html as well -->
-      <div class="tw-px-6 tw-py-4 tw-flex">
-        <img class="new-logo-themed" alt="Bitwarden" />
+      <div class="tw-flex tw-flex-col tw-min-h-[100vh]">
+        <div class="tw-pt-5 tw-px-5 tw-fixed">
+          <img class="new-logo-themed !tw-w-[200px]" alt="Bitwarden" />
+        </div>
         <div class="spinner-container tw-justify-center">
           <i
             class="bwi bwi-spinner bwi-spin bwi-3x tw-text-muted"
@@ -25,6 +27,190 @@
             aria-hidden="true"
           ></i>
         </div>
+        <div class="tw-relative tw-grow">
+          <div
+            class="tw-hidden md:tw-block [&_svg]:tw-absolute [&_svg]:tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-start-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
+          >
+            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 501 226">
+              <g clip-path="url(#left-a)">
+                <path
+                  class="tw-fill-illustration-bg-primary"
+                  d="M-71.691 6.821a4 4 0 0 1 4-4h296.5a4 4 0 0 1 4 4v188a4 4 0 0 1-4 4h-296.5a4 4 0 0 1-4-4v-188Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-primary"
+                  d="M-48.941 25.821a2 2 0 0 1 2-2h127.5v154h-127.5a2 2 0 0 1-2-2v-150Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-tertiary"
+                  d="M80.559 25.82a2 2 0 0 1 2-2h125.5a2 2 0 0 1 2 2v150.001a2 2 0 0 1-2 2h-125.5a2 2 0 0 1-2-2v-150ZM45.871 89.854c0 17.155-13.96 31.062-31.182 31.062-17.221 0-31.182-13.907-31.182-31.062s13.96-31.062 31.182-31.062c17.221 0 31.182 13.907 31.182 31.062Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-tertiary"
+                  d="M72.396 153.443a57.243 57.243 0 0 1 4.663 22.604v1.222a2 2 0 0 1-2 2h-118.5a2 2 0 0 1-2-2v-1.222a57.243 57.243 0 0 1 4.662-22.604c3.078-7.167 7.59-13.678 13.277-19.163 5.688-5.485 12.44-9.836 19.871-12.805a63.228 63.228 0 0 1 23.44-4.496 63.227 63.227 0 0 1 23.439 4.496c7.431 2.969 14.183 7.32 19.87 12.805 5.688 5.485 10.2 11.996 13.278 19.163Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-secondary"
+                  d="M161.629 57.193c0 9.182-7.579 16.625-16.927 16.625-9.349 0-16.928-7.443-16.928-16.625 0-9.181 7.579-16.625 16.928-16.625 9.348 0 16.927 7.444 16.927 16.625Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-secondary"
+                  d="M176.028 89.071a29.33 29.33 0 0 1 2.531 11.894c0 .937-.759 1.696-1.696 1.696h-63.109a1.695 1.695 0 0 1-1.695-1.696c0-4.081.86-8.123 2.531-11.894 1.671-3.77 4.12-7.197 7.207-10.083 3.088-2.886 6.753-5.176 10.787-6.738a35.275 35.275 0 0 1 12.725-2.366c4.366 0 8.69.804 12.724 2.366 4.034 1.562 7.699 3.852 10.787 6.738 3.087 2.886 5.537 6.312 7.208 10.083ZM161.629 134.193c0 9.182-7.579 16.625-16.927 16.625-9.349 0-16.928-7.443-16.928-16.625s7.579-16.625 16.928-16.625c9.348 0 16.927 7.443 16.927 16.625Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-secondary"
+                  d="M176.028 165.953a28.993 28.993 0 0 1 2.531 11.821c0 .93-.755 1.684-1.685 1.684h-63.131c-.93 0-1.684-.754-1.684-1.684 0-4.057.86-8.074 2.531-11.821 1.671-3.748 4.12-7.153 7.207-10.021 3.088-2.869 6.753-5.144 10.787-6.696a35.456 35.456 0 0 1 12.725-2.352c4.366 0 8.69.799 12.724 2.352 4.034 1.552 7.699 3.827 10.787 6.696 3.087 2.868 5.537 6.273 7.208 10.021ZM-87.441 199.521h332.5v14.5c0 5.523-4.478 10-10 10h-312.5c-5.523 0-10-4.477-10-10v-14.5Z"
+                />
+                <path
+                  class="tw-fill-illustration-outline"
+                  fill-rule="evenodd"
+                  d="M208.059 21.82a4 4 0 0 1 4 4v150.001a4 4 0 0 1-4 4l-255 .001a4 4 0 0 1-4-4v-150a4 4 0 0 1 4-4l255-.001Zm-255 154.002h1.5a57.23 57.23 0 0 1 4.378-21.706l.284-.673c2.982-6.943 7.31-13.27 12.748-18.646l.529-.517c5.688-5.485 12.44-9.836 19.871-12.805a62.937 62.937 0 0 1 10.036-3.065c-11.113-4.751-18.897-15.747-18.897-28.556 0-17.155 13.96-31.061 31.182-31.062 17.22 0 31.18 13.907 31.181 31.062 0 12.537-7.457 23.338-18.192 28.245a62.952 62.952 0 0 1 11.569 3.376c7.431 2.969 14.184 7.32 19.871 12.805 5.688 5.485 10.2 11.996 13.278 19.163a57.251 57.251 0 0 1 4.66 22.379h1.502v-150h-125.5v150Zm129.5-.001h29.568a29.02 29.02 0 0 1 2.159-9.161l.304-.706c1.671-3.748 4.12-7.154 7.207-10.022 2.894-2.689 6.297-4.857 10.035-6.396l.752-.299c.996-.383 2.01-.721 3.037-1.012-4.602-2.879-7.693-7.881-7.841-13.602l-.006-.429c0-9.182 7.579-16.625 16.928-16.625l.437.006c9.146.227 16.49 7.581 16.49 16.619l-.006.429c-.144 5.571-3.08 10.461-7.484 13.372 1.321.338 2.622.752 3.894 1.242 4.034 1.552 7.7 3.827 10.787 6.695 3.088 2.868 5.536 6.274 7.207 10.022a29.066 29.066 0 0 1 2.462 9.867h29.57v-73h-125.5v73Zm62.75-24.936c-3.881 0-7.718.71-11.288 2.084-3.571 1.374-6.797 3.382-9.501 5.894-2.704 2.511-4.831 5.478-6.277 8.72a25.125 25.125 0 0 0-2.074 7.876h58.279a25.125 25.125 0 0 0-2.074-7.876c-1.445-3.242-3.573-6.209-6.276-8.72-2.705-2.512-5.931-4.52-9.501-5.894a31.473 31.473 0 0 0-11.288-2.084Zm-129.5-29.906a59.215 59.215 0 0 0-21.955 4.211c-6.957 2.779-13.269 6.848-18.579 11.969-5.31 5.12-9.513 11.191-12.378 17.862a53.266 53.266 0 0 0-4.332 20.248H73.053a53.266 53.266 0 0 0-4.332-20.248c-2.866-6.671-7.07-12.742-12.38-17.862-5.31-5.121-11.621-9.19-18.577-11.969a59.215 59.215 0 0 0-21.955-4.211Zm128.893.59c-7.208 0-12.928 5.72-12.928 12.625.001 6.904 5.721 12.624 12.928 12.624 7.208 0 12.926-5.72 12.927-12.624 0-6.905-5.719-12.625-12.927-12.625ZM14.69 62.792c-15.027 0-27.182 12.13-27.182 27.062 0 14.931 12.155 27.062 27.181 27.063 15.027-.001 27.182-12.132 27.182-27.063S29.716 62.793 14.69 62.792Zm67.869 36.029h29.579c.229-3.094.952-6.141 2.148-9.04l.304-.71a30.936 30.936 0 0 1 6.636-9.536l.571-.547a33.416 33.416 0 0 1 10.035-6.437l.752-.3a34.78 34.78 0 0 1 3.047-1.021c-4.607-2.878-7.703-7.883-7.851-13.607l-.006-.43c0-9.18 7.579-16.624 16.928-16.624l.437.006c9.146.227 16.49 7.58 16.49 16.619l-.006.429c-.144 5.574-3.082 10.465-7.49 13.376 1.324.34 2.626.758 3.9 1.252 4.034 1.561 7.7 3.85 10.787 6.737 3.088 2.886 5.536 6.312 7.207 10.083a29.407 29.407 0 0 1 2.451 9.75h29.581v-73h-125.5v73Zm62.75-24.937c-3.878 0-7.712.714-11.281 2.096-3.568 1.382-6.795 3.401-9.5 5.93-2.704 2.528-4.833 5.515-6.281 8.782a25.432 25.432 0 0 0-2.08 7.969h58.283a25.432 25.432 0 0 0-2.08-7.97c-1.447-3.266-3.577-6.253-6.281-8.781-2.705-2.529-5.931-4.548-9.5-5.93a31.275 31.275 0 0 0-11.28-2.096Zm-.607-29.315c-7.208 0-12.928 5.72-12.928 12.625.001 6.904 5.721 12.624 12.928 12.624 7.208 0 12.926-5.72 12.927-12.624 0-6.905-5.719-12.625-12.927-12.625Z"
+                  clip-rule="evenodd"
+                />
+                <path
+                  class="tw-fill-illustration-outline"
+                  fill-rule="evenodd"
+                  d="M228.809.822a6 6 0 0 1 6 6v188a5.97 5.97 0 0 1-.643 2.699h12.893v16.5c0 6.627-5.373 12-12 12h-312.5c-6.628 0-12-5.373-12-12v-16.5h16.391a5.966 5.966 0 0 1-.634-2.391l-.007-.308v-188a6 6 0 0 1 6-6h296.5ZM-85.441 214.02a8 8 0 0 0 8 8h312.5a8 8 0 0 0 8-8v-12.5h-328.5v12.5Zm17.75-209.2a2 2 0 0 0-2 2v188.001l.01.204a2 2 0 0 0 1.99 1.796h296.5a2.001 2.001 0 0 0 2-2v-188a2 2 0 0 0-2-2h-296.5Z"
+                  clip-rule="evenodd"
+                />
+                <path
+                  class="tw-fill-illustration-bg-primary"
+                  d="M378.821 114.003a1.997 1.997 0 0 0-.675 1.497v8.396c0 .583.254 1.136.697 1.515l11.455 9.825a2 2 0 0 1 .543 2.286l-4.203 10.056a1.998 1.998 0 0 1-1.936 1.224l-15.288-.717a1.997 1.997 0 0 0-1.501.579l-6.014 5.979a1.995 1.995 0 0 0-.583 1.569l1.145 14.942a1.997 1.997 0 0 1-1.22 1.995l-9.958 4.169a1.997 1.997 0 0 1-2.252-.503l-10.221-11.309a1.998 1.998 0 0 0-1.482-.658h-8.474c-.579 0-1.129.252-1.508.689l-9.889 11.4a1.998 1.998 0 0 1-2.28.534l-9.969-4.174a1.998 1.998 0 0 1-1.224-1.937l.721-15.182a2 2 0 0 0-.587-1.51l-6.014-5.98a1.996 1.996 0 0 0-1.559-.575l-15.049 1.14a1.997 1.997 0 0 1-1.993-1.221l-4.198-10.045a1.997 1.997 0 0 1 .512-2.258l11.363-10.155c.424-.379.666-.92.666-1.489v-8.403c0-.583-.254-1.136-.696-1.516l-11.456-9.824a1.997 1.997 0 0 1-.542-2.286L279.354 92a1.998 1.998 0 0 1 1.936-1.224l15.288.717a1.998 1.998 0 0 0 1.502-.579l6.007-5.974c.418-.415.631-.995.582-1.582l-1.292-15.419a1.995 1.995 0 0 1 1.218-2.008l9.942-4.163a1.996 1.996 0 0 1 2.258.51l10.552 11.786c.379.423.92.665 1.488.665h8.469c.579 0 1.129-.25 1.508-.688l9.889-11.4a1.996 1.996 0 0 1 2.279-.534l9.97 4.174a1.999 1.999 0 0 1 1.224 1.937l-.721 15.181a2 2 0 0 0 .587 1.51l6.014 5.98c.411.41.98.62 1.558.576l15.049-1.14a1.996 1.996 0 0 1 1.993 1.22l4.195 10.036c.33.79.12 1.702-.521 2.268l-11.507 10.154Z"
+                />
+                <path
+                  class="tw-fill-illustration-outline"
+                  fill-rule="evenodd"
+                  d="M313.765 59.926a3.994 3.994 0 0 1 4.518 1.02l10.552 11.786h8.469l9.888-11.4a3.994 3.994 0 0 1 4.559-1.067l9.97 4.174a3.994 3.994 0 0 1 2.447 3.873l-.72 15.182 6.013 5.98 15.049-1.14a3.995 3.995 0 0 1 3.987 2.442l4.194 10.035a3.992 3.992 0 0 1-1.042 4.534L380.142 115.5v8.396l11.456 9.824a3.995 3.995 0 0 1 1.085 4.571l-4.203 10.056a3.993 3.993 0 0 1-3.872 2.449l-15.288-.717-6.013 5.98 1.145 14.943a3.994 3.994 0 0 1-2.44 3.988l-9.958 4.169a3.992 3.992 0 0 1-4.505-1.005l-10.221-11.309h-8.474l-9.889 11.4a3.993 3.993 0 0 1-4.559 1.067l-9.97-4.174a3.993 3.993 0 0 1-2.446-3.873l.72-15.181-6.014-5.98-15.049 1.14a3.993 3.993 0 0 1-3.986-2.442l-4.198-10.045a3.993 3.993 0 0 1 1.023-4.517l11.363-10.155v-8.403l-11.455-9.825a3.992 3.992 0 0 1-1.085-4.571l4.203-10.056a3.993 3.993 0 0 1 3.872-2.45l15.287.718 6.008-5.974-1.292-15.418a3.992 3.992 0 0 1 2.437-4.017l9.941-4.163Zm1.543 3.684-9.942 4.162 1.292 15.419a3.992 3.992 0 0 1-1.163 3.165l-6.008 5.974a3.994 3.994 0 0 1-3.003 1.157l-15.288-.717-4.202 10.056 11.455 9.824a3.993 3.993 0 0 1 1.394 3.032v8.403c0 1.137-.485 2.22-1.332 2.978l-11.364 10.154 4.198 10.045 15.049-1.14a3.994 3.994 0 0 1 3.118 1.15l6.014 5.98a3.996 3.996 0 0 1 1.173 3.021l-.72 15.181 9.969 4.175 9.889-11.401a3.994 3.994 0 0 1 3.017-1.377h8.474c1.129 0 2.206.478 2.963 1.316l10.221 11.309 9.958-4.169-1.145-14.943a3.996 3.996 0 0 1 1.166-3.137l6.013-5.979a3.997 3.997 0 0 1 3.003-1.158l15.288.717 4.203-10.056-11.456-9.824a3.995 3.995 0 0 1-1.393-3.031V115.5c0-1.146.492-2.236 1.351-2.994l11.506-10.155-4.194-10.035-15.049 1.14a3.991 3.991 0 0 1-3.117-1.15l-6.014-5.98a3.99 3.99 0 0 1-1.173-3.022l.72-15.181-9.97-4.174-9.889 11.4a3.992 3.992 0 0 1-3.016 1.377h-8.469a3.992 3.992 0 0 1-2.975-1.33L315.308 63.61Z"
+                  clip-rule="evenodd"
+                />
+                <path
+                  class="tw-fill-illustration-logo"
+                  d="M353.438 119.624c0 11.289-9.152 20.441-20.442 20.441-11.289 0-20.441-9.152-20.441-20.441 0-11.29 9.152-20.442 20.441-20.442 11.29 0 20.442 9.152 20.442 20.442Z"
+                />
+                <path
+                  class="tw-fill-illustration-outline"
+                  fill-rule="evenodd"
+                  d="M332.996 101.179c-10.186 0-18.444 8.258-18.444 18.444 0 10.187 8.258 18.445 18.444 18.445 10.187 0 18.445-8.258 18.445-18.445 0-10.186-8.258-18.444-18.445-18.444Zm-22.438 18.444c0-12.392 10.046-22.438 22.438-22.438 12.393 0 22.439 10.046 22.439 22.438 0 12.393-10.046 22.439-22.439 22.439-12.392 0-22.438-10.046-22.438-22.439Z"
+                  clip-rule="evenodd"
+                />
+                <path
+                  class="tw-fill-illustration-bg-tertiary"
+                  d="m497.152 164.106-7.588-7.587a3.004 3.004 0 0 0-4.245-.003l-4.055 4.047 11.83 11.83 4.055-4.047a2.996 2.996 0 0 0 .003-4.24Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-secondary"
+                  d="M500.922 194.274c0 22.644-18.356 41-41 41s-41-18.356-41-41 18.356-41 41-41 41 18.356 41 41Z"
+                />
+                <path
+                  class="tw-fill-illustration-outline"
+                  d="M459.03 177.416a2 2 0 1 1 4 0v18.469c0 .613-.282 1.192-.763 1.571l-12.032 9.48a2.001 2.001 0 0 1-2.809-.333 2.002 2.002 0 0 1 .334-2.809l11.27-8.881v-17.497Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-tertiary"
+                  d="M450.936 144.041a2 2 0 0 1 2-2h13.972a2 2 0 0 1 2 2v3.863a2 2 0 0 1-2 2h-13.972a2 2 0 0 1-2-2v-3.863Z"
+                />
+                <path
+                  class="tw-fill-illustration-outline"
+                  fill-rule="evenodd"
+                  d="M467.114 140.046a4 4 0 0 1 3.794 3.995v3.863a3.999 3.999 0 0 1-3.931 3.998v1.978a40.72 40.72 0 0 1 13.484 4.903l3.69-3.68a5.008 5.008 0 0 1 7.076.003l7.587 7.588.177.186a4.994 4.994 0 0 1-.181 6.881l-3.615 3.606a40.801 40.801 0 0 1 5.727 20.907c0 22.644-18.357 41-41 41-22.644 0-41-18.356-41-41 0-20.434 14.949-37.375 34.507-40.487v-1.883h-.493a4 4 0 0 1-4-4v-3.863a4 4 0 0 1 4-4h13.972l.206.005Zm-7.192 17.228c-20.435 0-37 16.566-37 37 0 20.435 16.565 37 37 37 20.434 0 37-16.565 37-37 0-20.434-16.566-37-37-37Zm28.473.658a1.002 1.002 0 0 0-1.416-.001l-2.638 2.633 9.001 9.002 2.639-2.633a1 1 0 0 0 .07-1.338l-.069-.075-7.587-7.588Zm-30.966-6.028v1.447a41.171 41.171 0 0 1 5.548.036v-1.483h-5.548Zm-4.493-4h13.972v-3.863h-13.972v3.863Z"
+                  clip-rule="evenodd"
+                />
+              </g>
+              <defs>
+                <clipPath id="left-a">
+                  <path class="tw-fill-illustration-bg-tertiary" d="M0 0h501v226H0z" />
+                </clipPath>
+              </defs>
+            </svg>
+            `;
+          </div>
+
+          <div
+            class="tw-hidden md:tw-block [&_svg]:tw-absolute tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-end-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
+          >
+            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 506 297">
+              <g clip-path="url(#right-a)">
+                <path
+                  class="tw-fill-illustration-bg-primary"
+                  d="M45.673 294.742v-29.124l22.323 16.198-15.395 15.75a4.04 4.04 0 0 1-6.928-2.824Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-tertiary"
+                  d="m4.978 240.865 95.568-44.738c3.52-1.648 7.492 1.175 7.093 5.041l-9.608 93.173c-.395 3.823-4.774 5.79-7.893 3.547l-43.43-31.233-41.47-16.621c-4.06-1.627-4.221-7.315-.26-9.169Z"
+                />
+                <path
+                  class="tw-fill-illustration-outline"
+                  d="M99.698 194.315c4.929-2.306 10.489 1.645 9.931 7.058l-9.608 93.174c-.552 5.351-6.683 8.105-11.05 4.965l-20.832-14.983-14.107 14.435a6.04 6.04 0 0 1-10.359-4.222v-27.151l-39.178-15.7c-5.684-2.278-5.91-10.242-.364-12.838l95.567-44.738Zm5.953 6.648c.239-2.32-2.144-4.013-4.256-3.025L5.827 242.676c-2.376 1.112-2.28 4.525.156 5.502l40.159 16.093 26.703-30.327a2.001 2.001 0 0 1 3.002 2.644l-26.178 29.731 41.637 29.945c1.872 1.346 4.5.165 4.736-2.128l9.609-93.173Zm-57.978 93.779a2.04 2.04 0 0 0 3.498 1.426l13.684-14.001-17.182-12.357v24.932Z"
+                />
+                <circle
+                  cx="86.719"
+                  cy="86.719"
+                  r="84.719"
+                  class="tw-fill-illustration-bg-tertiary"
+                  stroke="#020F66"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="4"
+                  transform="scale(-1 1) rotate(45.035 -184.565 -565.488)"
+                />
+                <circle
+                  cx="69.752"
+                  cy="69.752"
+                  r="69.752"
+                  class="tw-fill-illustration-bg-secondary"
+                  transform="scale(-1 1) rotate(45.035 -213.255 -553.709)"
+                />
+                <path
+                  class="tw-fill-illustration-outline"
+                  d="m445.838 353.214 2.95-180.467 12.372-.007 3.078 180.465a4.64 4.64 0 0 1-4.637 4.72l-9.12.005a4.64 4.64 0 0 1-4.643-4.716ZM453.82 52.947a2 2 0 0 1 1.998-2.001l35.638-.023a2 2 0 0 1 2.001 2.015l-.268 35.637a2 2 0 1 1-4-.03l.252-33.62-33.62.02a1.999 1.999 0 0 1-2.001-1.998ZM415.689 86.49a2 2 0 0 1 4.001.03l-.254 33.62 33.622-.021a2 2 0 0 1 .003 4l-35.637.022a2 2 0 0 1-2.001-2.015l.266-35.636Zm25.457-19.997a2 2 0 0 1 3.461-2.006l23.124 39.885a2 2 0 0 1-3.461 2.006l-23.124-39.885Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-primary"
+                  d="M259.264 277.271c21.107-4.293 34.791-24.62 30.565-45.402-4.227-20.782-24.764-34.15-45.871-29.857-21.107 4.293-34.791 24.62-30.565 45.402 4.227 20.783 24.764 34.15 45.871 29.857ZM299.993 173.472c7.793-1.585 12.826-9.188 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.187-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-secondary"
+                  d="M329.869 242.094c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.188-12.826-16.981-11.241-7.794 1.585-12.827 9.188-11.241 16.981 1.585 7.794 9.187 12.827 16.981 11.241Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-tertiary"
+                  d="M330.088 309.401c7.794-1.585 12.826-9.188 11.241-16.981-1.585-7.794-9.187-12.827-16.981-11.242-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.827 16.981 11.242Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-primary"
+                  d="M234.598 327.597c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.826 16.981 11.241Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-secondary"
+                  d="M176.919 248.71c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.794-9.188-12.827-16.982-11.242-7.793 1.586-12.826 9.188-11.241 16.982 1.585 7.793 9.188 12.826 16.981 11.241Z"
+                />
+                <path
+                  class="tw-fill-illustration-bg-tertiary"
+                  d="M206.836 185.071c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.793-9.188-12.826-16.982-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"
+                />
+                <path
+                  class="tw-fill-illustration-outline"
+                  fill-rule="evenodd"
+                  d="M200.699 154.89c8.875-1.805 17.533 3.927 19.339 12.803 1.165 5.732-.814 11.372-4.752 15.135.131.223.29.502.489.845l14.805 21.386a41.483 41.483 0 0 1 12.979-5.007c9.276-1.886 18.455-.523 26.321 3.303.038-.221.111-.441.227-.648l17.035-30.333a16.337 16.337 0 0 1-6.09-9.744c-1.805-8.876 3.928-17.535 12.803-19.34 8.876-1.805 17.534 3.928 19.339 12.803 1.805 8.876-3.926 17.534-12.802 19.339-3.427.697-6.822.27-9.803-1.028l-16.994 30.262a1.98 1.98 0 0 1-.397.497c8.774 5.316 15.487 13.883 18.16 24.43l19.238-1.61c-.007-7.642 5.356-14.488 13.135-16.07 8.875-1.805 17.534 3.927 19.339 12.803 1.805 8.875-3.927 17.533-12.802 19.339-8.639 1.757-17.072-3.627-19.18-12.099l-18.935 1.585c1.474 9.839-.81 19.465-5.834 27.387l29.108 22.962a16.324 16.324 0 0 1 8.523-4.671c8.876-1.804 17.534 3.928 19.339 12.803 1.805 8.876-3.927 17.534-12.802 19.339-8.875 1.805-17.534-3.926-19.34-12.802a16.338 16.338 0 0 1 1.872-11.474l-29.007-22.882c-5.828 7.464-14.29 12.983-24.349 15.028a41.442 41.442 0 0 1-14.045.441l-6.224 19.317a16.365 16.365 0 0 1 8.405 11.229c1.805 8.876-3.927 17.534-12.802 19.339-8.876 1.805-17.535-3.926-19.34-12.802-1.805-8.875 3.927-17.534 12.803-19.34 2.461-.5 4.906-.42 7.192.145l6.007-18.641c-14.851-3.594-27.011-15.301-30.225-31.105a40.043 40.043 0 0 1-.808-8.184l-20.473-1.442c-.032-.002-.064-.008-.096-.011-1.37 6.114-6.201 11.162-12.739 12.492-8.875 1.805-17.534-3.926-19.339-12.802-1.805-8.875 3.927-17.534 12.802-19.34 8.876-1.804 17.534 3.928 19.339 12.803.196.962.302 1.921.327 2.869l20.401 1.436c1.206-11.333 7.247-21.627 16.399-28.363l-14.76-21.321a20.41 20.41 0 0 0-.435-.719 16.428 16.428 0 0 1-4.816 1.8c-8.876 1.805-17.535-3.927-19.34-12.802-1.805-8.876 3.927-17.535 12.803-19.34Zm124.048 128.249c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.364-6.71-7.911-11.044-14.622-9.68Zm-95.49 18.196c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.621-1.365-6.711-7.911-11.045-14.622-9.681Zm15.1-97.363c-20.054 4.079-33.004 23.373-29.004 43.044 4.001 19.672 23.459 32.374 43.513 28.296 9.593-1.951 17.558-7.386 22.822-14.676a1.986 1.986 0 0 1 .612-.873c5.306-7.813 7.58-17.606 5.569-27.495-4.001-19.671-23.459-32.374-43.512-28.296Zm80.171 11.861c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.365-6.711-7.911-11.045-14.622-9.68Zm-152.949 6.614c-6.711 1.365-11.045 7.912-9.681 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.621-1.365-6.711-7.912-11.045-14.622-9.681Zm123.073-75.237c-6.71 1.365-11.044 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.622-1.365-6.71-7.912-11.045-14.623-9.68Zm-93.156 11.6c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.622 9.679 6.711-1.365 11.044-7.912 9.68-14.622-1.365-6.711-7.911-11.045-14.622-9.68Z"
+                  clip-rule="evenodd"
+                />
+                <path
+                  class="tw-fill-illustration-logo"
+                  d="M272.266 232.544a1.998 1.998 0 0 0-.353 1.589l.554 2.725a2.002 2.002 0 0 0 1.002 1.357l4.786 2.611a2 2 0 0 1 1.003 2.15l-.667 3.313a1.998 1.998 0 0 1-1.647 1.58l-5.641.896a1.998 1.998 0 0 0-1.352.867l-1.524 2.291a2 2 0 0 0-.252 1.678l1.555 5.227a2 2 0 0 1-.794 2.224l-2.799 1.902a2 2 0 0 1-2.309-.043l-4.524-3.327a2 2 0 0 0-1.583-.348l-2.754.56a1.997 1.997 0 0 0-1.352.994l-2.638 4.785a2 2 0 0 1-2.14.996l-3.339-.661a2 2 0 0 1-1.587-1.649l-.886-5.597a2.003 2.003 0 0 0-.875-1.358l-2.298-1.514a2 2 0 0 0-1.669-.247l-5.272 1.563a2 2 0 0 1-2.22-.788l-1.897-2.774a2.001 2.001 0 0 1 .045-2.321l3.339-4.498a2.004 2.004 0 0 0 .354-1.591l-.557-2.736a2.001 2.001 0 0 0-.983-1.347l-4.848-2.715a2 2 0 0 1-.983-2.14l.669-3.329a2.001 2.001 0 0 1 1.648-1.581l5.641-.895a1.999 1.999 0 0 0 1.352-.868l1.526-2.293c.327-.493.42-1.105.253-1.673l-1.608-5.457a2 2 0 0 1 .794-2.22l2.793-1.897a2 2 0 0 1 2.322.053l4.676 3.5a1.999 1.999 0 0 0 1.597.359l2.744-.558a2.002 2.002 0 0 0 1.353-.995l2.637-4.784a1.997 1.997 0 0 1 2.14-.996l3.339.661a2 2 0 0 1 1.587 1.649l.886 5.597c.088.555.406 1.048.875 1.357l2.298 1.514a2.002 2.002 0 0 0 1.669.248l5.272-1.564a2 2 0 0 1 2.22.789l1.898 2.775a2 2 0 0 1-.044 2.319l-3.432 4.635Zm-24.977-.064c-4.049 2.702-5.078 8.076-2.395 11.991 2.705 4.028 8.1 5.044 12.035 2.365 3.936-2.678 5.078-8.076 2.395-11.991-2.592-4.051-7.986-5.067-12.035-2.365Z"
+                />
+                <path
+                  class="tw-fill-illustration-outline"
+                  d="m270.507 237.256-.554-2.724a4.004 4.004 0 0 1 .705-3.178l3.433-4.636-1.897-2.775-5.273 1.564a4 4 0 0 1-3.337-.494l-2.298-1.515a4 4 0 0 1-1.751-2.714l-.886-5.597-3.339-.661-2.637 4.784a4.001 4.001 0 0 1-2.706 1.989l-2.744.558a4 4 0 0 1-3.194-.718l-4.676-3.5-2.792 1.898 1.608 5.457a3.998 3.998 0 0 1-.507 3.345l-1.525 2.294c-.62.931-1.6 1.56-2.704 1.736l-5.642.895-.669 3.329 4.848 2.715a4 4 0 0 1 1.965 2.693l.557 2.737a3.999 3.999 0 0 1-.708 3.18l-3.338 4.499 1.897 2.774 5.272-1.563a3.998 3.998 0 0 1 3.338.494l2.298 1.514a4.001 4.001 0 0 1 1.75 2.715l.886 5.597 3.339.661 2.638-4.785a4 4 0 0 1 2.706-1.988l2.753-.56a4 4 0 0 1 3.166.697l4.524 3.327 2.8-1.902-1.555-5.227a4.002 4.002 0 0 1 .504-3.355l1.524-2.291a3.998 3.998 0 0 1 2.703-1.736l5.642-.895.667-3.313-4.787-2.611a4.004 4.004 0 0 1-2.004-2.714Zm-24.328-6.439c4.915-3.28 11.556-2.099 14.795 2.898h.001v.001l.034.051h-.001c3.294 4.868 1.835 11.464-2.953 14.723-4.855 3.304-11.499 2.043-14.821-2.903l.001-.001c-3.308-4.845-2.013-11.461 2.944-14.769Zm11.461 5.106c-1.959-3.06-6.075-3.891-9.24-1.779-3.036 2.026-3.85 5.957-2.039 8.913l.183.284.01.015c2.089 3.109 6.234 3.879 9.25 1.827 3.066-2.087 3.897-6.25 1.871-9.207a.97.97 0 0 1-.035-.053Zm16.787.536 4.787 2.611a4 4 0 0 1 2.005 4.3l-.666 3.313a4.001 4.001 0 0 1-3.295 3.161l-5.641.896-1.525 2.291 1.555 5.227a4.002 4.002 0 0 1-1.586 4.449l-2.8 1.901a4 4 0 0 1-4.618-.086l-4.523-3.326-2.753.56-2.638 4.784a4 4 0 0 1-4.279 1.993l-3.34-.661a4.002 4.002 0 0 1-3.174-3.298l-.886-5.598-2.298-1.514-5.273 1.564a3.999 3.999 0 0 1-4.438-1.577l-1.897-2.774a3.998 3.998 0 0 1 .09-4.641l3.338-4.499-.557-2.737-4.848-2.715a3.998 3.998 0 0 1-1.966-4.279l.669-3.329a4.002 4.002 0 0 1 3.294-3.162l5.642-.895 1.526-2.294-1.609-5.457a4.001 4.001 0 0 1 1.59-4.439l2.792-1.897a4 4 0 0 1 4.645.106l4.676 3.5 2.744-.558 2.636-4.785a4 4 0 0 1 4.281-1.992l3.339.661a4 4 0 0 1 3.174 3.298l.886 5.597 2.298 1.514 5.272-1.563a4 4 0 0 1 4.439 1.576l1.898 2.775a4.001 4.001 0 0 1-.087 4.639l-3.433 4.636.554 2.724Z"
+                />
+              </g>
+              <defs>
+                <clipPath id="right-a">
+                  <path class="tw-fill-illustration-bg-tertiary" d="M0 0h506v297H0z" />
+                </clipPath>
+              </defs>
+            </svg>
+          </div>
+        </div>
       </div>
     </app-root>
   </body>
diff --git a/libs/components/src/anon-layout/anon-layout.component.html b/libs/components/src/anon-layout/anon-layout.component.html
index e56c14165e4..4be11b607c6 100644
--- a/libs/components/src/anon-layout/anon-layout.component.html
+++ b/libs/components/src/anon-layout/anon-layout.component.html
@@ -1,5 +1,5 @@
 <main
-  class="tw-flex tw-w-full tw-mx-auto tw-flex-col tw-bg-background-alt tw-px-6 tw-py-4 tw-text-main"
+  class="tw-relative tw-flex tw-w-full tw-mx-auto tw-flex-col tw-bg-background-alt tw-p-5 tw-text-main"
   [ngClass]="{
     'tw-min-h-screen': clientType === 'web',
     'tw-min-h-full': clientType === 'browser' || clientType === 'desktop',
@@ -8,7 +8,7 @@
   <a
     *ngIf="!hideLogo()"
     [routerLink]="['/']"
-    class="tw-w-[128px] tw-block tw-mb-12 [&>*]:tw-align-top"
+    class="tw-w-[200px] tw-block tw-mb-12 [&>*]:tw-align-top"
   >
     <bit-icon [icon]="logo" [ariaLabel]="'appLogoLabel' | i18n"></bit-icon>
   </a>
@@ -20,11 +20,11 @@
 
     <ng-container *ngIf="title()">
       <!-- Small screens -->
-      <h1 bitTypography="h3" class="tw-mt-2 sm:tw-hidden">
+      <h1 bitTypography="h2" class="tw-mt-2 sm:tw-hidden">
         {{ title() }}
       </h1>
       <!-- Medium to Larger screens -->
-      <h1 bitTypography="h2" class="tw-mt-2 tw-hidden sm:tw-block">
+      <h1 bitTypography="h1" class="tw-mt-2 tw-hidden sm:tw-block">
         {{ title() }}
       </h1>
     </ng-container>
@@ -33,7 +33,7 @@
   </div>
 
   <div
-    class="tw-grow tw-w-full tw-mx-auto tw-flex tw-flex-col tw-items-center sm:tw-min-w-[28rem]"
+    class="tw-z-10 tw-grow tw-w-full tw-mx-auto tw-flex tw-flex-col tw-items-center sm:tw-min-w-[28rem]"
     [ngClass]="maxWidthClass"
   >
     @if (hideCardWrapper()) {
@@ -62,6 +62,17 @@
       <div bitTypography="body2">{{ version }}</div>
     </ng-container>
   </footer>
+
+  <div
+    class="tw-hidden md:tw-block [&_svg]:tw-absolute tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-start-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
+  >
+    <bit-icon [icon]="leftIllustration"></bit-icon>
+  </div>
+  <div
+    class="tw-hidden md:tw-block [&_svg]:tw-absolute tw-z-[1] tw-opacity-[.11] [&_svg]:tw-bottom-0 [&_svg]:tw-end-0 [&_svg]:tw-w-[35%] [&_svg]:tw-max-w-[450px]"
+  >
+    <bit-icon [icon]="rightIllustration"></bit-icon>
+  </div>
 </main>
 
 <ng-template #defaultContent>
diff --git a/libs/components/src/anon-layout/anon-layout.component.ts b/libs/components/src/anon-layout/anon-layout.component.ts
index 8b002cae7f0..c70ae1a8c90 100644
--- a/libs/components/src/anon-layout/anon-layout.component.ts
+++ b/libs/components/src/anon-layout/anon-layout.component.ts
@@ -21,6 +21,8 @@ import { AnonLayoutBitwardenShield } from "../icon/logos";
 import { SharedModule } from "../shared";
 import { TypographyModule } from "../typography";
 
+import { LeftIllustration, RightIllustration } from "./illustrations";
+
 export type AnonLayoutMaxWidth = "md" | "lg" | "xl" | "2xl" | "3xl" | "4xl";
 
 @Component({
@@ -35,6 +37,9 @@ export class AnonLayoutComponent implements OnInit, OnChanges {
     return ["tw-h-full"];
   }
 
+  readonly leftIllustration = LeftIllustration;
+  readonly rightIllustration = RightIllustration;
+
   readonly title = input<string>();
   readonly subtitle = input<string>();
   readonly icon = model<Icon>();
diff --git a/libs/components/src/anon-layout/illustrations/index.ts b/libs/components/src/anon-layout/illustrations/index.ts
new file mode 100644
index 00000000000..a107eb7cd15
--- /dev/null
+++ b/libs/components/src/anon-layout/illustrations/index.ts
@@ -0,0 +1,2 @@
+export * from "./left-illustration";
+export * from "./right-illustration";
diff --git a/libs/components/src/anon-layout/illustrations/left-illustration.ts b/libs/components/src/anon-layout/illustrations/left-illustration.ts
new file mode 100644
index 00000000000..26fe9f6076b
--- /dev/null
+++ b/libs/components/src/anon-layout/illustrations/left-illustration.ts
@@ -0,0 +1,5 @@
+import { svgIcon } from "../../icon";
+
+export const LeftIllustration = svgIcon`
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 501 226"><g clip-path="url(#left-a)"><path class="tw-fill-illustration-bg-primary" d="M-71.691 6.821a4 4 0 0 1 4-4h296.5a4 4 0 0 1 4 4v188a4 4 0 0 1-4 4h-296.5a4 4 0 0 1-4-4v-188Z"/><path class="tw-fill-illustration-bg-primary" d="M-48.941 25.821a2 2 0 0 1 2-2h127.5v154h-127.5a2 2 0 0 1-2-2v-150Z"/><path class="tw-fill-illustration-bg-tertiary" d="M80.559 25.82a2 2 0 0 1 2-2h125.5a2 2 0 0 1 2 2v150.001a2 2 0 0 1-2 2h-125.5a2 2 0 0 1-2-2v-150ZM45.871 89.854c0 17.155-13.96 31.062-31.182 31.062-17.221 0-31.182-13.907-31.182-31.062s13.96-31.062 31.182-31.062c17.221 0 31.182 13.907 31.182 31.062Z"/><path class="tw-fill-illustration-bg-tertiary" d="M72.396 153.443a57.243 57.243 0 0 1 4.663 22.604v1.222a2 2 0 0 1-2 2h-118.5a2 2 0 0 1-2-2v-1.222a57.243 57.243 0 0 1 4.662-22.604c3.078-7.167 7.59-13.678 13.277-19.163 5.688-5.485 12.44-9.836 19.871-12.805a63.228 63.228 0 0 1 23.44-4.496 63.227 63.227 0 0 1 23.439 4.496c7.431 2.969 14.183 7.32 19.87 12.805 5.688 5.485 10.2 11.996 13.278 19.163Z"/><path class="tw-fill-illustration-bg-secondary" d="M161.629 57.193c0 9.182-7.579 16.625-16.927 16.625-9.349 0-16.928-7.443-16.928-16.625 0-9.181 7.579-16.625 16.928-16.625 9.348 0 16.927 7.444 16.927 16.625Z"/><path class="tw-fill-illustration-bg-secondary" d="M176.028 89.071a29.33 29.33 0 0 1 2.531 11.894c0 .937-.759 1.696-1.696 1.696h-63.109a1.695 1.695 0 0 1-1.695-1.696c0-4.081.86-8.123 2.531-11.894 1.671-3.77 4.12-7.197 7.207-10.083 3.088-2.886 6.753-5.176 10.787-6.738a35.275 35.275 0 0 1 12.725-2.366c4.366 0 8.69.804 12.724 2.366 4.034 1.562 7.699 3.852 10.787 6.738 3.087 2.886 5.537 6.312 7.208 10.083ZM161.629 134.193c0 9.182-7.579 16.625-16.927 16.625-9.349 0-16.928-7.443-16.928-16.625s7.579-16.625 16.928-16.625c9.348 0 16.927 7.443 16.927 16.625Z"/><path class="tw-fill-illustration-bg-secondary" d="M176.028 165.953a28.993 28.993 0 0 1 2.531 11.821c0 .93-.755 1.684-1.685 1.684h-63.131c-.93 0-1.684-.754-1.684-1.684 0-4.057.86-8.074 2.531-11.821 1.671-3.748 4.12-7.153 7.207-10.021 3.088-2.869 6.753-5.144 10.787-6.696a35.456 35.456 0 0 1 12.725-2.352c4.366 0 8.69.799 12.724 2.352 4.034 1.552 7.699 3.827 10.787 6.696 3.087 2.868 5.537 6.273 7.208 10.021ZM-87.441 199.521h332.5v14.5c0 5.523-4.478 10-10 10h-312.5c-5.523 0-10-4.477-10-10v-14.5Z"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M208.059 21.82a4 4 0 0 1 4 4v150.001a4 4 0 0 1-4 4l-255 .001a4 4 0 0 1-4-4v-150a4 4 0 0 1 4-4l255-.001Zm-255 154.002h1.5a57.23 57.23 0 0 1 4.378-21.706l.284-.673c2.982-6.943 7.31-13.27 12.748-18.646l.529-.517c5.688-5.485 12.44-9.836 19.871-12.805a62.937 62.937 0 0 1 10.036-3.065c-11.113-4.751-18.897-15.747-18.897-28.556 0-17.155 13.96-31.061 31.182-31.062 17.22 0 31.18 13.907 31.181 31.062 0 12.537-7.457 23.338-18.192 28.245a62.952 62.952 0 0 1 11.569 3.376c7.431 2.969 14.184 7.32 19.871 12.805 5.688 5.485 10.2 11.996 13.278 19.163a57.251 57.251 0 0 1 4.66 22.379h1.502v-150h-125.5v150Zm129.5-.001h29.568a29.02 29.02 0 0 1 2.159-9.161l.304-.706c1.671-3.748 4.12-7.154 7.207-10.022 2.894-2.689 6.297-4.857 10.035-6.396l.752-.299c.996-.383 2.01-.721 3.037-1.012-4.602-2.879-7.693-7.881-7.841-13.602l-.006-.429c0-9.182 7.579-16.625 16.928-16.625l.437.006c9.146.227 16.49 7.581 16.49 16.619l-.006.429c-.144 5.571-3.08 10.461-7.484 13.372 1.321.338 2.622.752 3.894 1.242 4.034 1.552 7.7 3.827 10.787 6.695 3.088 2.868 5.536 6.274 7.207 10.022a29.066 29.066 0 0 1 2.462 9.867h29.57v-73h-125.5v73Zm62.75-24.936c-3.881 0-7.718.71-11.288 2.084-3.571 1.374-6.797 3.382-9.501 5.894-2.704 2.511-4.831 5.478-6.277 8.72a25.125 25.125 0 0 0-2.074 7.876h58.279a25.125 25.125 0 0 0-2.074-7.876c-1.445-3.242-3.573-6.209-6.276-8.72-2.705-2.512-5.931-4.52-9.501-5.894a31.473 31.473 0 0 0-11.288-2.084Zm-129.5-29.906a59.215 59.215 0 0 0-21.955 4.211c-6.957 2.779-13.269 6.848-18.579 11.969-5.31 5.12-9.513 11.191-12.378 17.862a53.266 53.266 0 0 0-4.332 20.248H73.053a53.266 53.266 0 0 0-4.332-20.248c-2.866-6.671-7.07-12.742-12.38-17.862-5.31-5.121-11.621-9.19-18.577-11.969a59.215 59.215 0 0 0-21.955-4.211Zm128.893.59c-7.208 0-12.928 5.72-12.928 12.625.001 6.904 5.721 12.624 12.928 12.624 7.208 0 12.926-5.72 12.927-12.624 0-6.905-5.719-12.625-12.927-12.625ZM14.69 62.792c-15.027 0-27.182 12.13-27.182 27.062 0 14.931 12.155 27.062 27.181 27.063 15.027-.001 27.182-12.132 27.182-27.063S29.716 62.793 14.69 62.792Zm67.869 36.029h29.579c.229-3.094.952-6.141 2.148-9.04l.304-.71a30.936 30.936 0 0 1 6.636-9.536l.571-.547a33.416 33.416 0 0 1 10.035-6.437l.752-.3a34.78 34.78 0 0 1 3.047-1.021c-4.607-2.878-7.703-7.883-7.851-13.607l-.006-.43c0-9.18 7.579-16.624 16.928-16.624l.437.006c9.146.227 16.49 7.58 16.49 16.619l-.006.429c-.144 5.574-3.082 10.465-7.49 13.376 1.324.34 2.626.758 3.9 1.252 4.034 1.561 7.7 3.85 10.787 6.737 3.088 2.886 5.536 6.312 7.207 10.083a29.407 29.407 0 0 1 2.451 9.75h29.581v-73h-125.5v73Zm62.75-24.937c-3.878 0-7.712.714-11.281 2.096-3.568 1.382-6.795 3.401-9.5 5.93-2.704 2.528-4.833 5.515-6.281 8.782a25.432 25.432 0 0 0-2.08 7.969h58.283a25.432 25.432 0 0 0-2.08-7.97c-1.447-3.266-3.577-6.253-6.281-8.781-2.705-2.529-5.931-4.548-9.5-5.93a31.275 31.275 0 0 0-11.28-2.096Zm-.607-29.315c-7.208 0-12.928 5.72-12.928 12.625.001 6.904 5.721 12.624 12.928 12.624 7.208 0 12.926-5.72 12.927-12.624 0-6.905-5.719-12.625-12.927-12.625Z" clip-rule="evenodd"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M228.809.822a6 6 0 0 1 6 6v188a5.97 5.97 0 0 1-.643 2.699h12.893v16.5c0 6.627-5.373 12-12 12h-312.5c-6.628 0-12-5.373-12-12v-16.5h16.391a5.966 5.966 0 0 1-.634-2.391l-.007-.308v-188a6 6 0 0 1 6-6h296.5ZM-85.441 214.02a8 8 0 0 0 8 8h312.5a8 8 0 0 0 8-8v-12.5h-328.5v12.5Zm17.75-209.2a2 2 0 0 0-2 2v188.001l.01.204a2 2 0 0 0 1.99 1.796h296.5a2.001 2.001 0 0 0 2-2v-188a2 2 0 0 0-2-2h-296.5Z" clip-rule="evenodd"/><path class="tw-fill-illustration-bg-primary" d="M378.821 114.003a1.997 1.997 0 0 0-.675 1.497v8.396c0 .583.254 1.136.697 1.515l11.455 9.825a2 2 0 0 1 .543 2.286l-4.203 10.056a1.998 1.998 0 0 1-1.936 1.224l-15.288-.717a1.997 1.997 0 0 0-1.501.579l-6.014 5.979a1.995 1.995 0 0 0-.583 1.569l1.145 14.942a1.997 1.997 0 0 1-1.22 1.995l-9.958 4.169a1.997 1.997 0 0 1-2.252-.503l-10.221-11.309a1.998 1.998 0 0 0-1.482-.658h-8.474c-.579 0-1.129.252-1.508.689l-9.889 11.4a1.998 1.998 0 0 1-2.28.534l-9.969-4.174a1.998 1.998 0 0 1-1.224-1.937l.721-15.182a2 2 0 0 0-.587-1.51l-6.014-5.98a1.996 1.996 0 0 0-1.559-.575l-15.049 1.14a1.997 1.997 0 0 1-1.993-1.221l-4.198-10.045a1.997 1.997 0 0 1 .512-2.258l11.363-10.155c.424-.379.666-.92.666-1.489v-8.403c0-.583-.254-1.136-.696-1.516l-11.456-9.824a1.997 1.997 0 0 1-.542-2.286L279.354 92a1.998 1.998 0 0 1 1.936-1.224l15.288.717a1.998 1.998 0 0 0 1.502-.579l6.007-5.974c.418-.415.631-.995.582-1.582l-1.292-15.419a1.995 1.995 0 0 1 1.218-2.008l9.942-4.163a1.996 1.996 0 0 1 2.258.51l10.552 11.786c.379.423.92.665 1.488.665h8.469c.579 0 1.129-.25 1.508-.688l9.889-11.4a1.996 1.996 0 0 1 2.279-.534l9.97 4.174a1.999 1.999 0 0 1 1.224 1.937l-.721 15.181a2 2 0 0 0 .587 1.51l6.014 5.98c.411.41.98.62 1.558.576l15.049-1.14a1.996 1.996 0 0 1 1.993 1.22l4.195 10.036c.33.79.12 1.702-.521 2.268l-11.507 10.154Z"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M313.765 59.926a3.994 3.994 0 0 1 4.518 1.02l10.552 11.786h8.469l9.888-11.4a3.994 3.994 0 0 1 4.559-1.067l9.97 4.174a3.994 3.994 0 0 1 2.447 3.873l-.72 15.182 6.013 5.98 15.049-1.14a3.995 3.995 0 0 1 3.987 2.442l4.194 10.035a3.992 3.992 0 0 1-1.042 4.534L380.142 115.5v8.396l11.456 9.824a3.995 3.995 0 0 1 1.085 4.571l-4.203 10.056a3.993 3.993 0 0 1-3.872 2.449l-15.288-.717-6.013 5.98 1.145 14.943a3.994 3.994 0 0 1-2.44 3.988l-9.958 4.169a3.992 3.992 0 0 1-4.505-1.005l-10.221-11.309h-8.474l-9.889 11.4a3.993 3.993 0 0 1-4.559 1.067l-9.97-4.174a3.993 3.993 0 0 1-2.446-3.873l.72-15.181-6.014-5.98-15.049 1.14a3.993 3.993 0 0 1-3.986-2.442l-4.198-10.045a3.993 3.993 0 0 1 1.023-4.517l11.363-10.155v-8.403l-11.455-9.825a3.992 3.992 0 0 1-1.085-4.571l4.203-10.056a3.993 3.993 0 0 1 3.872-2.45l15.287.718 6.008-5.974-1.292-15.418a3.992 3.992 0 0 1 2.437-4.017l9.941-4.163Zm1.543 3.684-9.942 4.162 1.292 15.419a3.992 3.992 0 0 1-1.163 3.165l-6.008 5.974a3.994 3.994 0 0 1-3.003 1.157l-15.288-.717-4.202 10.056 11.455 9.824a3.993 3.993 0 0 1 1.394 3.032v8.403c0 1.137-.485 2.22-1.332 2.978l-11.364 10.154 4.198 10.045 15.049-1.14a3.994 3.994 0 0 1 3.118 1.15l6.014 5.98a3.996 3.996 0 0 1 1.173 3.021l-.72 15.181 9.969 4.175 9.889-11.401a3.994 3.994 0 0 1 3.017-1.377h8.474c1.129 0 2.206.478 2.963 1.316l10.221 11.309 9.958-4.169-1.145-14.943a3.996 3.996 0 0 1 1.166-3.137l6.013-5.979a3.997 3.997 0 0 1 3.003-1.158l15.288.717 4.203-10.056-11.456-9.824a3.995 3.995 0 0 1-1.393-3.031V115.5c0-1.146.492-2.236 1.351-2.994l11.506-10.155-4.194-10.035-15.049 1.14a3.991 3.991 0 0 1-3.117-1.15l-6.014-5.98a3.99 3.99 0 0 1-1.173-3.022l.72-15.181-9.97-4.174-9.889 11.4a3.992 3.992 0 0 1-3.016 1.377h-8.469a3.992 3.992 0 0 1-2.975-1.33L315.308 63.61Z" clip-rule="evenodd"/><path class="tw-fill-illustration-logo" d="M353.438 119.624c0 11.289-9.152 20.441-20.442 20.441-11.289 0-20.441-9.152-20.441-20.441 0-11.29 9.152-20.442 20.441-20.442 11.29 0 20.442 9.152 20.442 20.442Z"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M332.996 101.179c-10.186 0-18.444 8.258-18.444 18.444 0 10.187 8.258 18.445 18.444 18.445 10.187 0 18.445-8.258 18.445-18.445 0-10.186-8.258-18.444-18.445-18.444Zm-22.438 18.444c0-12.392 10.046-22.438 22.438-22.438 12.393 0 22.439 10.046 22.439 22.438 0 12.393-10.046 22.439-22.439 22.439-12.392 0-22.438-10.046-22.438-22.439Z" clip-rule="evenodd"/><path class="tw-fill-illustration-bg-tertiary" d="m497.152 164.106-7.588-7.587a3.004 3.004 0 0 0-4.245-.003l-4.055 4.047 11.83 11.83 4.055-4.047a2.996 2.996 0 0 0 .003-4.24Z"/><path class="tw-fill-illustration-bg-secondary" d="M500.922 194.274c0 22.644-18.356 41-41 41s-41-18.356-41-41 18.356-41 41-41 41 18.356 41 41Z"/><path class="tw-fill-illustration-outline" d="M459.03 177.416a2 2 0 1 1 4 0v18.469c0 .613-.282 1.192-.763 1.571l-12.032 9.48a2.001 2.001 0 0 1-2.809-.333 2.002 2.002 0 0 1 .334-2.809l11.27-8.881v-17.497Z"/><path class="tw-fill-illustration-bg-tertiary" d="M450.936 144.041a2 2 0 0 1 2-2h13.972a2 2 0 0 1 2 2v3.863a2 2 0 0 1-2 2h-13.972a2 2 0 0 1-2-2v-3.863Z"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M467.114 140.046a4 4 0 0 1 3.794 3.995v3.863a3.999 3.999 0 0 1-3.931 3.998v1.978a40.72 40.72 0 0 1 13.484 4.903l3.69-3.68a5.008 5.008 0 0 1 7.076.003l7.587 7.588.177.186a4.994 4.994 0 0 1-.181 6.881l-3.615 3.606a40.801 40.801 0 0 1 5.727 20.907c0 22.644-18.357 41-41 41-22.644 0-41-18.356-41-41 0-20.434 14.949-37.375 34.507-40.487v-1.883h-.493a4 4 0 0 1-4-4v-3.863a4 4 0 0 1 4-4h13.972l.206.005Zm-7.192 17.228c-20.435 0-37 16.566-37 37 0 20.435 16.565 37 37 37 20.434 0 37-16.565 37-37 0-20.434-16.566-37-37-37Zm28.473.658a1.002 1.002 0 0 0-1.416-.001l-2.638 2.633 9.001 9.002 2.639-2.633a1 1 0 0 0 .07-1.338l-.069-.075-7.587-7.588Zm-30.966-6.028v1.447a41.171 41.171 0 0 1 5.548.036v-1.483h-5.548Zm-4.493-4h13.972v-3.863h-13.972v3.863Z" clip-rule="evenodd"/></g><defs><clipPath id="left-a"><path class="tw-fill-illustration-bg-tertiary" d="M0 0h501v226H0z"/></clipPath></defs></svg>
+`;
diff --git a/libs/components/src/anon-layout/illustrations/right-illustration.ts b/libs/components/src/anon-layout/illustrations/right-illustration.ts
new file mode 100644
index 00000000000..ba3003ee01f
--- /dev/null
+++ b/libs/components/src/anon-layout/illustrations/right-illustration.ts
@@ -0,0 +1,5 @@
+import { svgIcon } from "../../icon";
+
+export const RightIllustration = svgIcon`
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 506 297"><g clip-path="url(#right-a)"><path class="tw-fill-illustration-bg-primary" d="M45.673 294.742v-29.124l22.323 16.198-15.395 15.75a4.04 4.04 0 0 1-6.928-2.824Z"/><path class="tw-fill-illustration-bg-tertiary" d="m4.978 240.865 95.568-44.738c3.52-1.648 7.492 1.175 7.093 5.041l-9.608 93.173c-.395 3.823-4.774 5.79-7.893 3.547l-43.43-31.233-41.47-16.621c-4.06-1.627-4.221-7.315-.26-9.169Z"/><path class="tw-fill-illustration-outline" d="M99.698 194.315c4.929-2.306 10.489 1.645 9.931 7.058l-9.608 93.174c-.552 5.351-6.683 8.105-11.05 4.965l-20.832-14.983-14.107 14.435a6.04 6.04 0 0 1-10.359-4.222v-27.151l-39.178-15.7c-5.684-2.278-5.91-10.242-.364-12.838l95.567-44.738Zm5.953 6.648c.239-2.32-2.144-4.013-4.256-3.025L5.827 242.676c-2.376 1.112-2.28 4.525.156 5.502l40.159 16.093 26.703-30.327a2.001 2.001 0 0 1 3.002 2.644l-26.178 29.731 41.637 29.945c1.872 1.346 4.5.165 4.736-2.128l9.609-93.173Zm-57.978 93.779a2.04 2.04 0 0 0 3.498 1.426l13.684-14.001-17.182-12.357v24.932Z"/><circle cx="86.719" cy="86.719" r="84.719" class="tw-fill-illustration-bg-tertiary" stroke="#020F66" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" transform="scale(-1 1) rotate(45.035 -184.565 -565.488)"/><circle cx="69.752" cy="69.752" r="69.752" class="tw-fill-illustration-bg-secondary" transform="scale(-1 1) rotate(45.035 -213.255 -553.709)"/><path class="tw-fill-illustration-outline" d="m445.838 353.214 2.95-180.467 12.372-.007 3.078 180.465a4.64 4.64 0 0 1-4.637 4.72l-9.12.005a4.64 4.64 0 0 1-4.643-4.716ZM453.82 52.947a2 2 0 0 1 1.998-2.001l35.638-.023a2 2 0 0 1 2.001 2.015l-.268 35.637a2 2 0 1 1-4-.03l.252-33.62-33.62.02a1.999 1.999 0 0 1-2.001-1.998ZM415.689 86.49a2 2 0 0 1 4.001.03l-.254 33.62 33.622-.021a2 2 0 0 1 .003 4l-35.637.022a2 2 0 0 1-2.001-2.015l.266-35.636Zm25.457-19.997a2 2 0 0 1 3.461-2.006l23.124 39.885a2 2 0 0 1-3.461 2.006l-23.124-39.885Z"/><path class="tw-fill-illustration-bg-primary" d="M259.264 277.271c21.107-4.293 34.791-24.62 30.565-45.402-4.227-20.782-24.764-34.15-45.871-29.857-21.107 4.293-34.791 24.62-30.565 45.402 4.227 20.783 24.764 34.15 45.871 29.857ZM299.993 173.472c7.793-1.585 12.826-9.188 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.187-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-bg-secondary" d="M329.869 242.094c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.188-12.826-16.981-11.241-7.794 1.585-12.827 9.188-11.241 16.981 1.585 7.794 9.187 12.827 16.981 11.241Z"/><path class="tw-fill-illustration-bg-tertiary" d="M330.088 309.401c7.794-1.585 12.826-9.188 11.241-16.981-1.585-7.794-9.187-12.827-16.981-11.242-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.827 16.981 11.242Z"/><path class="tw-fill-illustration-bg-primary" d="M234.598 327.597c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-bg-secondary" d="M176.919 248.71c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.794-9.188-12.827-16.982-11.242-7.793 1.586-12.826 9.188-11.241 16.982 1.585 7.793 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-bg-tertiary" d="M206.836 185.071c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.793-9.188-12.826-16.982-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M200.699 154.89c8.875-1.805 17.533 3.927 19.339 12.803 1.165 5.732-.814 11.372-4.752 15.135.131.223.29.502.489.845l14.805 21.386a41.483 41.483 0 0 1 12.979-5.007c9.276-1.886 18.455-.523 26.321 3.303.038-.221.111-.441.227-.648l17.035-30.333a16.337 16.337 0 0 1-6.09-9.744c-1.805-8.876 3.928-17.535 12.803-19.34 8.876-1.805 17.534 3.928 19.339 12.803 1.805 8.876-3.926 17.534-12.802 19.339-3.427.697-6.822.27-9.803-1.028l-16.994 30.262a1.98 1.98 0 0 1-.397.497c8.774 5.316 15.487 13.883 18.16 24.43l19.238-1.61c-.007-7.642 5.356-14.488 13.135-16.07 8.875-1.805 17.534 3.927 19.339 12.803 1.805 8.875-3.927 17.533-12.802 19.339-8.639 1.757-17.072-3.627-19.18-12.099l-18.935 1.585c1.474 9.839-.81 19.465-5.834 27.387l29.108 22.962a16.324 16.324 0 0 1 8.523-4.671c8.876-1.804 17.534 3.928 19.339 12.803 1.805 8.876-3.927 17.534-12.802 19.339-8.875 1.805-17.534-3.926-19.34-12.802a16.338 16.338 0 0 1 1.872-11.474l-29.007-22.882c-5.828 7.464-14.29 12.983-24.349 15.028a41.442 41.442 0 0 1-14.045.441l-6.224 19.317a16.365 16.365 0 0 1 8.405 11.229c1.805 8.876-3.927 17.534-12.802 19.339-8.876 1.805-17.535-3.926-19.34-12.802-1.805-8.875 3.927-17.534 12.803-19.34 2.461-.5 4.906-.42 7.192.145l6.007-18.641c-14.851-3.594-27.011-15.301-30.225-31.105a40.043 40.043 0 0 1-.808-8.184l-20.473-1.442c-.032-.002-.064-.008-.096-.011-1.37 6.114-6.201 11.162-12.739 12.492-8.875 1.805-17.534-3.926-19.339-12.802-1.805-8.875 3.927-17.534 12.802-19.34 8.876-1.804 17.534 3.928 19.339 12.803.196.962.302 1.921.327 2.869l20.401 1.436c1.206-11.333 7.247-21.627 16.399-28.363l-14.76-21.321a20.41 20.41 0 0 0-.435-.719 16.428 16.428 0 0 1-4.816 1.8c-8.876 1.805-17.535-3.927-19.34-12.802-1.805-8.876 3.927-17.535 12.803-19.34Zm124.048 128.249c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.364-6.71-7.911-11.044-14.622-9.68Zm-95.49 18.196c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.621-1.365-6.711-7.911-11.045-14.622-9.681Zm15.1-97.363c-20.054 4.079-33.004 23.373-29.004 43.044 4.001 19.672 23.459 32.374 43.513 28.296 9.593-1.951 17.558-7.386 22.822-14.676a1.986 1.986 0 0 1 .612-.873c5.306-7.813 7.58-17.606 5.569-27.495-4.001-19.671-23.459-32.374-43.512-28.296Zm80.171 11.861c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.365-6.711-7.911-11.045-14.622-9.68Zm-152.949 6.614c-6.711 1.365-11.045 7.912-9.681 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.621-1.365-6.711-7.912-11.045-14.622-9.681Zm123.073-75.237c-6.71 1.365-11.044 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.622-1.365-6.71-7.912-11.045-14.623-9.68Zm-93.156 11.6c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.622 9.679 6.711-1.365 11.044-7.912 9.68-14.622-1.365-6.711-7.911-11.045-14.622-9.68Z" clip-rule="evenodd"/><path class="tw-fill-illustration-logo" d="M272.266 232.544a1.998 1.998 0 0 0-.353 1.589l.554 2.725a2.002 2.002 0 0 0 1.002 1.357l4.786 2.611a2 2 0 0 1 1.003 2.15l-.667 3.313a1.998 1.998 0 0 1-1.647 1.58l-5.641.896a1.998 1.998 0 0 0-1.352.867l-1.524 2.291a2 2 0 0 0-.252 1.678l1.555 5.227a2 2 0 0 1-.794 2.224l-2.799 1.902a2 2 0 0 1-2.309-.043l-4.524-3.327a2 2 0 0 0-1.583-.348l-2.754.56a1.997 1.997 0 0 0-1.352.994l-2.638 4.785a2 2 0 0 1-2.14.996l-3.339-.661a2 2 0 0 1-1.587-1.649l-.886-5.597a2.003 2.003 0 0 0-.875-1.358l-2.298-1.514a2 2 0 0 0-1.669-.247l-5.272 1.563a2 2 0 0 1-2.22-.788l-1.897-2.774a2.001 2.001 0 0 1 .045-2.321l3.339-4.498a2.004 2.004 0 0 0 .354-1.591l-.557-2.736a2.001 2.001 0 0 0-.983-1.347l-4.848-2.715a2 2 0 0 1-.983-2.14l.669-3.329a2.001 2.001 0 0 1 1.648-1.581l5.641-.895a1.999 1.999 0 0 0 1.352-.868l1.526-2.293c.327-.493.42-1.105.253-1.673l-1.608-5.457a2 2 0 0 1 .794-2.22l2.793-1.897a2 2 0 0 1 2.322.053l4.676 3.5a1.999 1.999 0 0 0 1.597.359l2.744-.558a2.002 2.002 0 0 0 1.353-.995l2.637-4.784a1.997 1.997 0 0 1 2.14-.996l3.339.661a2 2 0 0 1 1.587 1.649l.886 5.597c.088.555.406 1.048.875 1.357l2.298 1.514a2.002 2.002 0 0 0 1.669.248l5.272-1.564a2 2 0 0 1 2.22.789l1.898 2.775a2 2 0 0 1-.044 2.319l-3.432 4.635Zm-24.977-.064c-4.049 2.702-5.078 8.076-2.395 11.991 2.705 4.028 8.1 5.044 12.035 2.365 3.936-2.678 5.078-8.076 2.395-11.991-2.592-4.051-7.986-5.067-12.035-2.365Z"/><path class="tw-fill-illustration-outline" d="m270.507 237.256-.554-2.724a4.004 4.004 0 0 1 .705-3.178l3.433-4.636-1.897-2.775-5.273 1.564a4 4 0 0 1-3.337-.494l-2.298-1.515a4 4 0 0 1-1.751-2.714l-.886-5.597-3.339-.661-2.637 4.784a4.001 4.001 0 0 1-2.706 1.989l-2.744.558a4 4 0 0 1-3.194-.718l-4.676-3.5-2.792 1.898 1.608 5.457a3.998 3.998 0 0 1-.507 3.345l-1.525 2.294c-.62.931-1.6 1.56-2.704 1.736l-5.642.895-.669 3.329 4.848 2.715a4 4 0 0 1 1.965 2.693l.557 2.737a3.999 3.999 0 0 1-.708 3.18l-3.338 4.499 1.897 2.774 5.272-1.563a3.998 3.998 0 0 1 3.338.494l2.298 1.514a4.001 4.001 0 0 1 1.75 2.715l.886 5.597 3.339.661 2.638-4.785a4 4 0 0 1 2.706-1.988l2.753-.56a4 4 0 0 1 3.166.697l4.524 3.327 2.8-1.902-1.555-5.227a4.002 4.002 0 0 1 .504-3.355l1.524-2.291a3.998 3.998 0 0 1 2.703-1.736l5.642-.895.667-3.313-4.787-2.611a4.004 4.004 0 0 1-2.004-2.714Zm-24.328-6.439c4.915-3.28 11.556-2.099 14.795 2.898h.001v.001l.034.051h-.001c3.294 4.868 1.835 11.464-2.953 14.723-4.855 3.304-11.499 2.043-14.821-2.903l.001-.001c-3.308-4.845-2.013-11.461 2.944-14.769Zm11.461 5.106c-1.959-3.06-6.075-3.891-9.24-1.779-3.036 2.026-3.85 5.957-2.039 8.913l.183.284.01.015c2.089 3.109 6.234 3.879 9.25 1.827 3.066-2.087 3.897-6.25 1.871-9.207a.97.97 0 0 1-.035-.053Zm16.787.536 4.787 2.611a4 4 0 0 1 2.005 4.3l-.666 3.313a4.001 4.001 0 0 1-3.295 3.161l-5.641.896-1.525 2.291 1.555 5.227a4.002 4.002 0 0 1-1.586 4.449l-2.8 1.901a4 4 0 0 1-4.618-.086l-4.523-3.326-2.753.56-2.638 4.784a4 4 0 0 1-4.279 1.993l-3.34-.661a4.002 4.002 0 0 1-3.174-3.298l-.886-5.598-2.298-1.514-5.273 1.564a3.999 3.999 0 0 1-4.438-1.577l-1.897-2.774a3.998 3.998 0 0 1 .09-4.641l3.338-4.499-.557-2.737-4.848-2.715a3.998 3.998 0 0 1-1.966-4.279l.669-3.329a4.002 4.002 0 0 1 3.294-3.162l5.642-.895 1.526-2.294-1.609-5.457a4.001 4.001 0 0 1 1.59-4.439l2.792-1.897a4 4 0 0 1 4.645.106l4.676 3.5 2.744-.558 2.636-4.785a4 4 0 0 1 4.281-1.992l3.339.661a4 4 0 0 1 3.174 3.298l.886 5.597 2.298 1.514 5.272-1.563a4 4 0 0 1 4.439 1.576l1.898 2.775a4.001 4.001 0 0 1-.087 4.639l-3.433 4.636.554 2.724Z"/></g><defs><clipPath id="right-a"><path class="tw-fill-illustration-bg-tertiary" d="M0 0h506v297H0z"/></clipPath></defs></svg>
+`;
diff --git a/libs/components/src/navigation/nav-logo.component.html b/libs/components/src/navigation/nav-logo.component.html
index fa59724aad5..89507503a41 100644
--- a/libs/components/src/navigation/nav-logo.component.html
+++ b/libs/components/src/navigation/nav-logo.component.html
@@ -1,9 +1,9 @@
 <div
   [ngClass]="{
-    'tw-sticky tw-top-0 tw-z-50 tw-pb-2': sideNavService.open,
+    'tw-sticky tw-top-0 tw-z-50 tw-pb-4': sideNavService.open,
     'tw-pb-[calc(theme(spacing.6)_+_2px)]': !sideNavService.open,
   }"
-  class="tw-px-2 tw-pt-5"
+  class="tw-px-2 tw-pt-2"
 >
   <!-- absolutely position the link svg to avoid shifting layout when sidenav is closed -->
   <a

From 3bccca7cce98f1102420ec600e26699f2c48f6a3 Mon Sep 17 00:00:00 2001
From: Vicki League <vleague@bitwarden.com>
Date: Wed, 20 Aug 2025 16:00:48 -0400
Subject: [PATCH 13/34] [CL-691] Update style of the menu component (#15890)

---
 .../product-switcher-content.component.html              | 2 +-
 libs/components/src/menu/menu-divider.component.html     | 2 +-
 libs/components/src/menu/menu.component.html             | 2 +-
 libs/components/src/multi-select/scss/bw.theme.scss      | 9 ++++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html
index 204737eee2e..aa853796971 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html
@@ -31,7 +31,7 @@
     <!-- Other options -->
     <section
       *ngIf="products.other.length > 0"
-      class="tw-mt-4 tw-flex tw-w-full tw-flex-col tw-gap-2 tw-border-0 tw-border-t tw-border-solid tw-border-t-text-muted tw-p-2 tw-pb-0"
+      class="tw-mt-4 tw-flex tw-w-full tw-flex-col tw-gap-2 tw-border-0 tw-border-t tw-border-solid tw-border-t-secondary-100 tw-p-2 tw-pb-0"
     >
       <span class="tw-mb-1 tw-text-xs tw-text-muted">{{ "moreFromBitwarden" | i18n }}</span>
       <span *ngFor="let product of products.other">
diff --git a/libs/components/src/menu/menu-divider.component.html b/libs/components/src/menu/menu-divider.component.html
index 98048261cff..d3edb442ba6 100644
--- a/libs/components/src/menu/menu-divider.component.html
+++ b/libs/components/src/menu/menu-divider.component.html
@@ -1,5 +1,5 @@
 <div
-  class="tw-my-2 tw-border-0 tw-border-t tw-border-solid tw-border-t-secondary-500"
+  class="tw-my-2 tw-border-0 tw-border-t tw-border-solid tw-border-t-secondary-100"
   role="separator"
   aria-hidden="true"
 ></div>
diff --git a/libs/components/src/menu/menu.component.html b/libs/components/src/menu/menu.component.html
index f5c60660775..38e9991f8ea 100644
--- a/libs/components/src/menu/menu.component.html
+++ b/libs/components/src/menu/menu.component.html
@@ -1,7 +1,7 @@
 <ng-template>
   <div
     (click)="closed.emit()"
-    class="tw-flex tw-shrink-0 tw-flex-col tw-rounded-lg tw-border tw-border-solid tw-border-secondary-500 tw-bg-background tw-bg-clip-padding tw-py-1 tw-overflow-y-auto"
+    class="tw-flex tw-shrink-0 tw-flex-col tw-rounded-lg tw-border tw-border-solid tw-border-secondary-100 tw-bg-background tw-shadow-md tw-bg-clip-padding tw-py-1 tw-overflow-y-auto"
     [attr.role]="ariaRole()"
     [attr.aria-label]="ariaLabel()"
     cdkTrapFocus
diff --git a/libs/components/src/multi-select/scss/bw.theme.scss b/libs/components/src/multi-select/scss/bw.theme.scss
index 9e9ef275005..b375c2f739c 100644
--- a/libs/components/src/multi-select/scss/bw.theme.scss
+++ b/libs/components/src/multi-select/scss/bw.theme.scss
@@ -8,16 +8,19 @@
 $ng-select-highlight: rgb(var(--color-primary-700)) !default;
 $ng-select-primary-text: rgb(var(--color-text-main)) !default;
 $ng-select-disabled-text: rgb(var(--color-secondary-100)) !default;
-$ng-select-border: rgb(var(--color-secondary-600)) !default;
+$ng-select-border: rgb(var(--color-secondary-100)) !default;
 $ng-select-border-radius: 0.5rem !default;
 $ng-select-bg: rgb(var(--color-background)) !default;
 $ng-select-selected: transparent !default;
 $ng-select-selected-text: $ng-select-primary-text !default;
 
-$ng-select-marked: rgb(var(--color-primary-100)) !default;
+$ng-select-marked: var(--color-hover-default) !default;
 $ng-select-marked-text: $ng-select-primary-text !default;
 
 $ng-select-box-shadow: none !default;
+$ng-select-dropdown-box-shadow:
+  0 4px 6px -1px rgb(0 0 0 / 0.1),
+  0 2px 4px -2px rgb(0 0 0 / 0.1);
 $ng-select-placeholder: rgb(var(--color-text-muted)) !default;
 $ng-select-height: 100%;
 $ng-select-value-padding-left: 1rem !default;
@@ -248,7 +251,7 @@ $ng-dropdown-shadow: rgb(var(--color-secondary-100)) !default;
   background-color: $ng-select-dropdown-bg;
   border: 1px solid $ng-select-dropdown-border;
   border-radius: $ng-select-border-radius;
-  box-shadow: $ng-select-box-shadow;
+  box-shadow: $ng-select-dropdown-box-shadow;
   left: 0;
   &.ng-select-top {
     bottom: 100%;

From 1463fc804d439c27c10c931cbbc294f19c2da2d4 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 21 Aug 2025 09:45:49 +0200
Subject: [PATCH 14/34] Remove platform keygen service re-exports (#16081)

---
 libs/common/src/platform/abstractions/key-generation.service.ts | 2 --
 libs/common/src/platform/services/key-generation.service.ts     | 2 --
 2 files changed, 4 deletions(-)
 delete mode 100644 libs/common/src/platform/abstractions/key-generation.service.ts
 delete mode 100644 libs/common/src/platform/services/key-generation.service.ts

diff --git a/libs/common/src/platform/abstractions/key-generation.service.ts b/libs/common/src/platform/abstractions/key-generation.service.ts
deleted file mode 100644
index 8a230fb5b86..00000000000
--- a/libs/common/src/platform/abstractions/key-generation.service.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Temporary re-export. This should not be used for new imports */
-export { KeyGenerationService } from "../../key-management/crypto/key-generation/key-generation.service";
diff --git a/libs/common/src/platform/services/key-generation.service.ts b/libs/common/src/platform/services/key-generation.service.ts
deleted file mode 100644
index 55d1f96e7df..00000000000
--- a/libs/common/src/platform/services/key-generation.service.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Temporary re-export. This should not be used for new imports */
-export { DefaultKeyGenerationService as KeyGenerationService } from "../../key-management/crypto/key-generation/default-key-generation.service";

From 89bae6bb74917fca420a91b4bec352eaa0de42c0 Mon Sep 17 00:00:00 2001
From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
Date: Thu, 21 Aug 2025 10:25:48 +0100
Subject: [PATCH 15/34] Remove the VAT field for family plan (#16098)

---
 .../trial-initiation/trial-billing-step.component.html   | 1 +
 .../trial-initiation/trial-billing-step.component.ts     | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
index 64a9781b7cf..0c1a4270662 100644
--- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
+++ b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
@@ -51,6 +51,7 @@
       <h2 class="tw-mb-3 tw-text-base tw-font-semibold">{{ "paymentType" | i18n }}</h2>
       <app-payment [showAccountCredit]="false"></app-payment>
       <app-manage-tax-information
+        [showTaxIdField]="showTaxIdField"
         (taxInformationChanged)="onTaxInformationChanged()"
       ></app-manage-tax-information>
 
diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
index e13fac41f75..7e25a422477 100644
--- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
+++ b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.ts
@@ -259,6 +259,15 @@ export class TrialBillingStepComponent implements OnInit, OnDestroy {
     return planType ? this.applicablePlans.find((plan) => plan.type === planType) : null;
   }
 
+  protected get showTaxIdField(): boolean {
+    switch (this.organizationInfo.type) {
+      case ProductTierType.Families:
+        return false;
+      default:
+        return true;
+    }
+  }
+
   private getBillingInformationFromTaxInfoComponent(): BillingInformation {
     return {
       postalCode: this.taxInfoComponent.getTaxInformation()?.postalCode,

From 0daa6913d2f6529f489c5127c16215a1270f8fe5 Mon Sep 17 00:00:00 2001
From: Andreas Coroiu <acoroiu@bitwarden.com>
Date: Thu, 21 Aug 2025 14:42:56 +0200
Subject: [PATCH 16/34] feat: add ipc service usage docs (#16000)

---
 libs/common/src/platform/ipc/ipc.service.ts | 123 +++++++++++++++++++-
 1 file changed, 120 insertions(+), 3 deletions(-)

diff --git a/libs/common/src/platform/ipc/ipc.service.ts b/libs/common/src/platform/ipc/ipc.service.ts
index 2fba4380706..0da13c8f3d8 100644
--- a/libs/common/src/platform/ipc/ipc.service.ts
+++ b/libs/common/src/platform/ipc/ipc.service.ts
@@ -2,25 +2,136 @@ import { Observable, shareReplay } from "rxjs";
 
 import { IpcClient, IncomingMessage, OutgoingMessage } from "@bitwarden/sdk-internal";
 
+/**
+ * Entry point for inter-process communication (IPC).
+ *
+ * - {@link IpcService.init} should be called in the initialization phase of the client.
+ * - This service owns the underlying {@link IpcClient} lifecycle and starts it during initialization.
+ *
+ * ## Usage
+ *
+ * ### Publish / Subscribe
+ * There are 2 main ways of sending and receiving messages over IPC in TypeScript:
+ *
+ * #### 1. TypeScript only JSON-based messages
+ * This is the simplest form of IPC, where messages are sent as untyped JSON objects.
+ * This is useful for simple message passing without the need for Rust code.
+ *
+ * ```typescript
+ * // Send a message
+ * await ipcService.send(OutgoingMessage.new_json_payload({ my: "data" }, "BrowserBackground", "my-topic"));
+ *
+ * // Receive messages
+ * ipcService.messages$.subscribe((message: IncomingMessage) => {
+ *  if (message.topic === "my-topic") {
+ *    const data = incomingMessage.parse_payload_as_json();
+ *    console.log("Received message:", data);
+ *  }
+ * });
+ * ```
+ *
+ * #### 2. Rust compatible messages
+ * If you need to send messages that can also be handled by Rust code you can use typed Rust structs
+ * together with Rust functions to send and receive messages. For more information on typed structs
+ * refer to `TypedOutgoingMessage` and `TypedIncomingMessage` in the SDK.
+ *
+ * For examples on how to use the RPC framework with Rust see the section below.
+ *
+ * ### RPC (Request / Response)
+ * The RPC functionality is more complex than simple message passing and requires Rust code
+ * to send and receive calls. For this reason, the service also exposes the underlying
+ * {@link IpcClient} so it can be passed directly into Rust code.
+ *
+ * #### Rust code
+ * ```rust
+ *  #[wasm_bindgen(js_name = ipcRegisterPingHandler)]
+ *  pub async fn ipc_register_ping_handler(ipc_client: &JsIpcClient) {
+ *      ipc_client
+ *          .client
+ *           // See Rust docs for more information on how to implement a handler
+ *          .register_rpc_handler(PingHandler::new())
+ *          .await;
+ *  }
+ *
+ *  #[wasm_bindgen(js_name = ipcRequestPing)]
+ *  pub async fn ipc_request_ping(
+ *      ipc_client: &JsIpcClient,
+ *      destination: Endpoint,
+ *      abort_signal: Option<AbortSignal>,
+ *  ) -> Result<PingResponse, RequestError> {
+ *      ipc_client
+ *          .client
+ *          .request(
+ *              PingRequest,
+ *              destination,
+ *              abort_signal.map(|c| c.to_cancellation_token()),
+ *          )
+ *          .await
+ *  }
+ * ```
+ *
+ * #### TypeScript code
+ * ```typescript
+ * import { IpcService } from "@bitwarden/common/platform/ipc";
+ * import { IpcClient, ipcRegisterPingHandler, ipcRequestPing } from "@bitwarden/sdk-internal";
+ *
+ * class MyService {
+ *   constructor(private ipcService: IpcService) {}
+ *
+ *   async init() {
+ *     await ipcRegisterPingHandler(this.ipcService.client);
+ *   }
+ *
+ *   async ping(destination: Endpoint): Promise<PingResponse> {
+ *     return await ipcRequestPing(this.ipcService.client, destination);
+ *   }
+ * }
+ */
 export abstract class IpcService {
   private _client?: IpcClient;
+
+  /**
+   * Access to the underlying {@link IpcClient} for advanced/Rust RPC usage.
+   *
+   * @throws If the service has not been initialized.
+   */
   get client(): IpcClient {
     if (!this._client) {
-      throw new Error("IpcService not initialized");
+      throw new Error("IpcService not initialized. Call init() first.");
     }
     return this._client;
   }
 
   private _messages$?: Observable<IncomingMessage>;
-  protected get messages$(): Observable<IncomingMessage> {
+
+  /**
+   * Hot stream of {@link IncomingMessage} from the IPC layer.
+   *
+   * @remarks
+   * - Uses `shareReplay({ bufferSize: 0, refCount: true })`, so no events are replayed to late subscribers.
+   *   Subscribe early if you must not miss messages.
+   *
+   * @throws If the service has not been initialized.
+   */
+  get messages$(): Observable<IncomingMessage> {
     if (!this._messages$) {
-      throw new Error("IpcService not initialized");
+      throw new Error("IpcService not initialized. Call init() first.");
     }
     return this._messages$;
   }
 
+  /**
+   * Initializes the service and starts the IPC client.
+   */
   abstract init(): Promise<void>;
 
+  /**
+   * Wires the provided {@link IpcClient}, starts it, and sets up the message stream.
+   *
+   * - Starts the client via `client.start()`.
+   * - Subscribes to the client's receive loop and exposes it through {@link messages$}.
+   * - Implementations may override `init` but should call this helper exactly once.
+   */
   protected async initWithClient(client: IpcClient): Promise<void> {
     this._client = client;
     await this._client.start();
@@ -47,6 +158,12 @@ export abstract class IpcService {
     }).pipe(shareReplay({ bufferSize: 0, refCount: true }));
   }
 
+  /**
+   * Sends an {@link OutgoingMessage} over IPC.
+   *
+   * @param message The message to send.
+   * @throws If the service is not initialized or the underlying client fails to send.
+   */
   async send(message: OutgoingMessage) {
     await this.client.send(message);
   }

From b0f46004ff0ef30323ff4a181178eae752543020 Mon Sep 17 00:00:00 2001
From: Bryan Cunningham <bcunningham@bitwarden.com>
Date: Thu, 21 Aug 2025 09:14:08 -0400
Subject: [PATCH 17/34] [CL-796] unrevert aria disabled buttons (#15924)

* Use aria-disabled for button disabled state

* remove import from testing story

* use aria-disabled attr on bitLink button

* remove unnecessary story attrs

* remove disabled attr if on button element

* create caprture click util

* use caprture click util and fix tests

* fix lint errors

* fix event type

* combine click capture and attr modification

* fix lint error. Commit spec changes left out of last commit in error

* inject element ref

* move aria-disabled styles to common

* move disabled logic into util

* fix broken async actions stories

* fix broken tests asserting disabled attr

* have test check for string true vlalue

* fix Signal type

* fix form-field story import

* remove injector left in error

* aria-disable icon buttons

* update form component css selector to look for aria-disabled buttons

* use correct types. pass nativeElement directly

* add JSDoc comment for util function

* WIP

* WIP

* inject service in directive

* remove console log

* remove disabled attr left in error

* update comments

* remove unnecessary logic

* remove :disabled psuedo selector as its apparently not needed

* fix event type

* coerce disabled attr to boolean

* remove duplicate style concat left by conflict resolution

* add back buttonStyles default

* move reactive logic back to helper

* add test to ensure menu button doesn't open when trigger is disabled

* remove menu toggle to fix tests

* remove disabled menu story

* Fix usage of bitLink in verify email component

* Update varaible name

* no longer pass destroyRef
---
 .../vault-generator-dialog.component.spec.ts  | 18 +++-----
 .../auth/settings/verify-email.component.html |  3 +-
 .../web-generator-dialog.component.spec.ts    | 18 +++-----
 .../src/a11y/aria-disable.directive.ts        | 12 ++++++
 .../aria-disabled-click-capture.service.ts    | 30 ++++++++++++++
 libs/components/src/a11y/index.ts             |  2 +
 .../src/button/button.component.spec.ts       | 14 ++++---
 .../components/src/button/button.component.ts | 41 +++++++++++++------
 .../src/form-field/form-field.component.html  |  2 +-
 .../src/icon-button/icon-button.component.ts  | 29 ++++++++++---
 libs/components/src/link/link.directive.ts    | 20 ++++++++-
 .../src/menu/menu.component.spec.ts           |  8 ++++
 libs/components/src/toast/toast.stories.ts    |  1 +
 .../src/utils/aria-disable-element.ts         | 19 +++++++++
 libs/components/src/utils/index.ts            |  1 +
 15 files changed, 165 insertions(+), 53 deletions(-)
 create mode 100644 libs/components/src/a11y/aria-disable.directive.ts
 create mode 100644 libs/components/src/a11y/aria-disabled-click-capture.service.ts
 create mode 100644 libs/components/src/utils/aria-disable-element.ts

diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts
index b5d35e2005e..b65138dac3a 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-generator-dialog/vault-generator-dialog.component.spec.ts
@@ -76,10 +76,8 @@ describe("VaultGeneratorDialogComponent", () => {
     component.onValueGenerated("test-password");
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(false);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe(undefined);
   });
 
   it("should disable the button if no value has been generated", () => {
@@ -90,10 +88,8 @@ describe("VaultGeneratorDialogComponent", () => {
     generator.algorithmSelected.emit({ useGeneratedValue: "Use Password" } as any);
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(true);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe("true");
   });
 
   it("should disable the button if no algorithm is selected", () => {
@@ -104,10 +100,8 @@ describe("VaultGeneratorDialogComponent", () => {
     generator.valueGenerated.emit("test-password");
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(true);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe("true");
   });
 
   it("should update button text when algorithm is selected", () => {
diff --git a/apps/web/src/app/auth/settings/verify-email.component.html b/apps/web/src/app/auth/settings/verify-email.component.html
index a691c30695c..42a546fc281 100644
--- a/apps/web/src/app/auth/settings/verify-email.component.html
+++ b/apps/web/src/app/auth/settings/verify-email.component.html
@@ -4,10 +4,9 @@
     id="sendBtn"
     bitLink
     linkType="secondary"
-    bitButton
     type="button"
     buttonType="unstyled"
-    [bitAction]="send"
+    (click)="send()"
   >
     {{ "sendEmail" | i18n }}
   </button>
diff --git a/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts b/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts
index 085a3d0d4b0..afb32738901 100644
--- a/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts
+++ b/apps/web/src/app/vault/components/web-generator-dialog/web-generator-dialog.component.spec.ts
@@ -70,10 +70,8 @@ describe("WebVaultGeneratorDialogComponent", () => {
     generator.valueGenerated.emit("test-password");
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(false);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe(undefined);
   });
 
   it("should disable the button if no value has been generated", () => {
@@ -84,10 +82,8 @@ describe("WebVaultGeneratorDialogComponent", () => {
     generator.algorithmSelected.emit({ useGeneratedValue: "Use Password" } as any);
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(true);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe("true");
   });
 
   it("should disable the button if no algorithm is selected", () => {
@@ -98,10 +94,8 @@ describe("WebVaultGeneratorDialogComponent", () => {
     generator.valueGenerated.emit("test-password");
     fixture.detectChanges();
 
-    const button = fixture.debugElement.query(
-      By.css("[data-testid='select-button']"),
-    ).nativeElement;
-    expect(button.disabled).toBe(true);
+    const button = fixture.debugElement.query(By.css("[data-testid='select-button']"));
+    expect(button.attributes["aria-disabled"]).toBe("true");
   });
 
   it("should close with selected value when confirmed", () => {
diff --git a/libs/components/src/a11y/aria-disable.directive.ts b/libs/components/src/a11y/aria-disable.directive.ts
new file mode 100644
index 00000000000..8236e178994
--- /dev/null
+++ b/libs/components/src/a11y/aria-disable.directive.ts
@@ -0,0 +1,12 @@
+import { Directive, inject } from "@angular/core";
+
+import { AriaDisabledClickCaptureService } from "./aria-disabled-click-capture.service";
+
+@Directive({
+  host: {
+    "[attr.bit-aria-disable]": "true",
+  },
+})
+export class AriaDisableDirective {
+  protected ariaDisabledClickCaptureService = inject(AriaDisabledClickCaptureService);
+}
diff --git a/libs/components/src/a11y/aria-disabled-click-capture.service.ts b/libs/components/src/a11y/aria-disabled-click-capture.service.ts
new file mode 100644
index 00000000000..d828d15c873
--- /dev/null
+++ b/libs/components/src/a11y/aria-disabled-click-capture.service.ts
@@ -0,0 +1,30 @@
+import { DOCUMENT } from "@angular/common";
+import { Injectable, Inject, NgZone, OnDestroy } from "@angular/core";
+
+@Injectable({ providedIn: "root" })
+export class AriaDisabledClickCaptureService implements OnDestroy {
+  private listener!: (e: MouseEvent | KeyboardEvent) => void;
+
+  constructor(
+    @Inject(DOCUMENT) private document: Document,
+    private ngZone: NgZone,
+  ) {
+    this.ngZone.runOutsideAngular(() => {
+      this.listener = (e: MouseEvent | KeyboardEvent) => {
+        const btn = (e.target as HTMLElement).closest(
+          '[aria-disabled="true"][bit-aria-disable="true"]',
+        );
+        if (btn) {
+          e.stopPropagation();
+          e.preventDefault();
+          return false;
+        }
+      };
+      this.document.addEventListener("click", this.listener, /* capture */ true);
+    });
+  }
+
+  ngOnDestroy() {
+    this.document.removeEventListener("click", this.listener, true);
+  }
+}
diff --git a/libs/components/src/a11y/index.ts b/libs/components/src/a11y/index.ts
index 6090fb65d4e..2a723f14c93 100644
--- a/libs/components/src/a11y/index.ts
+++ b/libs/components/src/a11y/index.ts
@@ -1 +1,3 @@
 export * from "./a11y-title.directive";
+export * from "./aria-disabled-click-capture.service";
+export * from "./aria-disable.directive";
diff --git a/libs/components/src/button/button.component.spec.ts b/libs/components/src/button/button.component.spec.ts
index 6ddbc172803..1651b6cf12a 100644
--- a/libs/components/src/button/button.component.spec.ts
+++ b/libs/components/src/button/button.component.spec.ts
@@ -34,23 +34,25 @@ describe("Button", () => {
     expect(buttonDebugElement.nativeElement.disabled).toBeFalsy();
   });
 
-  it("should be disabled when disabled is true", () => {
+  it("should be aria-disabled and not html attribute disabled when disabled is true", () => {
     testAppComponent.disabled = true;
     fixture.detectChanges();
-
-    expect(buttonDebugElement.nativeElement.disabled).toBeTruthy();
+    expect(buttonDebugElement.attributes["aria-disabled"]).toBe("true");
+    expect(buttonDebugElement.nativeElement.disabled).toBeFalsy();
     // Anchor tags cannot be disabled.
   });
 
-  it("should be disabled when attribute disabled is true", () => {
-    expect(disabledButtonDebugElement.nativeElement.disabled).toBeTruthy();
+  it("should be aria-disabled not html attribute disabled when attribute disabled is true", () => {
+    fixture.detectChanges();
+    expect(disabledButtonDebugElement.attributes["aria-disabled"]).toBe("true");
+    expect(disabledButtonDebugElement.nativeElement.disabled).toBeFalsy();
   });
 
   it("should be disabled when loading is true", () => {
     testAppComponent.loading = true;
     fixture.detectChanges();
 
-    expect(buttonDebugElement.nativeElement.disabled).toBeTruthy();
+    expect(buttonDebugElement.attributes["aria-disabled"]).toBe("true");
   });
 });
 
diff --git a/libs/components/src/button/button.component.ts b/libs/components/src/button/button.component.ts
index 635c269bd0f..1dce792c963 100644
--- a/libs/components/src/button/button.component.ts
+++ b/libs/components/src/button/button.component.ts
@@ -1,9 +1,20 @@
 import { NgClass } from "@angular/common";
-import { input, HostBinding, Component, model, computed, booleanAttribute } from "@angular/core";
+import {
+  input,
+  HostBinding,
+  Component,
+  model,
+  computed,
+  booleanAttribute,
+  inject,
+  ElementRef,
+} from "@angular/core";
 import { toObservable, toSignal } from "@angular/core/rxjs-interop";
 import { debounce, interval } from "rxjs";
 
+import { AriaDisableDirective } from "../a11y";
 import { ButtonLikeAbstraction, ButtonType, ButtonSize } from "../shared/button-like.abstraction";
+import { ariaDisableElement } from "../utils";
 
 const focusRing = [
   "focus-visible:tw-ring-2",
@@ -50,9 +61,7 @@ const buttonStyles: Record<ButtonType, string[]> = {
   templateUrl: "button.component.html",
   providers: [{ provide: ButtonLikeAbstraction, useExisting: ButtonComponent }],
   imports: [NgClass],
-  host: {
-    "[attr.disabled]": "disabledAttr()",
-  },
+  hostDirectives: [AriaDisableDirective],
 })
 export class ButtonComponent implements ButtonLikeAbstraction {
   @HostBinding("class") get classList() {
@@ -72,14 +81,15 @@ export class ButtonComponent implements ButtonLikeAbstraction {
       .concat(
         this.showDisabledStyles() || this.disabled()
           ? [
-              "disabled:tw-bg-secondary-300",
-              "disabled:hover:tw-bg-secondary-300",
-              "disabled:tw-border-secondary-300",
-              "disabled:hover:tw-border-secondary-300",
-              "disabled:!tw-text-muted",
-              "disabled:hover:!tw-text-muted",
-              "disabled:tw-cursor-not-allowed",
-              "disabled:hover:tw-no-underline",
+              "aria-disabled:!tw-bg-secondary-300",
+              "hover:tw-bg-secondary-300",
+              "aria-disabled:tw-border-secondary-300",
+              "hover:tw-border-secondary-300",
+              "aria-disabled:!tw-text-muted",
+              "hover:!tw-text-muted",
+              "aria-disabled:tw-cursor-not-allowed",
+              "hover:tw-no-underline",
+              "aria-disabled:tw-pointer-events-none",
             ]
           : [],
       )
@@ -88,7 +98,7 @@ export class ButtonComponent implements ButtonLikeAbstraction {
 
   protected disabledAttr = computed(() => {
     const disabled = this.disabled() != null && this.disabled() !== false;
-    return disabled || this.loading() ? true : null;
+    return disabled || this.loading();
   });
 
   /**
@@ -128,4 +138,9 @@ export class ButtonComponent implements ButtonLikeAbstraction {
   );
 
   disabled = model<boolean>(false);
+  private el = inject(ElementRef<HTMLButtonElement>);
+
+  constructor() {
+    ariaDisableElement(this.el.nativeElement, this.disabledAttr);
+  }
 }
diff --git a/libs/components/src/form-field/form-field.component.html b/libs/components/src/form-field/form-field.component.html
index b40e16d4cd4..ae3bad40698 100644
--- a/libs/components/src/form-field/form-field.component.html
+++ b/libs/components/src/form-field/form-field.component.html
@@ -46,7 +46,7 @@
       </div>
     </div>
     <div
-      class="tw-gap-1 tw-bg-background tw-rounded-lg tw-flex tw-min-h-11 [&:not(:has(button:enabled)):has(input:read-only)]:tw-bg-secondary-100 [&:not(:has(button:enabled)):has(textarea:read-only)]:tw-bg-secondary-100"
+      class="tw-gap-1 tw-bg-background tw-rounded-lg tw-flex tw-min-h-11 [&:has(input:read-only,textarea:read-only):not(:has(button:not([aria-disabled='true'])))]:tw-bg-secondary-100"
     >
       <div
         #prefixContainer
diff --git a/libs/components/src/icon-button/icon-button.component.ts b/libs/components/src/icon-button/icon-button.component.ts
index 3849ff85e37..4130cf27170 100644
--- a/libs/components/src/icon-button/icon-button.component.ts
+++ b/libs/components/src/icon-button/icon-button.component.ts
@@ -1,11 +1,22 @@
 import { NgClass } from "@angular/common";
-import { Component, computed, effect, ElementRef, HostBinding, input, model } from "@angular/core";
+import {
+  Component,
+  computed,
+  effect,
+  ElementRef,
+  HostBinding,
+  inject,
+  input,
+  model,
+} from "@angular/core";
 import { toObservable, toSignal } from "@angular/core/rxjs-interop";
 import { debounce, interval } from "rxjs";
 
+import { AriaDisableDirective } from "../a11y";
 import { setA11yTitleAndAriaLabel } from "../a11y/set-a11y-title-and-aria-label";
 import { ButtonLikeAbstraction } from "../shared/button-like.abstraction";
 import { FocusableElement } from "../shared/focusable-element";
+import { ariaDisableElement } from "../utils";
 
 export type IconButtonType = "primary" | "danger" | "contrast" | "main" | "muted" | "nav-contrast";
 
@@ -78,7 +89,6 @@ const sizes: Record<IconButtonSize, string[]> = {
   ],
   imports: [NgClass],
   host: {
-    "[attr.disabled]": "disabledAttr()",
     /**
      * When the `bitIconButton` input is dynamic from a consumer, Angular doesn't put the
      * `bitIconButton` attribute into the DOM. We use the attribute as a css selector in
@@ -87,6 +97,7 @@ const sizes: Record<IconButtonSize, string[]> = {
      */
     "[attr.bitIconButton]": "icon()",
   },
+  hostDirectives: [AriaDisableDirective],
 })
 export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableElement {
   readonly icon = model.required<string>({ alias: "bitIconButton" });
@@ -118,7 +129,7 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
       .concat(sizes[this.size()])
       .concat(
         this.showDisabledStyles() || this.disabled()
-          ? ["disabled:tw-opacity-60", "disabled:hover:!tw-bg-transparent"]
+          ? ["aria-disabled:tw-opacity-60", "aria-disabled:hover:!tw-bg-transparent"]
           : [],
       );
   }
@@ -129,7 +140,7 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
 
   protected disabledAttr = computed(() => {
     const disabled = this.disabled() != null && this.disabled() !== false;
-    return disabled || this.loading() ? true : null;
+    return disabled || this.loading();
   });
 
   /**
@@ -168,8 +179,14 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
     return this.elementRef.nativeElement;
   }
 
-  constructor(private elementRef: ElementRef) {
-    const originalTitle = this.elementRef.nativeElement.getAttribute("title");
+  private elementRef = inject(ElementRef);
+
+  constructor() {
+    const element = this.elementRef.nativeElement;
+
+    ariaDisableElement(element, this.disabledAttr);
+
+    const originalTitle = element.getAttribute("title");
 
     effect(() => {
       setA11yTitleAndAriaLabel({
diff --git a/libs/components/src/link/link.directive.ts b/libs/components/src/link/link.directive.ts
index f2eb44bc3a4..7c93b185a79 100644
--- a/libs/components/src/link/link.directive.ts
+++ b/libs/components/src/link/link.directive.ts
@@ -1,4 +1,7 @@
-import { input, HostBinding, Directive } from "@angular/core";
+import { input, HostBinding, Directive, inject, ElementRef, booleanAttribute } from "@angular/core";
+
+import { AriaDisableDirective } from "../a11y";
+import { ariaDisableElement } from "../utils";
 
 export type LinkType = "primary" | "secondary" | "contrast" | "light";
 
@@ -58,6 +61,11 @@ const commonStyles = [
   "before:tw-transition",
   "focus-visible:before:tw-ring-2",
   "focus-visible:tw-z-10",
+  "aria-disabled:tw-no-underline",
+  "aria-disabled:tw-pointer-events-none",
+  "aria-disabled:!tw-text-secondary-300",
+  "aria-disabled:hover:!tw-text-secondary-300",
+  "aria-disabled:hover:tw-no-underline",
 ];
 
 @Directive()
@@ -86,11 +94,21 @@ export class AnchorLinkDirective extends LinkDirective {
 
 @Directive({
   selector: "button[bitLink]",
+  hostDirectives: [AriaDisableDirective],
 })
 export class ButtonLinkDirective extends LinkDirective {
+  private el = inject(ElementRef<HTMLButtonElement>);
+
+  disabled = input(false, { transform: booleanAttribute });
+
   @HostBinding("class") get classList() {
     return ["before:-tw-inset-y-[0.25rem]"]
       .concat(commonStyles)
       .concat(linkStyles[this.linkType()] ?? []);
   }
+
+  constructor() {
+    super();
+    ariaDisableElement(this.el.nativeElement, this.disabled);
+  }
 }
diff --git a/libs/components/src/menu/menu.component.spec.ts b/libs/components/src/menu/menu.component.spec.ts
index c6a54f1afae..3153fd4eb37 100644
--- a/libs/components/src/menu/menu.component.spec.ts
+++ b/libs/components/src/menu/menu.component.spec.ts
@@ -58,6 +58,14 @@ describe("Menu", () => {
 
     expect(getBitMenuPanel()).toBeFalsy();
   });
+
+  it("should not open when the trigger button is disabled", () => {
+    const buttonDebugElement = fixture.debugElement.query(By.directive(MenuTriggerForDirective));
+    buttonDebugElement.nativeElement.setAttribute("disabled", "true");
+    (buttonDebugElement.nativeElement as HTMLButtonElement).click();
+
+    expect(getBitMenuPanel()).toBeFalsy();
+  });
 });
 
 @Component({
diff --git a/libs/components/src/toast/toast.stories.ts b/libs/components/src/toast/toast.stories.ts
index bd2c59a191b..dee31f1d6ac 100644
--- a/libs/components/src/toast/toast.stories.ts
+++ b/libs/components/src/toast/toast.stories.ts
@@ -20,6 +20,7 @@ const toastServiceExampleTemplate = `
 @Component({
   selector: "toast-service-example",
   template: toastServiceExampleTemplate,
+  imports: [ButtonModule],
 })
 export class ToastServiceExampleComponent {
   @Input()
diff --git a/libs/components/src/utils/aria-disable-element.ts b/libs/components/src/utils/aria-disable-element.ts
new file mode 100644
index 00000000000..0f7fb4ca205
--- /dev/null
+++ b/libs/components/src/utils/aria-disable-element.ts
@@ -0,0 +1,19 @@
+import { Signal } from "@angular/core";
+import { toObservable, takeUntilDestroyed } from "@angular/core/rxjs-interop";
+
+/**
+ * a11y helper util used to `aria-disable` elements as opposed to using the HTML `disabled` attr.
+ * - Removes HTML `disabled` attr and replaces it with `aria-disabled="true"`
+ */
+export function ariaDisableElement(el: HTMLElement, disabled: Signal<boolean | undefined>) {
+  toObservable(disabled)
+    .pipe(takeUntilDestroyed())
+    .subscribe((isDisabled) => {
+      if (isDisabled) {
+        el.removeAttribute("disabled");
+        el.setAttribute("aria-disabled", "true");
+      } else {
+        el.removeAttribute("aria-disabled");
+      }
+    });
+}
diff --git a/libs/components/src/utils/index.ts b/libs/components/src/utils/index.ts
index afadd6b3b41..91fa71cf0e0 100644
--- a/libs/components/src/utils/index.ts
+++ b/libs/components/src/utils/index.ts
@@ -1,2 +1,3 @@
+export * from "./aria-disable-element";
 export * from "./function-to-observable";
 export * from "./i18n-mock.service";

From f07518084f0f34a578565f7b86f5d73a3a9b1024 Mon Sep 17 00:00:00 2001
From: Kyle Denney <4227399+kdenney@users.noreply.github.com>
Date: Thu, 21 Aug 2025 09:36:57 -0500
Subject: [PATCH 18/34] [PM-24554] remove code for feature flag (#16092)

---
 .../complete-trial-initiation.component.ts         | 14 ++++----------
 libs/common/src/enums/feature-flag.enum.ts         |  2 --
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts
index ce02ee8715a..799577fc7c4 100644
--- a/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts
+++ b/apps/web/src/app/billing/trial-initiation/complete-trial-initiation/complete-trial-initiation.component.ts
@@ -4,7 +4,7 @@ import { StepperSelectionEvent } from "@angular/cdk/stepper";
 import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
-import { combineLatest, firstValueFrom, map, Subject, switchMap, takeUntil } from "rxjs";
+import { firstValueFrom, map, Subject, switchMap, takeUntil } from "rxjs";
 
 import {
   InputPasswordFlow,
@@ -101,9 +101,6 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
   protected trialPaymentOptional$ = this.configService.getFeatureFlag$(
     FeatureFlag.TrialPaymentOptional,
   );
-  protected allowTrialLengthZero$ = this.configService.getFeatureFlag$(
-    FeatureFlag.AllowTrialLengthZero,
-  );
 
   constructor(
     protected router: Router,
@@ -337,14 +334,11 @@ export class CompleteTrialInitiationComponent implements OnInit, OnDestroy {
     return this.productTier;
   }
 
-  readonly showBillingStep$ = combineLatest([
-    this.trialPaymentOptional$,
-    this.allowTrialLengthZero$,
-  ]).pipe(
-    map(([trialPaymentOptional, allowTrialLengthZero]) => {
+  readonly showBillingStep$ = this.trialPaymentOptional$.pipe(
+    map((trialPaymentOptional) => {
       return (
         (!trialPaymentOptional && !this.isSecretsManagerFree) ||
-        (trialPaymentOptional && allowTrialLengthZero && this.trialLength === 0)
+        (trialPaymentOptional && this.trialLength === 0)
       );
     }),
   );
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 81cc3b305dc..a36eb68dc71 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -28,7 +28,6 @@ export enum FeatureFlag {
   PM12276_BreadcrumbEventLogs = "pm-12276-breadcrumbing-for-business-features",
   PM17772_AdminInitiatedSponsorships = "pm-17772-admin-initiated-sponsorships",
   UseOrganizationWarningsService = "use-organization-warnings-service",
-  AllowTrialLengthZero = "pm-20322-allow-trial-length-0",
   PM21881_ManagePaymentDetailsOutsideCheckout = "pm-21881-manage-payment-details-outside-checkout",
   PM21821_ProviderPortalTakeover = "pm-21821-provider-portal-takeover",
   PM22415_TaxIDWarnings = "pm-22415-tax-id-warnings",
@@ -104,7 +103,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.PM12276_BreadcrumbEventLogs]: FALSE,
   [FeatureFlag.PM17772_AdminInitiatedSponsorships]: FALSE,
   [FeatureFlag.UseOrganizationWarningsService]: FALSE,
-  [FeatureFlag.AllowTrialLengthZero]: FALSE,
   [FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout]: FALSE,
   [FeatureFlag.PM21821_ProviderPortalTakeover]: FALSE,
   [FeatureFlag.PM22415_TaxIDWarnings]: FALSE,

From 805b6fe7aaf812fad0f9063023011223c01a85fc Mon Sep 17 00:00:00 2001
From: Vicki League <vleague@bitwarden.com>
Date: Thu, 21 Aug 2025 12:35:59 -0400
Subject: [PATCH 19/34] [CL-573] Move all svg icons to new libs/assets (#16020)

* create libs/assets

* treeshake lib and filter out non-icons from icon story

* update docs

* fix icon colors in browser and desktop

* better name for vault icon

* move illustrations
---
 .github/CODEOWNERS                            |  1 +
 .../autofill/popup/fido2/fido2.component.ts   |  4 +-
 .../popup/layout/popup-layout.stories.ts      | 27 ++++---
 .../layout/popup-tab-navigation.component.ts  |  3 +-
 apps/browser/src/popup/app-routing.module.ts  | 19 ++---
 ...extension-anon-layout-wrapper.component.ts |  5 +-
 .../extension-anon-layout-wrapper.stories.ts  | 12 ++--
 apps/browser/src/popup/tabs-v2.component.ts   | 27 ++++---
 .../send-created/send-created.component.ts    |  2 +-
 .../tools/popup/send-v2/send-v2.component.ts  |  6 +-
 .../intro-carousel.component.ts               | 11 +--
 .../components/vault-v2/vault-v2.component.ts | 10 +--
 .../popup/settings/folders-v2.component.ts    |  5 +-
 .../vault/popup/settings/trash.component.ts   |  4 +-
 apps/browser/tailwind.config.js               |  1 +
 apps/desktop/src/app/app-routing.module.ts    | 21 +++---
 apps/desktop/tailwind.config.js               |  1 +
 apps/web/src/app/admin-console/icons/index.ts |  1 -
 .../collection-access-restricted.component.ts | 10 +--
 .../collections/vault.component.ts            |  4 +-
 .../layouts/organization-layout.component.ts  |  3 +-
 .../accept-family-sponsorship.component.ts    |  5 +-
 .../login-via-webauthn.component.ts           |  8 ++-
 .../create-credential-dialog.component.ts     |  9 +--
 .../create-passkey-failed.icon.ts             | 28 --------
 ...ganization-subscription-cloud.component.ts |  2 +-
 .../subscription-hidden.component.ts          | 25 +------
 .../billing/shared/sm-subscribe.component.ts  |  5 +-
 apps/web/src/app/dirt/reports/reports.ts      | 17 +++--
 .../reports/shared/models/report-entry.ts     |  2 +-
 .../report-card/report-card.component.ts      |  2 +-
 .../src/app/layouts/password-manager-logo.ts  |  5 --
 .../src/app/layouts/user-layout.component.ts  |  3 +-
 apps/web/src/app/oss-routing.module.ts        | 29 ++++----
 .../send/send-access/access.component.ts      |  2 +-
 .../src/app/tools/send/send-access/routes.ts  |  2 +-
 apps/web/src/app/tools/send/send.component.ts |  2 +-
 .../manually-open-extension.component.ts      |  4 +-
 .../setup-extension.component.spec.ts         |  4 +-
 .../setup-extension.component.ts              |  6 +-
 .../vault/individual-vault/vault.component.ts |  5 +-
 apps/web/tailwind.config.js                   |  1 +
 .../device-approvals.component.ts             |  2 +-
 .../manage/accept-provider.component.ts       |  4 +-
 .../providers/providers-layout.component.ts   |  8 +--
 .../setup/setup-provider.component.ts         |  4 +-
 .../providers/clients/no-clients.component.ts | 23 +-----
 .../setup/setup-business-unit.component.ts    |  4 +-
 .../all-applications.component.ts             |  4 +-
 .../critical-applications.component.ts        | 11 +--
 .../layout/navigation.component.ts            |  2 +-
 .../shared/org-suspended.component.ts         |  4 +-
 .../components/two-factor-icon.component.ts   |  5 +-
 .../src/auth/icons/create-passkey.icon.ts     | 26 -------
 .../change-password.component.ts              |  6 +-
 .../set-initial-password.component.ts         |  5 +-
 .../invoices/no-invoices.component.ts         | 26 +------
 libs/assets/README.md                         | 16 +++++
 libs/assets/eslint.config.mjs                 |  3 +
 libs/assets/jest.config.js                    | 10 +++
 libs/assets/package.json                      | 15 ++++
 libs/assets/project.json                      | 33 +++++++++
 .../src/svg/icon-service.spec.ts}             |  4 +-
 .../src/svg/icon-service.ts}                  |  0
 libs/assets/src/svg/index.ts                  |  2 +
 .../src/svg/svgs}/active-send.icon.ts         |  2 +-
 .../src/svg/svgs}/admin-console.ts            |  2 +-
 .../svg/svgs/background-left-illustration.ts} |  4 +-
 .../svgs/background-right-illustration.ts}    |  4 +-
 .../src/svg/svgs}/bitwarden-icon.ts           |  2 +-
 .../src/svg/svgs}/bitwarden-logo.icon.ts      |  2 +-
 .../src/svg/svgs}/browser-extension.ts        |  2 +-
 .../src/svg/svgs}/business-unit-portal.ts     |  2 +-
 .../src/svg/svgs}/carousel-icon.ts            |  2 +-
 .../svg/svgs}/create-passkey-failed.icon.ts   |  2 +-
 .../src/svg/svgs}/create-passkey.icon.ts      |  2 +-
 .../src/svg/svgs}/deactivated-org.ts          |  2 +-
 .../src/svg/svgs}/device-verification.icon.ts |  4 +-
 .../src/svg/svgs}/devices.icon.ts             |  4 +-
 .../assets/src/svg/svgs}/devices.ts           |  2 +-
 .../src/svg/svgs}/email.icon.ts               |  3 +-
 .../src/svg/svgs}/empty-trash.ts              |  2 +-
 .../src/svg/svgs}/expired-send.icon.ts        |  2 +-
 .../svgs}/extension-bitwarden-logo.icon.ts    |  2 +-
 libs/assets/src/svg/svgs/gear.ts              | 20 ++++++
 .../src/svg/svgs}/generator.ts                |  2 +-
 libs/assets/src/svg/svgs/index.ts             | 72 +++++++++++++++++++
 .../src/svg/svgs}/lock.icon.ts                |  2 +-
 .../src/svg/svgs}/login-cards.ts              |  2 +-
 .../src/svg/svgs}/no-access.ts                |  2 +-
 .../src/svg/svgs}/no-credentials.icon.ts      |  2 +-
 .../src/svg/svgs}/no-folders.ts               |  2 +-
 .../src/svg/svgs}/no-results.ts               |  2 +-
 .../src/svg/svgs}/no-send.icon.ts             |  2 +-
 libs/assets/src/svg/svgs/partner-trust.ts     | 23 ++++++
 .../icons => assets/src/svg/svgs}/party.ts    |  2 +-
 .../src/svg/svgs}/password-manager.ts         |  2 +-
 .../src/svg/svgs}/provider-portal.ts          |  2 +-
 .../src/svg/svgs}/recovery.icon.ts            |  2 +-
 .../svgs}/registration-check-email.icon.ts    |  2 +-
 .../svgs}/registration-expired-link.icon.ts   |  4 +-
 .../svg/svgs}/registration-lock-alt.icon.ts   |  4 +-
 .../svg/svgs}/registration-user-add.icon.ts   |  4 +-
 .../src/svg/svgs}/report-breach.icon.ts       |  2 +-
 .../svgs}/report-exposed-passwords.icon.ts    |  2 +-
 .../svgs}/report-inactive-two-factor.icon.ts  |  2 +-
 .../svg/svgs}/report-member-access.icon.ts    |  2 +-
 .../svg/svgs}/report-reused-passwords.icon.ts |  2 +-
 .../svgs}/report-unsecured-websites.icon.ts   |  2 +-
 .../svg/svgs}/report-weak-passwords.icon.ts   |  2 +-
 libs/assets/src/svg/svgs/restricted-view.ts   |  6 ++
 .../icons => assets/src/svg/svgs}/search.ts   |  2 +-
 .../src/svg/svgs/secrets-manager-alt.ts       |  4 +-
 .../src/svg/svgs}/secrets-manager.ts          |  2 +-
 .../src/svg/svgs}/secure-devices.ts           |  2 +-
 .../src/svg/svgs}/secure-user.ts              |  2 +-
 .../src/svg/svgs}/security-handshake.ts       |  2 +-
 .../icons => assets/src/svg/svgs}/security.ts |  2 +-
 .../icons => assets/src/svg/svgs}/send.ts     |  2 +-
 .../icons => assets/src/svg/svgs}/settings.ts |  2 +-
 .../src/svg/svgs}/shield.ts                   |  2 +-
 .../src/svg/svgs}/sso-key.icon.ts             |  4 +-
 .../src/svg/svgs/subscription-hidden.ts       |  4 +-
 .../src/svg/svgs}/totp.icon.ts                |  2 +-
 .../two-factor-auth-authenticator.icon.ts     |  4 +-
 .../src/svg/svgs}/two-factor-auth-duo.icon.ts |  4 +-
 .../svg/svgs}/two-factor-auth-email.icon.ts   |  4 +-
 .../two-factor-auth-security-key.icon.ts      |  4 +-
 .../svgs}/two-factor-auth-webauthn.icon.ts    |  4 +-
 .../svg/svgs}/two-factor-auth-yubico.icon.ts  |  4 +-
 .../src/svg/svgs}/two-factor-timeout.icon.ts  |  4 +-
 .../src/svg/svgs}/user-lock.icon.ts           |  4 +-
 ...erification-biometrics-fingerprint.icon.ts |  4 +-
 .../src/svg/svgs/vault-open.ts}               |  4 +-
 .../src/svg/svgs}/vault.icon.ts               |  4 +-
 .../icons => assets/src/svg/svgs}/vault.ts    |  2 +-
 .../src/svg/svgs}/wave.icon.ts                |  4 +-
 .../src/svg/svgs}/webauthn.icon.ts            |  2 +-
 libs/assets/tsconfig.eslint.json              |  6 ++
 libs/assets/tsconfig.json                     | 13 ++++
 libs/assets/tsconfig.lib.json                 | 10 +++
 libs/assets/tsconfig.spec.json                | 10 +++
 libs/auth/src/angular/icons/index.ts          | 11 ---
 .../angular/icons/two-factor-auth/index.ts    |  6 --
 libs/auth/src/angular/index.ts                |  3 -
 .../auth/src/angular/login/login.component.ts |  3 +-
 .../registration-link-expired.component.ts    |  3 +-
 .../registration-start.component.ts           |  5 +-
 .../two-factor-auth.component.ts              | 15 ++--
 .../two-factor-options.component.ts           | 15 ++--
 .../user-verification-form-input.component.ts |  3 +-
 .../anon-layout-wrapper.component.ts          |  2 +-
 .../anon-layout-wrapper.stories.ts            |  2 +-
 .../src/anon-layout/anon-layout.component.ts  | 17 +++--
 .../src/anon-layout/anon-layout.mdx           |  9 ++-
 .../src/anon-layout/anon-layout.stories.ts    |  3 +-
 .../src/anon-layout/illustrations/index.ts    |  2 -
 libs/components/src/icon/icon.component.ts    |  2 +-
 .../src/icon/icon.components.spec.ts          |  3 +-
 libs/components/src/icon/icon.mdx             |  9 +--
 libs/components/src/icon/icon.stories.ts      | 13 ++--
 libs/components/src/icon/icons/index.ts       | 12 ----
 libs/components/src/icon/index.ts             |  9 ---
 .../src/icon/logos/bitwarden/index.ts         |  6 --
 libs/components/src/icon/logos/index.ts       |  1 -
 .../src/navigation/nav-logo.component.ts      |  4 +-
 .../src/no-items/no-items.component.ts        |  5 +-
 .../kitchen-sink/kitchen-sink.stories.ts      |  2 +-
 libs/components/tailwind.config.base.js       |  1 +
 libs/components/tailwind.config.js            |  1 +
 .../src/empty-credential-history.component.ts |  3 +-
 libs/tools/send/send-ui/src/icons/index.ts    |  3 -
 libs/tools/send/send-ui/src/index.ts          |  1 -
 .../carousel-button.component.ts              |  2 +-
 libs/vault/src/icons/index.ts                 | 11 ---
 libs/vault/src/index.ts                       |  2 -
 package-lock.json                             |  9 +++
 tailwind.config.js                            |  1 +
 tsconfig.base.json                            |  2 +
 179 files changed, 579 insertions(+), 525 deletions(-)
 delete mode 100644 apps/web/src/app/admin-console/icons/index.ts
 delete mode 100644 apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-passkey-failed.icon.ts
 delete mode 100644 apps/web/src/app/layouts/password-manager-logo.ts
 delete mode 100644 libs/angular/src/auth/icons/create-passkey.icon.ts
 create mode 100644 libs/assets/README.md
 create mode 100644 libs/assets/eslint.config.mjs
 create mode 100644 libs/assets/jest.config.js
 create mode 100644 libs/assets/package.json
 create mode 100644 libs/assets/project.json
 rename libs/{components/src/icon/icon.spec.ts => assets/src/svg/icon-service.spec.ts} (94%)
 rename libs/{components/src/icon/icon.ts => assets/src/svg/icon-service.ts} (100%)
 create mode 100644 libs/assets/src/svg/index.ts
 rename libs/{tools/send/send-ui/src/icons => assets/src/svg/svgs}/active-send.icon.ts (98%)
 rename libs/{components/src/icon/logos/bitwarden => assets/src/svg/svgs}/admin-console.ts (99%)
 rename libs/{components/src/anon-layout/illustrations/left-illustration.ts => assets/src/svg/svgs/background-left-illustration.ts} (99%)
 rename libs/{components/src/anon-layout/illustrations/right-illustration.ts => assets/src/svg/svgs/background-right-illustration.ts} (99%)
 rename libs/{vault/src/icons => assets/src/svg/svgs}/bitwarden-icon.ts (97%)
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/bitwarden-logo.icon.ts (99%)
 rename libs/{vault/src/icons => assets/src/svg/svgs}/browser-extension.ts (97%)
 rename libs/{components/src/icon/logos/bitwarden => assets/src/svg/svgs}/business-unit-portal.ts (99%)
 rename libs/{vault/src/components/carousel/carousel-icons => assets/src/svg/svgs}/carousel-icon.ts (85%)
 rename libs/{angular/src/auth/icons => assets/src/svg/svgs}/create-passkey-failed.icon.ts (98%)
 rename {apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog => libs/assets/src/svg/svgs}/create-passkey.icon.ts (98%)
 rename libs/{vault/src/icons => assets/src/svg/svgs}/deactivated-org.ts (98%)
 rename libs/{auth/src/angular/icons => assets/src/svg/svgs}/device-verification.icon.ts (89%)
 rename libs/{auth/src/angular/icons => assets/src/svg/svgs}/devices.icon.ts (91%)
 rename {apps/web/src/app/admin-console/icons => libs/assets/src/svg/svgs}/devices.ts (98%)
 rename libs/{angular/src/auth/icons => assets/src/svg/svgs}/email.icon.ts (92%)
 rename libs/{vault/src/icons => assets/src/svg/svgs}/empty-trash.ts (99%)
 rename libs/{tools/send/send-ui/src/icons => assets/src/svg/svgs}/expired-send.icon.ts (98%)
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/extension-bitwarden-logo.icon.ts (99%)
 create mode 100644 libs/assets/src/svg/svgs/gear.ts
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/generator.ts (98%)
 create mode 100644 libs/assets/src/svg/svgs/index.ts
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/lock.icon.ts (98%)
 rename libs/{vault/src/icons => assets/src/svg/svgs}/login-cards.ts (98%)
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/no-access.ts (96%)
 rename libs/{tools/generator/components/src/icons => assets/src/svg/svgs}/no-credentials.icon.ts (99%)
 rename libs/{vault/src/icons => assets/src/svg/svgs}/no-folders.ts (98%)
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/no-results.ts (98%)
 rename libs/{tools/send/send-ui/src/icons => assets/src/svg/svgs}/no-send.icon.ts (97%)
 create mode 100644 libs/assets/src/svg/svgs/partner-trust.ts
 rename libs/{vault/src/icons => assets/src/svg/svgs}/party.ts (99%)
 rename libs/{components/src/icon/logos/bitwarden => assets/src/svg/svgs}/password-manager.ts (99%)
 rename libs/{components/src/icon/logos/bitwarden => assets/src/svg/svgs}/provider-portal.ts (99%)
 rename libs/{angular/src/auth/icons => assets/src/svg/svgs}/recovery.icon.ts (98%)
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/registration-check-email.icon.ts (97%)
 rename libs/{auth/src/angular/icons => assets/src/svg/svgs}/registration-expired-link.icon.ts (83%)
 rename libs/{auth/src/angular/icons => assets/src/svg/svgs}/registration-lock-alt.icon.ts (94%)
 rename libs/{auth/src/angular/icons => assets/src/svg/svgs}/registration-user-add.icon.ts (93%)
 rename {apps/web/src/app/dirt/reports/icons => libs/assets/src/svg/svgs}/report-breach.icon.ts (96%)
 rename {apps/web/src/app/dirt/reports/icons => libs/assets/src/svg/svgs}/report-exposed-passwords.icon.ts (97%)
 rename {apps/web/src/app/dirt/reports/icons => libs/assets/src/svg/svgs}/report-inactive-two-factor.icon.ts (94%)
 rename {apps/web/src/app/dirt/reports/icons => libs/assets/src/svg/svgs}/report-member-access.icon.ts (96%)
 rename {apps/web/src/app/dirt/reports/icons => libs/assets/src/svg/svgs}/report-reused-passwords.icon.ts (96%)
 rename {apps/web/src/app/dirt/reports/icons => libs/assets/src/svg/svgs}/report-unsecured-websites.icon.ts (94%)
 rename {apps/web/src/app/dirt/reports/icons => libs/assets/src/svg/svgs}/report-weak-passwords.icon.ts (95%)
 create mode 100644 libs/assets/src/svg/svgs/restricted-view.ts
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/search.ts (98%)
 rename apps/web/src/app/layouts/secrets-manager-logo.ts => libs/assets/src/svg/svgs/secrets-manager-alt.ts (99%)
 rename libs/{components/src/icon/logos/bitwarden => assets/src/svg/svgs}/secrets-manager.ts (99%)
 rename libs/{vault/src/icons => assets/src/svg/svgs}/secure-devices.ts (97%)
 rename libs/{vault/src/icons => assets/src/svg/svgs}/secure-user.ts (98%)
 rename libs/{vault/src/icons => assets/src/svg/svgs}/security-handshake.ts (99%)
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/security.ts (99%)
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/send.ts (97%)
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/settings.ts (99%)
 rename libs/{components/src/icon/logos/bitwarden => assets/src/svg/svgs}/shield.ts (98%)
 rename libs/{auth/src/angular/icons => assets/src/svg/svgs}/sso-key.icon.ts (92%)
 rename apps/web/src/app/billing/organizations/icons/subscription-hidden.icon.ts => libs/assets/src/svg/svgs/subscription-hidden.ts (99%)
 rename libs/{angular/src/auth/icons => assets/src/svg/svgs}/totp.icon.ts (98%)
 rename libs/{auth/src/angular/icons/two-factor-auth => assets/src/svg/svgs}/two-factor-auth-authenticator.icon.ts (96%)
 rename libs/{auth/src/angular/icons/two-factor-auth => assets/src/svg/svgs}/two-factor-auth-duo.icon.ts (81%)
 rename libs/{auth/src/angular/icons/two-factor-auth => assets/src/svg/svgs}/two-factor-auth-email.icon.ts (90%)
 rename libs/{auth/src/angular/icons/two-factor-auth => assets/src/svg/svgs}/two-factor-auth-security-key.icon.ts (96%)
 rename libs/{auth/src/angular/icons/two-factor-auth => assets/src/svg/svgs}/two-factor-auth-webauthn.icon.ts (96%)
 rename libs/{auth/src/angular/icons/two-factor-auth => assets/src/svg/svgs}/two-factor-auth-yubico.icon.ts (93%)
 rename libs/{auth/src/angular/icons => assets/src/svg/svgs}/two-factor-timeout.icon.ts (88%)
 rename libs/{auth/src/angular/icons => assets/src/svg/svgs}/user-lock.icon.ts (95%)
 rename libs/{auth/src/angular/icons => assets/src/svg/svgs}/user-verification-biometrics-fingerprint.icon.ts (92%)
 rename libs/{vault/src/icons/vault.ts => assets/src/svg/svgs/vault-open.ts} (98%)
 rename libs/{auth/src/angular/icons => assets/src/svg/svgs}/vault.icon.ts (92%)
 rename libs/{components/src/icon/icons => assets/src/svg/svgs}/vault.ts (99%)
 rename libs/{auth/src/angular/icons => assets/src/svg/svgs}/wave.icon.ts (90%)
 rename libs/{angular/src/auth/icons => assets/src/svg/svgs}/webauthn.icon.ts (96%)
 create mode 100644 libs/assets/tsconfig.eslint.json
 create mode 100644 libs/assets/tsconfig.json
 create mode 100644 libs/assets/tsconfig.lib.json
 create mode 100644 libs/assets/tsconfig.spec.json
 delete mode 100644 libs/auth/src/angular/icons/index.ts
 delete mode 100644 libs/auth/src/angular/icons/two-factor-auth/index.ts
 delete mode 100644 libs/components/src/anon-layout/illustrations/index.ts
 delete mode 100644 libs/components/src/icon/icons/index.ts
 delete mode 100644 libs/components/src/icon/logos/bitwarden/index.ts
 delete mode 100644 libs/components/src/icon/logos/index.ts
 delete mode 100644 libs/tools/send/send-ui/src/icons/index.ts
 delete mode 100644 libs/vault/src/icons/index.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4b956fd577a..df71b6545fb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -156,6 +156,7 @@ apps/desktop/desktop_native/core/src/ssh_agent @bitwarden/team-autofill-dev @bit
 ## UI Foundation ##
 .storybook @bitwarden/team-ui-foundation
 libs/components @bitwarden/team-ui-foundation
+libs/assets @bitwarden/team-ui-foundation
 libs/ui @bitwarden/team-ui-foundation
 apps/browser/src/platform/popup/layout @bitwarden/team-ui-foundation
 apps/browser/src/popup/app-routing.animations.ts @bitwarden/team-ui-foundation
diff --git a/apps/browser/src/autofill/popup/fido2/fido2.component.ts b/apps/browser/src/autofill/popup/fido2/fido2.component.ts
index ac38fe2f894..11e00749bdf 100644
--- a/apps/browser/src/autofill/popup/fido2/fido2.component.ts
+++ b/apps/browser/src/autofill/popup/fido2/fido2.component.ts
@@ -18,6 +18,7 @@ import {
 } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { NoResults } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
@@ -36,7 +37,6 @@ import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.
 import {
   ButtonModule,
   DialogService,
-  Icons,
   ItemModule,
   NoItemsModule,
   SearchModule,
@@ -102,7 +102,7 @@ export class Fido2Component implements OnInit, OnDestroy {
   protected equivalentDomainsURL: string;
   protected hostname: string;
   protected loading = false;
-  protected noResultsIcon = Icons.NoResults;
+  protected noResultsIcon = NoResults;
   protected passkeyAction: PasskeyActionValue = PasskeyActions.Register;
   protected PasskeyActions = PasskeyActions;
   protected hasSearched = false;
diff --git a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
index 7455921b08b..a7103fdfd3c 100644
--- a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
+++ b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
@@ -4,6 +4,16 @@ import { Component, importProvidersFrom } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import { Meta, StoryObj, applicationConfig, moduleMetadata } from "@storybook/angular";
 
+import {
+  GeneratorActive,
+  GeneratorInactive,
+  SendActive,
+  SendInactive,
+  SettingsActive,
+  SettingsInactive,
+  VaultActive,
+  VaultInactive,
+} from "@bitwarden/assets/svg";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
@@ -13,7 +23,6 @@ import {
   BannerModule,
   ButtonModule,
   I18nMockService,
-  Icons,
   IconButtonModule,
   ItemModule,
   NoItemsModule,
@@ -404,26 +413,26 @@ const navButtons = (showBerry = false) => [
   {
     label: "vault",
     page: "/tabs/vault",
-    icon: Icons.VaultInactive,
-    iconActive: Icons.VaultActive,
+    icon: VaultInactive,
+    iconActive: VaultActive,
   },
   {
     label: "generator",
     page: "/tabs/generator",
-    icon: Icons.GeneratorInactive,
-    iconActive: Icons.GeneratorActive,
+    icon: GeneratorInactive,
+    iconActive: GeneratorActive,
   },
   {
     label: "send",
     page: "/tabs/send",
-    icon: Icons.SendInactive,
-    iconActive: Icons.SendActive,
+    icon: SendInactive,
+    iconActive: SendActive,
   },
   {
     label: "settings",
     page: "/tabs/settings",
-    icon: Icons.SettingsInactive,
-    iconActive: Icons.SettingsActive,
+    icon: SettingsInactive,
+    iconActive: SettingsActive,
     showBerry: showBerry,
   },
 ];
diff --git a/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts b/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts
index 8a897e2e21b..742b12bb7ad 100644
--- a/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts
+++ b/apps/browser/src/platform/popup/layout/popup-tab-navigation.component.ts
@@ -3,8 +3,9 @@ import { Component, Input } from "@angular/core";
 import { RouterModule } from "@angular/router";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { Icon } from "@bitwarden/assets/svg";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { Icon, IconModule, LinkModule } from "@bitwarden/components";
+import { IconModule, LinkModule } from "@bitwarden/components";
 
 export type NavButton = {
   label: string;
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index e2f4561e86c..34a37da425e 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -17,28 +17,31 @@ import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-ma
 import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import {
   DevicesIcon,
+  RegistrationLockAltIcon,
+  RegistrationUserAddIcon,
+  TwoFactorTimeoutIcon,
+  DeviceVerificationIcon,
+  UserLockIcon,
+  VaultIcon,
+  LockIcon,
+} from "@bitwarden/assets/svg";
+import {
   LoginComponent,
   LoginDecryptionOptionsComponent,
   LoginSecondaryContentComponent,
   LoginViaAuthRequestComponent,
   PasswordHintComponent,
   RegistrationFinishComponent,
-  RegistrationLockAltIcon,
   RegistrationStartComponent,
   RegistrationStartSecondaryComponent,
   RegistrationStartSecondaryComponentData,
-  RegistrationUserAddIcon,
   SsoComponent,
-  TwoFactorTimeoutIcon,
   TwoFactorAuthComponent,
   TwoFactorAuthGuard,
   NewDeviceVerificationComponent,
-  DeviceVerificationIcon,
-  UserLockIcon,
-  VaultIcon,
 } from "@bitwarden/auth/angular";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { AnonLayoutWrapperData, Icons } from "@bitwarden/components";
+import { AnonLayoutWrapperData } from "@bitwarden/components";
 import { LockComponent } from "@bitwarden/key-management-ui";
 
 import { AccountSwitcherComponent } from "../auth/popup/account-switching/account-switcher.component";
@@ -497,7 +500,7 @@ const routes: Routes = [
         path: "lock",
         canActivate: [lockGuard()],
         data: {
-          pageIcon: Icons.LockIcon,
+          pageIcon: LockIcon,
           pageTitle: {
             key: "yourVaultIsLockedV2",
           },
diff --git a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
index 7a98f570fda..3b84eac2217 100644
--- a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
+++ b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component.ts
@@ -5,10 +5,9 @@ import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute, Data, NavigationEnd, Router, RouterModule } from "@angular/router";
 import { Subject, filter, switchMap, takeUntil, tap } from "rxjs";
 
+import { ExtensionBitwardenLogo, Icon } from "@bitwarden/assets/svg";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import {
-  Icon,
-  Icons,
   IconModule,
   Translation,
   AnonLayoutComponent,
@@ -63,7 +62,7 @@ export class ExtensionAnonLayoutWrapperComponent implements OnInit, OnDestroy {
   protected hideCardWrapper: boolean = false;
 
   protected theme: string;
-  protected logo = Icons.ExtensionBitwardenLogo;
+  protected logo = ExtensionBitwardenLogo;
 
   constructor(
     private router: Router,
diff --git a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
index 2c3d09b79fb..4e6f2fb452d 100644
--- a/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
+++ b/apps/browser/src/popup/components/extension-anon-layout-wrapper/extension-anon-layout-wrapper.stories.ts
@@ -9,6 +9,7 @@ import {
 } from "@storybook/angular";
 import { of } from "rxjs";
 
+import { LockIcon, RegistrationCheckEmailIcon } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AvatarService } from "@bitwarden/common/auth/abstractions/avatar.service";
@@ -22,12 +23,7 @@ import {
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { UserId } from "@bitwarden/common/types/guid";
-import {
-  AnonLayoutWrapperDataService,
-  ButtonModule,
-  Icons,
-  I18nMockService,
-} from "@bitwarden/components";
+import { AnonLayoutWrapperDataService, ButtonModule, I18nMockService } from "@bitwarden/components";
 
 import { AccountSwitcherService } from "../../../auth/popup/account-switching/services/account-switcher.service";
 import { PopupRouterCacheService } from "../../../platform/popup/view-cache/popup-router-cache.service";
@@ -244,7 +240,7 @@ const initialData: ExtensionAnonLayoutWrapperData = {
   pageSubtitle: {
     key: "finishCreatingYourAccountBySettingAPassword",
   },
-  pageIcon: Icons.LockIcon,
+  pageIcon: LockIcon,
   showAcctSwitcher: true,
   showBackButton: true,
   showLogo: true,
@@ -258,7 +254,7 @@ const changedData: ExtensionAnonLayoutWrapperData = {
   pageSubtitle: {
     key: "checkYourEmail",
   },
-  pageIcon: Icons.RegistrationCheckEmailIcon,
+  pageIcon: RegistrationCheckEmailIcon,
   showAcctSwitcher: false,
   showBackButton: false,
   showLogo: false,
diff --git a/apps/browser/src/popup/tabs-v2.component.ts b/apps/browser/src/popup/tabs-v2.component.ts
index 860b71794ff..f1e42799b35 100644
--- a/apps/browser/src/popup/tabs-v2.component.ts
+++ b/apps/browser/src/popup/tabs-v2.component.ts
@@ -2,9 +2,18 @@ import { Component } from "@angular/core";
 import { map, Observable, startWith, switchMap } from "rxjs";
 
 import { NudgesService } from "@bitwarden/angular/vault";
+import {
+  VaultInactive,
+  VaultActive,
+  GeneratorInactive,
+  GeneratorActive,
+  SendInactive,
+  SendActive,
+  SettingsInactive,
+  SettingsActive,
+} from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { Icons } from "@bitwarden/components";
 
 import { NavButton } from "../platform/popup/layout/popup-tab-navigation.component";
 
@@ -24,26 +33,26 @@ export class TabsV2Component {
         {
           label: "vault",
           page: "/tabs/vault",
-          icon: Icons.VaultInactive,
-          iconActive: Icons.VaultActive,
+          icon: VaultInactive,
+          iconActive: VaultActive,
         },
         {
           label: "generator",
           page: "/tabs/generator",
-          icon: Icons.GeneratorInactive,
-          iconActive: Icons.GeneratorActive,
+          icon: GeneratorInactive,
+          iconActive: GeneratorActive,
         },
         {
           label: "send",
           page: "/tabs/send",
-          icon: Icons.SendInactive,
-          iconActive: Icons.SendActive,
+          icon: SendInactive,
+          iconActive: SendActive,
         },
         {
           label: "settings",
           page: "/tabs/settings",
-          icon: Icons.SettingsInactive,
-          iconActive: Icons.SettingsActive,
+          icon: SettingsInactive,
+          iconActive: SettingsActive,
           showBerry: hasBadges,
         },
       ];
diff --git a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
index dd9e95b64a1..30359e98fa0 100644
--- a/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-created/send-created.component.ts
@@ -7,13 +7,13 @@ import { ActivatedRoute, Router, RouterModule } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { ActiveSendIcon } from "@bitwarden/assets/svg";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SendView } from "@bitwarden/common/tools/send/models/view/send.view";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { ButtonModule, IconModule, ToastService } from "@bitwarden/components";
-import { ActiveSendIcon } from "@bitwarden/send-ui";
 
 import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component";
 import { PopupFooterComponent } from "../../../../platform/popup/layout/popup-footer.component";
diff --git a/apps/browser/src/tools/popup/send-v2/send-v2.component.ts b/apps/browser/src/tools/popup/send-v2/send-v2.component.ts
index 2fca3e41f88..5bd5386b1e0 100644
--- a/apps/browser/src/tools/popup/send-v2/send-v2.component.ts
+++ b/apps/browser/src/tools/popup/send-v2/send-v2.component.ts
@@ -4,15 +4,15 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { combineLatest, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { NoResults, NoSendsIcon } from "@bitwarden/assets/svg";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
-import { ButtonModule, CalloutModule, Icons, NoItemsModule } from "@bitwarden/components";
+import { ButtonModule, CalloutModule, NoItemsModule } from "@bitwarden/components";
 import {
   NewSendDropdownComponent,
-  NoSendsIcon,
   SendItemsService,
   SendListFiltersComponent,
   SendListFiltersService,
@@ -59,7 +59,7 @@ export class SendV2Component implements OnDestroy {
   protected sendsLoading$ = this.sendItemsService.loading$;
   protected title: string = "allSends";
   protected noItemIcon = NoSendsIcon;
-  protected noResultsIcon = Icons.NoResults;
+  protected noResultsIcon = NoResults;
 
   protected sendsDisabled = false;
 
diff --git a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts
index 527f0f246af..22149f9dc86 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/intro-carousel/intro-carousel.component.ts
@@ -2,9 +2,10 @@ import { Component } from "@angular/core";
 import { Router } from "@angular/router";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { SecurityHandshake, LoginCards, SecureUser, SecureDevices } from "@bitwarden/assets/svg";
 import { ButtonModule, DialogModule, IconModule, TypographyModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
-import { VaultCarouselModule, VaultIcons } from "@bitwarden/vault";
+import { VaultCarouselModule } from "@bitwarden/vault";
 
 import { IntroCarouselService } from "../../../services/intro-carousel.service";
 
@@ -22,10 +23,10 @@ import { IntroCarouselService } from "../../../services/intro-carousel.service";
   ],
 })
 export class IntroCarouselComponent {
-  protected securityHandshake = VaultIcons.SecurityHandshake;
-  protected loginCards = VaultIcons.LoginCards;
-  protected secureUser = VaultIcons.SecureUser;
-  protected secureDevices = VaultIcons.SecureDevices;
+  protected securityHandshake = SecurityHandshake;
+  protected loginCards = LoginCards;
+  protected secureUser = SecureUser;
+  protected secureDevices = SecureDevices;
 
   constructor(
     private router: Router,
diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
index 0340c82369d..604cc6b73ef 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-v2.component.ts
@@ -18,6 +18,7 @@ import {
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { NudgesService, NudgeType } from "@bitwarden/angular/vault";
 import { SpotlightComponent } from "@bitwarden/angular/vault/components/spotlight/spotlight.component";
+import { DeactivatedOrg, NoResults, VaultOpen } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -28,11 +29,10 @@ import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import {
   ButtonModule,
   DialogService,
-  Icons,
   NoItemsModule,
   TypographyModule,
 } from "@bitwarden/components";
-import { DecryptionFailureDialogComponent, VaultIcons } from "@bitwarden/vault";
+import { DecryptionFailureDialogComponent } from "@bitwarden/vault";
 
 import { CurrentAccountComponent } from "../../../../auth/popup/account-switching/current-account.component";
 import { BrowserApi } from "../../../../platform/browser/browser-api";
@@ -136,9 +136,9 @@ export class VaultV2Component implements OnInit, AfterViewInit, OnDestroy {
   /** Visual state of the vault */
   protected vaultState: VaultState | null = null;
 
-  protected vaultIcon = VaultIcons.Vault;
-  protected deactivatedIcon = VaultIcons.DeactivatedOrg;
-  protected noResultsIcon = Icons.NoResults;
+  protected vaultIcon = VaultOpen;
+  protected deactivatedIcon = DeactivatedOrg;
+  protected noResultsIcon = NoResults;
 
   protected VaultStateEnum = VaultState;
 
diff --git a/apps/browser/src/vault/popup/settings/folders-v2.component.ts b/apps/browser/src/vault/popup/settings/folders-v2.component.ts
index 2264415f4fa..b749f651d53 100644
--- a/apps/browser/src/vault/popup/settings/folders-v2.component.ts
+++ b/apps/browser/src/vault/popup/settings/folders-v2.component.ts
@@ -3,6 +3,7 @@ import { Component } from "@angular/core";
 import { filter, map, Observable, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { NoFolders } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { UserId } from "@bitwarden/common/types/guid";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
@@ -15,7 +16,7 @@ import {
   ItemModule,
   NoItemsModule,
 } from "@bitwarden/components";
-import { AddEditFolderDialogComponent, VaultIcons } from "@bitwarden/vault";
+import { AddEditFolderDialogComponent } from "@bitwarden/vault";
 
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
@@ -39,7 +40,7 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co
 export class FoldersV2Component {
   folders$: Observable<FolderView[]>;
 
-  NoFoldersIcon = VaultIcons.NoFolders;
+  NoFoldersIcon = NoFolders;
   private activeUserId$ = this.accountService.activeAccount$.pipe(map((a) => a?.id));
 
   constructor(
diff --git a/apps/browser/src/vault/popup/settings/trash.component.ts b/apps/browser/src/vault/popup/settings/trash.component.ts
index d6e5f899bba..b9d6b621bba 100644
--- a/apps/browser/src/vault/popup/settings/trash.component.ts
+++ b/apps/browser/src/vault/popup/settings/trash.component.ts
@@ -2,8 +2,8 @@ import { CommonModule } from "@angular/common";
 import { ChangeDetectionStrategy, Component } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { EmptyTrash } from "@bitwarden/assets/svg";
 import { CalloutModule, NoItemsModule } from "@bitwarden/components";
-import { VaultIcons } from "@bitwarden/vault";
 
 import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
 import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component";
@@ -29,7 +29,7 @@ import { TrashListItemsContainerComponent } from "./trash-list-items-container/t
 export class TrashComponent {
   protected deletedCiphers$ = this.vaultPopupItemsService.deletedCiphers$;
 
-  protected emptyTrashIcon = VaultIcons.EmptyTrash;
+  protected emptyTrashIcon = EmptyTrash;
 
   constructor(private vaultPopupItemsService: VaultPopupItemsService) {}
 }
diff --git a/apps/browser/tailwind.config.js b/apps/browser/tailwind.config.js
index 02e1d86f5ac..1ad56562bb3 100644
--- a/apps/browser/tailwind.config.js
+++ b/apps/browser/tailwind.config.js
@@ -4,6 +4,7 @@ const config = require("../../libs/components/tailwind.config.base");
 config.content = [
   "./src/**/*.{html,ts}",
   "../../libs/components/src/**/*.{html,ts}",
+  "../../libs/assets/src/**/*.{html,ts}",
   "../../libs/auth/src/**/*.{html,ts}",
   "../../libs/key-management-ui/src/**/*.{html,ts}",
   "../../libs/vault/src/**/*.{html,ts}",
diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts
index db079cd60f9..1cfe8a85386 100644
--- a/apps/desktop/src/app/app-routing.module.ts
+++ b/apps/desktop/src/app/app-routing.module.ts
@@ -12,29 +12,32 @@ import {
   unauthGuardFn,
 } from "@bitwarden/angular/auth/guards";
 import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-management/change-password";
+import {
+  DevicesIcon,
+  RegistrationLockAltIcon,
+  RegistrationUserAddIcon,
+  TwoFactorTimeoutIcon,
+  DeviceVerificationIcon,
+  UserLockIcon,
+  VaultIcon,
+  LockIcon,
+} from "@bitwarden/assets/svg";
 import {
   LoginComponent,
   LoginSecondaryContentComponent,
   LoginViaAuthRequestComponent,
   PasswordHintComponent,
   RegistrationFinishComponent,
-  RegistrationLockAltIcon,
   RegistrationStartComponent,
   RegistrationStartSecondaryComponent,
   RegistrationStartSecondaryComponentData,
-  RegistrationUserAddIcon,
-  UserLockIcon,
-  VaultIcon,
   LoginDecryptionOptionsComponent,
-  DevicesIcon,
   SsoComponent,
-  TwoFactorTimeoutIcon,
   TwoFactorAuthComponent,
   TwoFactorAuthGuard,
   NewDeviceVerificationComponent,
-  DeviceVerificationIcon,
 } from "@bitwarden/auth/angular";
-import { AnonLayoutWrapperComponent, AnonLayoutWrapperData, Icons } from "@bitwarden/components";
+import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/components";
 import { LockComponent } from "@bitwarden/key-management-ui";
 
 import { maxAccountsGuardFn } from "../auth/guards/max-accounts.guard";
@@ -260,7 +263,7 @@ const routes: Routes = [
         path: "lock",
         canActivate: [lockGuard()],
         data: {
-          pageIcon: Icons.LockIcon,
+          pageIcon: LockIcon,
           pageTitle: {
             key: "yourVaultIsLockedV2",
           },
diff --git a/apps/desktop/tailwind.config.js b/apps/desktop/tailwind.config.js
index 5b4cab027ba..bf65ae8d7cb 100644
--- a/apps/desktop/tailwind.config.js
+++ b/apps/desktop/tailwind.config.js
@@ -4,6 +4,7 @@ const config = require("../../libs/components/tailwind.config.base");
 config.content = [
   "./src/**/*.{html,ts}",
   "../../libs/components/src/**/*.{html,ts}",
+  "../../libs/assets/src/**/*.{html,ts}",
   "../../libs/auth/src/**/*.{html,ts}",
   "../../libs/key-management-ui/src/**/*.{html,ts}",
   "../../libs/angular/src/**/*.{html,ts}",
diff --git a/apps/web/src/app/admin-console/icons/index.ts b/apps/web/src/app/admin-console/icons/index.ts
deleted file mode 100644
index e0c2c124af1..00000000000
--- a/apps/web/src/app/admin-console/icons/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./devices";
diff --git a/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts b/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts
index 3f26e03e203..86b83d75ca4 100644
--- a/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/collection-access-restricted.component.ts
@@ -1,15 +1,11 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
 
-import { ButtonModule, NoItemsModule, svgIcon } from "@bitwarden/components";
+import { RestrictedView } from "@bitwarden/assets/svg";
+import { ButtonModule, NoItemsModule } from "@bitwarden/components";
 
 import { SharedModule } from "../../../shared";
 import { CollectionDialogTabType } from "../shared/components/collection-dialog";
 
-const icon = svgIcon`<svg xmlns="http://www.w3.org/2000/svg" width="120" height="120" viewBox="10 -10 120 140" fill="none">
-  <rect class="tw-stroke-secondary-600" width="134" height="86" x="3" y="31.485" stroke-width="6" rx="11"/>
-  <path class="tw-fill-secondary-600" d="M123.987 20.15H14.779a3.114 3.114 0 0 1-2.083-.95 3.036 3.036 0 0 1 0-4.208 3.125 3.125 0 0 1 2.083-.951h109.208c.792.043 1.536.38 2.083.95a3.035 3.035 0 0 1 0 4.208 3.115 3.115 0 0 1-2.083.95Zm-6.649-14.041h-95.91a3.114 3.114 0 0 1-2.082-.95 3.036 3.036 0 0 1-.848-2.105c0-.782.306-1.538.848-2.104A3.125 3.125 0 0 1 21.43 0h95.909c.791.043 1.535.38 2.082.95.547.57.849 1.322.849 2.104a3.05 3.05 0 0 1-.849 2.104 3.115 3.115 0 0 1-2.082.95ZM95.132 74.407A42.317 42.317 0 0 0 83.59 65.43l8.799-8.657a1.59 1.59 0 0 0 .004-2.27 1.641 1.641 0 0 0-2.298-.004l-9.64 9.479a28.017 28.017 0 0 0-10.483-2.13c-14.323 0-24.814 12.342-25.298 12.89a2.431 2.431 0 0 0-.675 1.64c-.01.612.215 1.203.626 1.66a43.981 43.981 0 0 0 11.873 9.485l-8.806 8.658a1.601 1.601 0 0 0-.499 1.138 1.602 1.602 0 0 0 1.008 1.5 1.651 1.651 0 0 0 1.255-.009c.199-.085.379-.205.528-.359l9.634-9.443a27.16 27.16 0 0 0 10.359 2.158c14.323 0 24.753-12.086 25.23-12.63a2.983 2.983 0 0 0-.078-4.128h.002ZM49.204 77.82a1.82 1.82 0 0 1-.43-.6 1.767 1.767 0 0 1-.152-.72 1.778 1.778 0 0 1 .582-1.32c3.857-3.564 11.782-9.686 20.77-9.676 2.564.037 5.105.508 7.508 1.395l-3.291 3.235a7.793 7.793 0 0 0-5.02-1.226 7.746 7.746 0 0 0-4.676 2.18 7.528 7.528 0 0 0-1 9.563l-4.199 4.143a43.135 43.135 0 0 1-10.092-6.974Zm26.059-1.318a5.19 5.19 0 0 1-1.557 3.68 5.326 5.326 0 0 1-3.733 1.521c-.82-.005-1.63-.2-2.359-.57l7.067-6.952c.377.718.575 1.513.582 2.321Zm-10.58 0a5.136 5.136 0 0 1 .673-2.555 5.204 5.204 0 0 1 1.862-1.897 5.302 5.302 0 0 1 5.172-.146l-7.096 6.977a5.06 5.06 0 0 1-.61-2.379Zm26.053 1.331c-3.857 3.56-11.779 9.677-20.763 9.677a22.723 22.723 0 0 1-7.454-1.369l3.292-3.226a7.793 7.793 0 0 0 4.995 1.192 7.734 7.734 0 0 0 4.642-2.176 7.524 7.524 0 0 0 1.033-9.506l4.224-4.168a43.258 43.258 0 0 1 10.02 6.945 1.788 1.788 0 0 1 .585 1.313 1.788 1.788 0 0 1-.577 1.318h.003Z"/>
-</svg>`;
-
 @Component({
   selector: "collection-access-restricted",
   imports: [SharedModule, ButtonModule, NoItemsModule],
@@ -38,7 +34,7 @@ const icon = svgIcon`<svg xmlns="http://www.w3.org/2000/svg" width="120" height=
   </bit-no-items>`,
 })
 export class CollectionAccessRestrictedComponent {
-  protected icon = icon;
+  protected icon = RestrictedView;
   protected collectionDialogTabType = CollectionDialogTabType;
 
   @Input() canEditCollection = false;
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault.component.ts b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts
index 87f309c6f66..8e4d844a871 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault.component.ts
+++ b/apps/web/src/app/admin-console/organizations/collections/vault.component.ts
@@ -34,6 +34,7 @@ import {
   Unassigned,
 } from "@bitwarden/admin-console/common";
 import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
+import { Search } from "@bitwarden/assets/svg";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
@@ -66,7 +67,6 @@ import {
   BannerModule,
   DialogRef,
   DialogService,
-  Icons,
   NoItemsModule,
   ToastService,
 } from "@bitwarden/components";
@@ -170,7 +170,7 @@ export class VaultComponent implements OnInit, OnDestroy {
   activeFilter: VaultFilter = new VaultFilter();
 
   protected showAddAccessToggle = false;
-  protected noItemIcon = Icons.Search;
+  protected noItemIcon = Search;
   protected performingInitialLoad = true;
   protected refreshing = false;
   protected processingEvent = false;
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
index 4b6e9a431b4..87b9d62f398 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
@@ -6,6 +6,7 @@ import { ActivatedRoute, RouterModule } from "@angular/router";
 import { combineLatest, filter, map, Observable, switchMap, withLatestFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AdminConsoleLogo } from "@bitwarden/assets/svg";
 import {
   canAccessBillingTab,
   canAccessGroupsTab,
@@ -27,7 +28,7 @@ import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { getById } from "@bitwarden/common/platform/misc";
-import { BannerModule, IconModule, AdminConsoleLogo } from "@bitwarden/components";
+import { BannerModule, IconModule } from "@bitwarden/components";
 import { OrganizationWarningsModule } from "@bitwarden/web-vault/app/billing/organizations/warnings/organization-warnings.module";
 import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/organizations/warnings/services";
 import { NonIndividualSubscriber } from "@bitwarden/web-vault/app/billing/types";
diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
index 2ca566a0af2..c4fe0350006 100644
--- a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
@@ -4,10 +4,11 @@ import { CommonModule } from "@angular/common";
 import { Component, inject } from "@angular/core";
 import { Params } from "@angular/router";
 
+import { BitwardenLogo } from "@bitwarden/assets/svg";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { OrganizationSponsorshipResponse } from "@bitwarden/common/admin-console/models/response/organization-sponsorship.response";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { IconModule, Icons, ToastService } from "@bitwarden/components";
+import { IconModule, ToastService } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
 import { BaseAcceptComponent } from "../../../common/base.accept.component";
@@ -22,7 +23,7 @@ import { BaseAcceptComponent } from "../../../common/base.accept.component";
   imports: [CommonModule, I18nPipe, IconModule],
 })
 export class AcceptFamilySponsorshipComponent extends BaseAcceptComponent {
-  protected logo = Icons.BitwardenLogo;
+  protected logo = BitwardenLogo;
   failedShortMessage = "inviteAcceptFailedShort";
   failedMessage = "inviteAcceptFailed";
 
diff --git a/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.ts b/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.ts
index d4a381159ab..443005473c4 100644
--- a/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.ts
+++ b/apps/web/src/app/auth/login/login-via-webauthn/login-via-webauthn.component.ts
@@ -1,8 +1,7 @@
 import { Component } from "@angular/core";
 
 import { BaseLoginViaWebAuthnComponent } from "@bitwarden/angular/auth/components/base-login-via-webauthn.component";
-import { CreatePasskeyFailedIcon } from "@bitwarden/angular/auth/icons/create-passkey-failed.icon";
-import { CreatePasskeyIcon } from "@bitwarden/angular/auth/icons/create-passkey.icon";
+import { CreatePasskeyIcon, CreatePasskeyFailedIcon } from "@bitwarden/assets/svg";
 
 @Component({
   selector: "app-login-via-webauthn",
@@ -10,5 +9,8 @@ import { CreatePasskeyIcon } from "@bitwarden/angular/auth/icons/create-passkey.
   standalone: false,
 })
 export class LoginViaWebAuthnComponent extends BaseLoginViaWebAuthnComponent {
-  protected readonly Icons = { CreatePasskeyIcon, CreatePasskeyFailedIcon };
+  protected readonly Icons = {
+    CreatePasskeyIcon,
+    CreatePasskeyFailedIcon,
+  };
 }
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
index 22c3b4376c5..35e5048b1af 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts
@@ -4,6 +4,7 @@ import { Component, OnInit } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { firstValueFrom, map, Observable } from "rxjs";
 
+import { CreatePasskeyFailedIcon, CreatePasskeyIcon } from "@bitwarden/assets/svg";
 import { PrfKeySet } from "@bitwarden/auth/common";
 import { Verification } from "@bitwarden/common/auth/types/verification";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
@@ -16,9 +17,6 @@ import { WebauthnLoginAdminService } from "../../../core";
 import { CredentialCreateOptionsView } from "../../../core/views/credential-create-options.view";
 import { PendingWebauthnLoginCredentialView } from "../../../core/views/pending-webauthn-login-credential.view";
 
-import { CreatePasskeyFailedIcon } from "./create-passkey-failed.icon";
-import { CreatePasskeyIcon } from "./create-passkey.icon";
-
 // FIXME: update to use a const object instead of a typescript enum
 // eslint-disable-next-line @bitwarden/platform/no-enums
 export enum CreateCredentialDialogResult {
@@ -38,7 +36,10 @@ type Step =
 export class CreateCredentialDialogComponent implements OnInit {
   protected readonly NameMaxCharacters = 50;
   protected readonly CreateCredentialDialogResult = CreateCredentialDialogResult;
-  protected readonly Icons = { CreatePasskeyIcon, CreatePasskeyFailedIcon };
+  protected readonly Icons = {
+    CreatePasskeyIcon,
+    CreatePasskeyFailedIcon,
+  };
 
   protected currentStep: Step = "userVerification";
   protected invalidSecret = false;
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-passkey-failed.icon.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-passkey-failed.icon.ts
deleted file mode 100644
index 65902a64c9f..00000000000
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-passkey-failed.icon.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { svgIcon } from "@bitwarden/components";
-
-export const CreatePasskeyFailedIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" width="163" height="115" fill="none">
-  <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M31 19.46H9v22h22v-22Zm-24-2v26h26v-26H7Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M0 43.46a4 4 0 0 1 4-4h32a4 4 0 0 1 4 4v7h-4v-7H4v16.747l1.705 2.149a4 4 0 0 1 .866 2.486v22.205a4 4 0 0 1-1 2.645L4 91.475v17.985h32V91.475l-1.572-1.783a4 4 0 0 1-1-2.645V64.842a4 4 0 0 1 .867-2.486L36 60.207V56.46h4v3.747a4 4 0 0 1-.867 2.487l-1.704 2.148v22.205L39 88.83a4 4 0 0 1 1 2.645v17.985a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V91.475a4 4 0 0 1 1-2.645l1.571-1.783V64.842L.867 62.694A4 4 0 0 1 0 60.207V43.46Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M19.74 63.96a.5.5 0 0 1 .355.147l2.852 2.866a.5.5 0 0 1 .146.353V77.56c2.585 1.188 4.407 3.814 4.407 6.865 0 4.183-3.357 7.534-7.5 7.534-4.144 0-7.5-3.376-7.5-7.534a7.546 7.546 0 0 1 4.478-6.894v-1.443a.5.5 0 0 1 .146-.353l1.275-1.281-1.322-1.33a.5.5 0 0 1 0-.705l.332-.334-.262-.263a.5.5 0 0 1-.005-.7l1.332-1.377-1.445-1.452a.5.5 0 0 1-.145-.352v-1.114a.5.5 0 0 1 .145-.352l2.357-2.369a.5.5 0 0 1 .355-.147Zm-1.856 3.075v.7l1.645 1.654a.5.5 0 0 1 .005.7l-1.332 1.377.267.268a.5.5 0 0 1 0 .705l-.333.334 1.323 1.329a.5.5 0 0 1 0 .705l-1.48 1.488v1.57a.5.5 0 0 1-.32.466 6.545 6.545 0 0 0-4.159 6.095c0 3.61 2.913 6.534 6.5 6.534 3.588 0 6.5-2.901 6.5-6.534 0-2.749-1.707-5.105-4.095-6.074a.5.5 0 0 1-.312-.463V67.532L19.74 65.17l-1.857 1.866ZM20 85.623a1.27 1.27 0 0 0-1.268 1.276c0 .702.56 1.276 1.268 1.276.712 0 1.268-.555 1.268-1.276A1.27 1.27 0 0 0 20 85.623Zm-2.268 1.276A2.27 2.27 0 0 1 20 84.623a2.27 2.27 0 0 1 2.268 2.276c0 1.269-1 2.276-2.268 2.276a2.27 2.27 0 0 1-2.268-2.276ZM57.623 114a1 1 0 0 1 1-1h63.048a1 1 0 0 1 0 2H58.623a1 1 0 0 1-1-1Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M78.022 114V95.654h2V114h-2ZM98.418 114V95.654h2V114h-2Z" clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M16 14.46c0-7.732 6.268-14 14-14h119c7.732 0 14 6.268 14 14v68c0 7.732-6.268 14-14 14H39.5v-4H149c5.523 0 10-4.477 10-10v-68c0-5.523-4.477-10-10-10H30c-5.523 0-10 4.477-10 10v5h-4v-5Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M25 15.46a6 6 0 0 1 6-6h117a6 6 0 0 1 6 6v66a6 6 0 0 1-6 6H36.5v-2H148a4 4 0 0 0 4-4v-66a4 4 0 0 0-4-4H31a4 4 0 0 0-4 4v3h-2v-3Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600"
-    d="M104.269 32.86a1.42 1.42 0 0 0-1.007-.4h-25.83c-.39 0-.722.132-1.007.4a1.26 1.26 0 0 0-.425.947v16.199c0 1.207.25 2.407.75 3.597a13.22 13.22 0 0 0 1.861 3.165c.74.919 1.62 1.817 2.646 2.69a30.93 30.93 0 0 0 2.834 2.172c.868.577 1.77 1.121 2.712 1.636.942.516 1.612.862 2.007 1.043.394.181.714.326.95.42.18.083.373.128.583.128.21 0 .403-.041.582-.128.241-.099.557-.239.956-.42.394-.181 1.064-.532 2.006-1.043a36.595 36.595 0 0 0 2.712-1.636c.867-.576 1.813-1.302 2.838-2.171a19.943 19.943 0 0 0 2.646-2.69 13.24 13.24 0 0 0 1.862-3.166 9.19 9.19 0 0 0 .749-3.597V33.812c.005-.367-.14-.684-.425-.952Zm-3.329 17.298c0 5.864-10.593 10.916-10.593 10.916V35.93h10.593v14.228Z" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M18 24.46h-5v-2h5v2ZM27 24.46h-5v-2h5v2Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-danger-600"
-    d="M51.066 66.894a2.303 2.303 0 0 1-2.455-.5l-10.108-9.797L28.375 66.4l-.002.002a2.294 2.294 0 0 1-3.185.005 2.24 2.24 0 0 1-.506-2.496c.117-.27.286-.518.503-.728l10.062-9.737-9.945-9.623a2.258 2.258 0 0 1-.698-1.6c-.004-.314.06-.619.176-.894a2.254 2.254 0 0 1 1.257-1.222 2.305 2.305 0 0 1 1.723.014c.267.11.518.274.732.486l10.01 9.682 9.995-9.688.009-.008a2.292 2.292 0 0 1 3.159.026c.425.411.68.98.684 1.59a2.242 2.242 0 0 1-.655 1.6l-.01.01-9.926 9.627 10.008 9.7.029.027a2.237 2.237 0 0 1 .53 2.496l-.002.004a2.258 2.258 0 0 1-1.257 1.222Z" />
-</svg>
-`;
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
index 19c4ba04799..509fecb88fe 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -5,6 +5,7 @@ import { ActivatedRoute } from "@angular/router";
 import { firstValueFrom, lastValueFrom, Subject } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
+import { SubscriptionHiddenIcon } from "@bitwarden/assets/svg";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import {
@@ -39,7 +40,6 @@ import {
 import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component";
 import { ChangePlanDialogResultType, openChangePlanDialog } from "./change-plan-dialog.component";
 import { DownloadLicenceDialogComponent } from "./download-license.component";
-import { SubscriptionHiddenIcon } from "./icons/subscription-hidden.icon";
 import { SecretsManagerSubscriptionOptions } from "./sm-adjust-subscription.component";
 
 @Component({
diff --git a/apps/web/src/app/billing/organizations/subscription-hidden.component.ts b/apps/web/src/app/billing/organizations/subscription-hidden.component.ts
index 1455d76d67e..f68b20635ba 100644
--- a/apps/web/src/app/billing/organizations/subscription-hidden.component.ts
+++ b/apps/web/src/app/billing/organizations/subscription-hidden.component.ts
@@ -2,30 +2,7 @@
 // @ts-strict-ignore
 import { Component, Input } from "@angular/core";
 
-import { svgIcon } from "@bitwarden/components";
-
-const SubscriptionHiddenIcon = svgIcon`
-<svg width="216" height="231" viewBox="0 0 216 231" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M133.356 85.6618C133.136 85.43 132.871 85.2457 132.577 85.1198C132.283 84.9939 131.968 84.93 131.648 84.9318H87.8482C87.5289 84.93 87.2113 84.9939 86.9175 85.1198C86.6237 85.2457 86.359 85.43 86.14 85.6618C85.9083 85.8808 85.7239 86.1473 85.598 86.4411C85.4721 86.7349 85.4082 87.0506 85.41 87.37V116.57C85.4192 118.793 85.8499 120.994 86.6802 123.056C87.4705 125.091 88.5326 127.011 89.8375 128.761C91.1789 130.515 92.6808 132.137 94.3233 133.612C95.8472 135.01 97.4532 136.318 99.1304 137.528C100.59 138.565 102.123 139.547 103.729 140.474C105.335 141.401 106.469 142.027 107.131 142.354C107.799 142.682 108.339 142.941 108.741 143.113C109.055 143.264 109.4 143.339 109.748 143.332C110.091 143.337 110.431 143.257 110.737 143.102C111.146 142.923 111.679 142.671 112.354 142.343C113.03 142.014 114.179 141.386 115.756 140.463C117.333 139.539 118.884 138.554 120.355 137.517C122.034 136.306 123.642 134.999 125.169 133.601C126.814 132.128 128.316 130.504 129.655 128.75C130.958 126.998 132.021 125.08 132.813 123.045C133.645 120.983 134.075 118.782 134.083 116.559V87.3591C134.085 87.0415 134.021 86.7276 133.895 86.4356C133.769 86.1436 133.586 85.8808 133.356 85.6618ZM127.71 116.836C127.71 127.421 109.748 136.514 109.748 136.514V91.1879H127.71V116.836Z" fill="rgb(var(--color-secondary-700))"/>
-  <path d="M24.6216 122.3C24.7144 123.4 25.6819 124.217 26.7825 124.125C27.8832 124.032 28.7002 123.064 28.6074 121.964L24.6216 122.3ZM151.501 45.7445C152.57 45.4679 153.213 44.3768 152.936 43.3074L148.429 25.8809C148.152 24.8115 147.061 24.1688 145.992 24.4454C144.922 24.722 144.28 25.8131 144.556 26.8825L148.563 42.3728L133.073 46.3793C132.003 46.6559 131.361 47.747 131.637 48.8164C131.914 49.8858 133.005 50.5285 134.074 50.2519L151.501 45.7445ZM28.6074 121.964C26.6788 99.0874 34.4658 75.5543 51.9661 58.054L49.1377 55.2256C30.7695 73.5938 22.5982 98.2999 24.6216 122.3L28.6074 121.964ZM51.9661 58.054C78.5404 31.4797 119.036 27.3026 149.985 45.5315L152.015 42.0849C119.534 22.9534 77.0327 27.3306 49.1377 55.2256L51.9661 58.054Z" fill="rgb(var(--color-secondary-700))"/>
-  <path d="M67.4747 185.062C66.4089 185.352 65.7801 186.451 66.0701 187.517L70.797 204.885C71.0871 205.951 72.1862 206.58 73.252 206.29C74.3179 205.999 74.9467 204.9 74.6567 203.834L70.455 188.396L85.8934 184.194C86.9592 183.904 87.5881 182.805 87.298 181.739C87.008 180.674 85.9088 180.045 84.843 180.335L67.4747 185.062ZM192.478 100.283C192.286 99.1952 191.248 98.4697 190.16 98.6625C189.072 98.8552 188.347 99.8931 188.54 100.981L192.478 100.283ZM166.138 172.225C139.813 198.55 99.8271 202.897 68.9932 185.255L67.0068 188.727C99.3669 207.242 141.333 202.687 168.966 175.054L166.138 172.225ZM188.54 100.981C192.985 126.07 185.516 152.847 166.138 172.225L168.966 175.054C189.307 154.713 197.142 126.603 192.478 100.283L188.54 100.981Z" fill="rgb(var(--color-secondary-700))"/>
-  <path d="M37.726 108.132C39.283 92.1931 46.1655 76.6765 58.3734 64.4686C75.2893 47.5527 98.5583 40.8618 120.5 44.396" stroke="rgb(var(--color-secondary-700))" stroke-width="2" stroke-linecap="round"/>
-  <path d="M180.595 119.132C179.653 136.119 172.693 152.834 159.717 165.811C144.44 181.088 123.982 188.025 104 186.623" stroke="rgb(var(--color-secondary-700))" stroke-width="2" stroke-linecap="round"/>
-  <rect x="153.5" y="56.1317" width="49" height="34" rx="2.5" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <path d="M153.5 63.6317V63.6317C153.5 66.9454 156.186 69.6317 159.5 69.6317H172.509M202.5 63.6317V63.6317C202.5 66.9454 199.814 69.6317 196.5 69.6317H183.491" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <mask id="path-8-inside-1_1000_26057" fill="white">
-    <rect x="172" y="65.6317" width="12" height="9" rx="1.25"/>
-  </mask>
-  <rect x="172" y="65.6317" width="12" height="9" rx="1.25" stroke="rgb(var(--color-secondary-700))" stroke-width="6" mask="url(#path-8-inside-1_1000_26057)"/>
-  <path d="M187 54.6317C187 54.6317 187 53.6317 187 52.6317C187 51.6317 186.053 50.6317 185.105 50.6317C184.158 50.6317 171.842 50.6317 170.895 50.6317C169.947 50.6317 169 51.6317 169 52.6317C169 53.6317 169 54.6317 169 54.6317" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <circle cx="48" cy="141" r="10.5" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <path d="M64.9935 168.5H64.9126H64.8318H64.7512H64.6708H64.5905H64.5104H64.4304H64.3506H64.2709H64.1914H64.1121H64.0329H63.9538H63.8749H63.7962H63.7176H63.6392H63.5609H63.4828H63.4048H63.3269H63.2492H63.1717H63.0943H63.017H62.9399H62.8629H62.7861H62.7094H62.6329H62.5565H62.4802H62.4041H62.3281H62.2523H62.1766H62.101H62.0256H61.9503H61.8751H61.8001H61.7252H61.6504H61.5758H61.5013H61.4269H61.3527H61.2786H61.2046H61.1308H61.0571H60.9835H60.91H60.8367H60.7635H60.6904H60.6175H60.5446H60.4719H60.3993H60.3269H60.2545H60.1823H60.1102H60.0382H59.9664H59.8946H59.823H59.7515H59.6801H59.6088H59.5376H59.4666H59.3956H59.3248H59.2541H59.1835H59.113H59.0426H58.9724H58.9022H58.8322H58.7622H58.6924H58.6226H58.553H58.4835H58.4141H58.3448H58.2756H58.2065H58.1375H58.0686H57.9998H57.9311H57.8625H57.794H57.7256H57.6572H57.589H57.5209H57.4529H57.385H57.3172H57.2494H57.1818H57.1142H57.0468H56.9794H56.9121H56.8449H56.7779H56.7108H56.6439H56.5771H56.5103H56.4437H56.3771H56.3106H56.2442H56.1779H56.1117H56.0455H55.9794H55.9134H55.8475H55.7817H55.7159H55.6502H55.5846H55.5191H55.4537H55.3883H55.323H55.2578H55.1926H55.1275H55.0625H54.9976H54.9328H54.868H54.8032H54.7386H54.674H54.6095H54.5451H54.4807H54.4164H54.3521H54.2879H54.2238H54.1598H54.0958H54.0318H53.968H53.9042H53.8404H53.7767H53.7131H53.6495H53.586H53.5226H53.4592H53.3958H53.3325H53.2693H53.2061H53.143H53.0799H53.0169H52.9539H52.891H52.8281H52.7653H52.7025H52.6398H52.5771H52.5145H52.4519H52.3894H52.3269H52.2645H52.202H52.1397H52.0774H52.0151H51.9528H51.8907H51.8285H51.7664H51.7043H51.6423H51.5803H51.5183H51.4564H51.3945H51.3326H51.2708H51.209H51.1472H51.0855H51.0238H50.9621H50.9005H50.8389H50.7773H50.7157H50.6542H50.5927H50.5312H50.4698H50.4084H50.347H50.2856H50.2243H50.1629H50.1016H50.0404H49.9791H49.9178H49.8566H49.7954H49.7342H49.6731H49.6119H49.5508H49.4896H49.4285H49.3674H49.3064H49.2453H49.1842H49.1232H49.0622H49.0011H48.9401H48.8791H48.8181H48.7571H48.6962H48.6352H48.5742H48.5133H48.4523H48.3913H48.3304H48.2694H48.2085H48.1475H48.0866H48.0257H47.9647H47.9038H47.8428H47.7819H47.7209H47.6599H47.599H47.538H47.477H47.416H47.3551H47.2941H47.2331H47.172H47.111H47.05H46.9889H46.9279H46.8668H46.8057H46.7446H46.6835H46.6224H46.5612H46.5001H46.4389H46.3777H46.3165H46.2553H46.194H46.1328H46.0715H46.0102H45.9489H45.8875H45.8261H45.7647H45.7033H45.6418H45.5804H45.5189H45.4573H45.3958H45.3342H45.2726H45.2109H45.1493H45.0876H45.0258H44.9641H44.9023H44.8404H44.7786H44.7166H44.6547H44.5927H44.5307H44.4687H44.4066H44.3445H44.2823H44.2201H44.1578H44.0956H44.0332H43.9709H43.9084H43.846H43.7835H43.7209H43.6583H43.5957H43.533H43.4703H43.4075H43.3447H43.2818H43.2189H43.1559H43.0929H43.0298H42.9666H42.9034H42.8402H42.7769H42.7135H42.6501H42.5867H42.5231H42.4596H42.3959H42.3322H42.2685H42.2046H42.1408H42.0768H42.0128H41.9487H41.8846H41.8204H41.7562H41.6918H41.6274H41.563H41.4985H41.4339H41.3692H41.3045H41.2397H41.1748H41.1098H41.0448H40.9797H40.9146H40.8493H40.784H40.7186H40.6532H40.5876H40.522H40.4563H40.3905H40.3247H40.2588H40.1928H40.1267H40.0605H39.9942H39.9279H39.8615H39.795H39.7284H39.6617H39.5949H39.5281H39.4611H39.3941H39.327H39.2598H39.1925H39.1251H39.0576H38.9901H38.9224H38.8547H38.7868H38.7189H38.6508H38.5827H38.5145H38.4461H38.3777H38.3092H38.2406H38.1719H38.103H38.0341H37.9651H37.896H37.8267H37.7574H37.688H37.6184H37.5488H37.479H37.4092H37.3392H37.2691H37.199H37.1287H37.0583H36.9878H36.9171H36.8464H36.7755H36.7046H36.6335H36.5623H36.491H36.4196H36.3481H36.2764H36.2046H36.1328H36.0607H35.9886H35.9164H35.844H35.7715H35.6989H35.6262H35.5533H35.4803H35.4072H35.334H35.2606H35.1872H35.1135H35.0398H34.9659H34.8919H34.8178H34.7436H34.6692H34.5947H34.52H34.4452H34.3703H34.2952H34.2201H34.1447H34.0693H33.9937H33.9179H33.8421H33.7661H33.6899H33.6136H33.5372H33.4606H33.3839H33.3071H33.2301H33.1529H33.0756H32.9982H32.9206H32.8429H32.765H32.687H32.6088H32.5305H32.452H32.3734H32.2946H32.2157H32.1367H32.0574H31.978H31.8985H31.8188H31.739H31.659H31.5788H31.4985H31.418H31.3374H31.2566H31.1757H31.0946H31.0133H30.9318H30.8503H30.7685H30.6866H30.6045H30.5222H30.4398H30.3572H30.2745H30.1915C30.0489 168.5 29.9693 168.466 29.9164 168.433C29.8553 168.394 29.7779 168.322 29.702 168.192C29.5361 167.906 29.4608 167.48 29.5197 167.111C30.9235 158.322 38.6474 151.574 47.9925 151.574C57.3375 151.574 65.0615 158.322 66.4652 167.111C66.5751 167.799 66.4037 168.054 66.3124 168.149C66.1888 168.278 65.8364 168.5 64.9935 168.5Z" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <circle cx="20" cy="141" r="10.5" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <path d="M36.9935 168.5H36.9126H36.8318H36.7512H36.6708H36.5905H36.5104H36.4304H36.3506H36.2709H36.1914H36.1121H36.0329H35.9538H35.8749H35.7962H35.7176H35.6392H35.5609H35.4828H35.4048H35.3269H35.2492H35.1717H35.0943H35.017H34.9399H34.8629H34.7861H34.7094H34.6329H34.5565H34.4802H34.4041H34.3281H34.2523H34.1766H34.101H34.0256H33.9503H33.8751H33.8001H33.7252H33.6504H33.5758H33.5013H33.4269H33.3527H33.2786H33.2046H33.1308H33.0571H32.9835H32.91H32.8367H32.7635H32.6904H32.6175H32.5446H32.4719H32.3993H32.3269H32.2545H32.1823H32.1102H32.0382H31.9664H31.8946H31.823H31.7515H31.6801H31.6088H31.5376H31.4666H31.3956H31.3248H31.2541H31.1835H31.113H31.0426H30.9724H30.9022H30.8322H30.7622H30.6924H30.6226H30.553H30.4835H30.4141H30.3448H30.2756H30.2065H30.1375H30.0686H29.9998H29.9311H29.8625H29.794H29.7256H29.6572H29.589H29.5209H29.4529H29.385H29.3172H29.2494H29.1818H29.1142H29.0468H28.9794H28.9121H28.8449H28.7779H28.7108H28.6439H28.5771H28.5103H28.4437H28.3771H28.3106H28.2442H28.1779H28.1117H28.0455H27.9794H27.9134H27.8475H27.7817H27.7159H27.6502H27.5846H27.5191H27.4537H27.3883H27.323H27.2578H27.1926H27.1275H27.0625H26.9976H26.9328H26.868H26.8032H26.7386H26.674H26.6095H26.5451H26.4807H26.4164H26.3521H26.2879H26.2238H26.1598H26.0958H26.0318H25.968H25.9042H25.8404H25.7767H25.7131H25.6495H25.586H25.5226H25.4592H25.3958H25.3325H25.2693H25.2061H25.143H25.0799H25.0169H24.9539H24.891H24.8281H24.7653H24.7025H24.6398H24.5771H24.5145H24.4519H24.3894H24.3269H24.2645H24.202H24.1397H24.0774H24.0151H23.9528H23.8907H23.8285H23.7664H23.7043H23.6423H23.5803H23.5183H23.4564H23.3945H23.3326H23.2708H23.209H23.1472H23.0855H23.0238H22.9621H22.9005H22.8389H22.7773H22.7157H22.6542H22.5927H22.5312H22.4698H22.4084H22.347H22.2856H22.2243H22.1629H22.1016H22.0404H21.9791H21.9178H21.8566H21.7954H21.7342H21.6731H21.6119H21.5508H21.4896H21.4285H21.3674H21.3064H21.2453H21.1842H21.1232H21.0622H21.0011H20.9401H20.8791H20.8181H20.7571H20.6962H20.6352H20.5742H20.5133H20.4523H20.3913H20.3304H20.2694H20.2085H20.1475H20.0866H20.0257H19.9647H19.9038H19.8428H19.7819H19.7209H19.6599H19.599H19.538H19.477H19.416H19.3551H19.2941H19.2331H19.172H19.111H19.05H18.9889H18.9279H18.8668H18.8057H18.7446H18.6835H18.6224H18.5612H18.5001H18.4389H18.3777H18.3165H18.2553H18.194H18.1328H18.0715H18.0102H17.9489H17.8875H17.8261H17.7647H17.7033H17.6418H17.5804H17.5189H17.4573H17.3958H17.3342H17.2726H17.2109H17.1493H17.0876H17.0258H16.9641H16.9023H16.8404H16.7786H16.7166H16.6547H16.5927H16.5307H16.4687H16.4066H16.3445H16.2823H16.2201H16.1578H16.0956H16.0332H15.9709H15.9084H15.846H15.7835H15.7209H15.6583H15.5957H15.533H15.4703H15.4075H15.3447H15.2818H15.2189H15.1559H15.0929H15.0298H14.9666H14.9034H14.8402H14.7769H14.7135H14.6501H14.5867H14.5231H14.4596H14.3959H14.3322H14.2685H14.2046H14.1408H14.0768H14.0128H13.9487H13.8846H13.8204H13.7562H13.6918H13.6274H13.563H13.4985H13.4339H13.3692H13.3045H13.2397H13.1748H13.1098H13.0448H12.9797H12.9146H12.8493H12.784H12.7186H12.6532H12.5876H12.522H12.4563H12.3905H12.3247H12.2588H12.1928H12.1267H12.0605H11.9942H11.9279H11.8615H11.795H11.7284H11.6617H11.5949H11.5281H11.4611H11.3941H11.327H11.2598H11.1925H11.1251H11.0576H10.9901H10.9224H10.8547H10.7868H10.7189H10.6508H10.5827H10.5145H10.4461H10.3777H10.3092H10.2406H10.1719H10.103H10.0341H9.9651H9.89597H9.82674H9.75741H9.68798H9.61843H9.54879H9.47904H9.40918H9.33921H9.26914H9.19896H9.12867H9.05826H8.98775H8.91713H8.8464H8.77555H8.70459H8.63351H8.56232H8.49102H8.4196H8.34807H8.27641H8.20464H8.13276H8.06075H7.98862H7.91638H7.84401H7.77152H7.69891H7.62617H7.55332H7.48034H7.40723H7.334H7.26064H7.18716H7.11355H7.03981H6.96594H6.89195H6.81782H6.74356H6.66918H6.59466H6.52H6.44522H6.3703H6.29525H6.22006H6.14474H6.06928H5.99368H5.91795H5.84208H5.76607H5.68992H5.61363H5.5372H5.46062H5.38391H5.30705H5.23005H5.15291H5.07562H4.99819H4.92061H4.84288H4.76501H4.68699H4.60882H4.5305H4.45203H4.37342H4.29465H4.21573H4.13665H4.05743H3.97805H3.89851H3.81882H3.73898H3.65898H3.57882H3.49851H3.41804H3.33741H3.25662H3.17566H3.09455H3.01328H2.93185H2.85025H2.76849H2.68657H2.60448H2.52223H2.43981H2.35722H2.27447H2.19155C2.04893 168.5 1.96927 168.466 1.91645 168.433C1.85532 168.394 1.77792 168.322 1.702 168.192C1.53613 167.906 1.46078 167.48 1.51975 167.111C2.92347 158.322 10.6474 151.574 19.9925 151.574C29.3375 151.574 37.0615 158.322 38.4652 167.111C38.5751 167.799 38.4037 168.054 38.3124 168.149C38.1888 168.278 37.8364 168.5 36.9935 168.5Z" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <circle cx="34" cy="154" r="10.5" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-  <path d="M50.9935 181.5H50.9126H50.8318H50.7512H50.6708H50.5905H50.5104H50.4304H50.3506H50.2709H50.1914H50.1121H50.0329H49.9538H49.8749H49.7962H49.7176H49.6392H49.5609H49.4828H49.4048H49.3269H49.2492H49.1717H49.0943H49.017H48.9399H48.8629H48.7861H48.7094H48.6329H48.5565H48.4802H48.4041H48.3281H48.2523H48.1766H48.101H48.0256H47.9503H47.8751H47.8001H47.7252H47.6504H47.5758H47.5013H47.4269H47.3527H47.2786H47.2046H47.1308H47.0571H46.9835H46.91H46.8367H46.7635H46.6904H46.6175H46.5446H46.4719H46.3993H46.3269H46.2545H46.1823H46.1102H46.0382H45.9664H45.8946H45.823H45.7515H45.6801H45.6088H45.5376H45.4666H45.3956H45.3248H45.2541H45.1835H45.113H45.0426H44.9724H44.9022H44.8322H44.7622H44.6924H44.6226H44.553H44.4835H44.4141H44.3448H44.2756H44.2065H44.1375H44.0686H43.9998H43.9311H43.8625H43.794H43.7256H43.6572H43.589H43.5209H43.4529H43.385H43.3172H43.2494H43.1818H43.1142H43.0468H42.9794H42.9121H42.8449H42.7779H42.7108H42.6439H42.5771H42.5103H42.4437H42.3771H42.3106H42.2442H42.1779H42.1117H42.0455H41.9794H41.9134H41.8475H41.7817H41.7159H41.6502H41.5846H41.5191H41.4537H41.3883H41.323H41.2578H41.1926H41.1275H41.0625H40.9976H40.9328H40.868H40.8032H40.7386H40.674H40.6095H40.5451H40.4807H40.4164H40.3521H40.2879H40.2238H40.1598H40.0958H40.0318H39.968H39.9042H39.8404H39.7767H39.7131H39.6495H39.586H39.5226H39.4592H39.3958H39.3325H39.2693H39.2061H39.143H39.0799H39.0169H38.9539H38.891H38.8281H38.7653H38.7025H38.6398H38.5771H38.5145H38.4519H38.3894H38.3269H38.2645H38.202H38.1397H38.0774H38.0151H37.9528H37.8907H37.8285H37.7664H37.7043H37.6423H37.5803H37.5183H37.4564H37.3945H37.3326H37.2708H37.209H37.1472H37.0855H37.0238H36.9621H36.9005H36.8389H36.7773H36.7157H36.6542H36.5927H36.5312H36.4698H36.4084H36.347H36.2856H36.2243H36.1629H36.1016H36.0404H35.9791H35.9178H35.8566H35.7954H35.7342H35.6731H35.6119H35.5508H35.4896H35.4285H35.3674H35.3064H35.2453H35.1842H35.1232H35.0622H35.0011H34.9401H34.8791H34.8181H34.7571H34.6962H34.6352H34.5742H34.5133H34.4523H34.3913H34.3304H34.2694H34.2085H34.1475H34.0866H34.0257H33.9647H33.9038H33.8428H33.7819H33.7209H33.6599H33.599H33.538H33.477H33.416H33.3551H33.2941H33.2331H33.172H33.111H33.05H32.9889H32.9279H32.8668H32.8057H32.7446H32.6835H32.6224H32.5612H32.5001H32.4389H32.3777H32.3165H32.2553H32.194H32.1328H32.0715H32.0102H31.9489H31.8875H31.8261H31.7647H31.7033H31.6418H31.5804H31.5189H31.4573H31.3958H31.3342H31.2726H31.2109H31.1493H31.0876H31.0258H30.9641H30.9023H30.8404H30.7786H30.7166H30.6547H30.5927H30.5307H30.4687H30.4066H30.3445H30.2823H30.2201H30.1578H30.0956H30.0332H29.9709H29.9084H29.846H29.7835H29.7209H29.6583H29.5957H29.533H29.4703H29.4075H29.3447H29.2818H29.2189H29.1559H29.0929H29.0298H28.9666H28.9034H28.8402H28.7769H28.7135H28.6501H28.5867H28.5231H28.4596H28.3959H28.3322H28.2685H28.2046H28.1408H28.0768H28.0128H27.9487H27.8846H27.8204H27.7562H27.6918H27.6274H27.563H27.4985H27.4339H27.3692H27.3045H27.2397H27.1748H27.1098H27.0448H26.9797H26.9146H26.8493H26.784H26.7186H26.6532H26.5876H26.522H26.4563H26.3905H26.3247H26.2588H26.1928H26.1267H26.0605H25.9942H25.9279H25.8615H25.795H25.7284H25.6617H25.5949H25.5281H25.4611H25.3941H25.327H25.2598H25.1925H25.1251H25.0576H24.9901H24.9224H24.8547H24.7868H24.7189H24.6508H24.5827H24.5145H24.4461H24.3777H24.3092H24.2406H24.1719H24.103H24.0341H23.9651H23.896H23.8267H23.7574H23.688H23.6184H23.5488H23.479H23.4092H23.3392H23.2691H23.199H23.1287H23.0583H22.9878H22.9171H22.8464H22.7755H22.7046H22.6335H22.5623H22.491H22.4196H22.3481H22.2764H22.2046H22.1328H22.0607H21.9886H21.9164H21.844H21.7715H21.6989H21.6262H21.5533H21.4803H21.4072H21.334H21.2606H21.1872H21.1135H21.0398H20.9659H20.8919H20.8178H20.7436H20.6692H20.5947H20.52H20.4452H20.3703H20.2952H20.2201H20.1447H20.0693H19.9937H19.9179H19.8421H19.7661H19.6899H19.6136H19.5372H19.4606H19.3839H19.3071H19.2301H19.1529H19.0756H18.9982H18.9206H18.8429H18.765H18.687H18.6088H18.5305H18.452H18.3734H18.2946H18.2157H18.1367H18.0574H17.978H17.8985H17.8188H17.739H17.659H17.5788H17.4985H17.418H17.3374H17.2566H17.1757H17.0946H17.0133H16.9318H16.8503H16.7685H16.6866H16.6045H16.5222H16.4398H16.3572H16.2745H16.1915C16.045 181.5 15.9628 181.465 15.9092 181.432C15.8479 181.394 15.772 181.324 15.6978 181.198C15.5354 180.922 15.4617 180.509 15.5193 180.153C16.9196 171.496 24.6325 164.823 33.9925 164.823C43.3524 164.823 51.0654 171.496 52.4657 180.153C52.574 180.823 52.4052 181.064 52.319 181.152C52.1962 181.279 51.8413 181.5 50.9935 181.5Z" fill="rgb(var(--color-background))" stroke="rgb(var(--color-secondary-700))" stroke-width="3"/>
-</svg>
-`;
+import { SubscriptionHiddenIcon } from "@bitwarden/assets/svg";
 
 @Component({
   selector: "app-org-subscription-hidden",
diff --git a/apps/web/src/app/billing/shared/sm-subscribe.component.ts b/apps/web/src/app/billing/shared/sm-subscribe.component.ts
index 1ecf3648bd2..d1e5566a235 100644
--- a/apps/web/src/app/billing/shared/sm-subscribe.component.ts
+++ b/apps/web/src/app/billing/shared/sm-subscribe.component.ts
@@ -5,13 +5,12 @@ import { FormBuilder, FormGroup, Validators } from "@angular/forms";
 import { Subject, startWith, takeUntil } from "rxjs";
 
 import { ControlsOf } from "@bitwarden/angular/types/controls-of";
+import { SecretsManagerAlt } from "@bitwarden/assets/svg";
 import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { BillingCustomerDiscount } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
-import { SecretsManagerLogo } from "../../layouts/secrets-manager-logo";
-
 export interface SecretsManagerSubscription {
   enabled: boolean;
   userSeats: number;
@@ -42,7 +41,7 @@ export class SecretsManagerSubscribeComponent implements OnInit, OnDestroy {
   @Input() selectedPlan: PlanResponse;
   @Input() customerDiscount: BillingCustomerDiscount;
 
-  logo = SecretsManagerLogo;
+  logo = SecretsManagerAlt;
   productTypes = ProductTierType;
 
   private destroy$ = new Subject<void>();
diff --git a/apps/web/src/app/dirt/reports/reports.ts b/apps/web/src/app/dirt/reports/reports.ts
index c47928af1e9..d7437382961 100644
--- a/apps/web/src/app/dirt/reports/reports.ts
+++ b/apps/web/src/app/dirt/reports/reports.ts
@@ -1,10 +1,13 @@
-import { ReportBreach } from "./icons/report-breach.icon";
-import { ReportExposedPasswords } from "./icons/report-exposed-passwords.icon";
-import { ReportInactiveTwoFactor } from "./icons/report-inactive-two-factor.icon";
-import { MemberAccess } from "./icons/report-member-access.icon";
-import { ReportReusedPasswords } from "./icons/report-reused-passwords.icon";
-import { ReportUnsecuredWebsites } from "./icons/report-unsecured-websites.icon";
-import { ReportWeakPasswords } from "./icons/report-weak-passwords.icon";
+import {
+  MemberAccess,
+  ReportBreach,
+  ReportExposedPasswords,
+  ReportInactiveTwoFactor,
+  ReportReusedPasswords,
+  ReportUnsecuredWebsites,
+  ReportWeakPasswords,
+} from "@bitwarden/assets/svg";
+
 import { ReportEntry } from "./shared";
 
 // FIXME: update to use a const object instead of a typescript enum
diff --git a/apps/web/src/app/dirt/reports/shared/models/report-entry.ts b/apps/web/src/app/dirt/reports/shared/models/report-entry.ts
index d4da4e36763..fd1e57991fb 100644
--- a/apps/web/src/app/dirt/reports/shared/models/report-entry.ts
+++ b/apps/web/src/app/dirt/reports/shared/models/report-entry.ts
@@ -1,4 +1,4 @@
-import { Icon } from "@bitwarden/components";
+import { Icon } from "@bitwarden/assets/svg";
 
 import { ReportVariant } from "./report-variant";
 
diff --git a/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.ts b/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.ts
index 92e6ddb0028..e8ffcd01068 100644
--- a/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.ts
+++ b/apps/web/src/app/dirt/reports/shared/report-card/report-card.component.ts
@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { Component, Input } from "@angular/core";
 
-import { Icon } from "@bitwarden/components";
+import { Icon } from "@bitwarden/assets/svg";
 
 import { ReportVariant } from "../models/report-variant";
 
diff --git a/apps/web/src/app/layouts/password-manager-logo.ts b/apps/web/src/app/layouts/password-manager-logo.ts
deleted file mode 100644
index d93e2d5bb30..00000000000
--- a/apps/web/src/app/layouts/password-manager-logo.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { svgIcon } from "@bitwarden/components";
-
-export const PasswordManagerLogo = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 580 104" fill="none"><path fill="#fff" d="M102.539 52.27c0 28.315-22.954 51.269-51.27 51.269C22.955 103.539 0 80.585 0 52.269 0 23.955 22.954 1 51.27 1c28.315 0 51.269 22.954 51.269 51.27Z"/><path fill="#175DDC" fill-rule="evenodd" d="M75.971 26.765c-.516-.49-1.11-.777-1.786-.777H28.39a2.49 2.49 0 0 0-1.786.777c-.516.49-.754 1.145-.754 1.84v31.47c0 2.371.437 4.66 1.31 6.95.873 2.288 1.984 4.332 3.294 6.13s2.897 3.515 4.682 5.232a62.034 62.034 0 0 0 5 4.25 82.778 82.778 0 0 0 4.802 3.188c1.667.981 2.857 1.676 3.572 2.003.714.368 1.27.613 1.706.817.32.163.673.247 1.032.246.359.001.713-.083 1.032-.246.436-.204.992-.45 1.706-.817.715-.368 1.905-1.022 3.572-2.003a54.869 54.869 0 0 0 4.801-3.188c1.548-1.103 3.215-2.534 5.04-4.25 1.826-1.717 3.373-3.434 4.683-5.232 1.31-1.798 2.42-3.842 3.294-6.13.912-2.29 1.31-4.62 1.31-6.95v-31.47c.04-.695-.239-1.309-.715-1.84Zm-5.913 33.597c0 11.403-18.77 21.172-18.77 21.172V32.732h18.77v27.63Z" clip-rule="evenodd"/><path fill="#fff" d="M518.259 69.478V44.66h3.803l.35 4.753c.768-1.634 1.935-2.935 3.503-3.903 1.568-.967 3.503-1.45 5.804-1.45v4.402h-1.15c-1.468 0-2.819.267-4.054.801-1.234.5-2.218 1.368-2.952 2.602-.734 1.234-1.101 2.936-1.101 5.104v12.51h-4.203Zm-15.828.601c-2.369 0-4.47-.534-6.305-1.601-1.835-1.101-3.286-2.619-4.353-4.554-1.034-1.935-1.551-4.22-1.551-6.855 0-2.602.517-4.87 1.551-6.805 1.034-1.968 2.468-3.486 4.303-4.554 1.868-1.1 4.02-1.65 6.455-1.65 2.402 0 4.47.55 6.205 1.65 1.768 1.068 3.119 2.486 4.053 4.254a12.03 12.03 0 0 1 1.401 5.704c0 .367-.017.734-.05 1.1v1.252h-19.765c.1 1.901.534 3.486 1.301 4.753.8 1.235 1.784 2.169 2.952 2.802a8.036 8.036 0 0 0 3.803.951c1.735 0 3.186-.4 4.353-1.2 1.168-.801 2.018-1.885 2.552-3.253h4.153c-.667 2.301-1.951 4.22-3.853 5.754-1.868 1.501-4.27 2.252-7.205 2.252Zm0-22.467c-2.002 0-3.786.617-5.354 1.851-1.535 1.201-2.419 2.97-2.652 5.304h15.612c-.1-2.235-.868-3.986-2.302-5.254-1.435-1.267-3.203-1.901-5.304-1.901Zm-26.482 14.06c-1.401 0-2.686-.183-3.853-.55l-2.502 2.352c.367.267.817.5 1.351.7.567.167 1.368.334 2.402.5 1.034.134 2.485.284 4.353.451 3.336.234 5.721 1 7.155 2.302 1.435 1.3 2.152 3.002 2.152 5.104 0 1.434-.4 2.802-1.201 4.103-.767 1.3-1.968 2.368-3.603 3.202-1.601.834-3.669 1.251-6.204 1.251-2.235 0-4.22-.3-5.955-.9-1.734-.568-3.085-1.452-4.053-2.653-.967-1.167-1.451-2.652-1.451-4.453 0-.934.25-1.951.751-3.052.5-1.068 1.434-2.085 2.802-3.052-.734-.3-1.368-.618-1.902-.951-.5-.367-.967-.767-1.401-1.201v-1.151l4.253-4.203c-1.968-1.668-2.952-3.87-2.952-6.605 0-1.635.384-3.12 1.151-4.453.767-1.335 1.885-2.386 3.353-3.153 1.467-.8 3.252-1.2 5.354-1.2 1.434 0 2.735.2 3.903.6h9.157v3.152l-4.654.2c.967 1.401 1.451 3.02 1.451 4.854 0 1.634-.4 3.119-1.201 4.453-.767 1.334-1.885 2.402-3.352 3.203-1.435.767-3.203 1.15-5.304 1.15Zm0-3.452c1.768 0 3.169-.45 4.203-1.351 1.067-.934 1.601-2.269 1.601-4.003 0-1.701-.534-3.002-1.601-3.903-1.034-.934-2.435-1.401-4.203-1.401-1.802 0-3.236.467-4.304 1.4-1.034.902-1.551 2.203-1.551 3.904 0 1.734.517 3.069 1.551 4.003 1.068.9 2.502 1.35 4.304 1.35Zm-7.306 14.46c0 1.669.701 2.903 2.102 3.704 1.401.834 3.152 1.25 5.254 1.25 2.068 0 3.719-.45 4.953-1.35 1.268-.901 1.902-2.102 1.902-3.603 0-1.068-.434-2.002-1.301-2.802-.867-.768-2.469-1.218-4.804-1.351-1.834-.134-3.419-.3-4.753-.5-1.368.733-2.269 1.517-2.702 2.351-.434.867-.651 1.635-.651 2.302Zm-19.816-2.601c-2.068 0-3.786-.35-5.154-1.051-1.368-.7-2.385-1.635-3.052-2.802a7.536 7.536 0 0 1-1.001-3.803c0-2.535.967-4.487 2.902-5.854 1.935-1.368 4.57-2.052 7.906-2.052h6.705v-.3c0-2.168-.567-3.803-1.701-4.904-1.134-1.134-2.652-1.701-4.553-1.701-1.635 0-3.053.417-4.254 1.25-1.167.801-1.901 1.986-2.201 3.553h-4.304c.167-1.8.768-3.319 1.802-4.553 1.067-1.234 2.385-2.168 3.953-2.802a12.65 12.65 0 0 1 5.004-1c3.469 0 6.071.933 7.805 2.801 1.768 1.835 2.652 4.287 2.652 7.356v15.261h-3.752l-.251-4.453c-.7 1.401-1.734 2.602-3.102 3.603-1.334.967-3.136 1.45-5.404 1.45Zm.651-3.553c1.601 0 2.968-.417 4.103-1.25a7.919 7.919 0 0 0 2.652-3.253c.6-1.335.9-2.736.9-4.203v-.05h-6.354c-2.469 0-4.22.433-5.254 1.3-1.001.834-1.502 1.885-1.502 3.153 0 1.3.467 2.352 1.401 3.152.968.767 2.319 1.151 4.054 1.151Zm-36.041 2.952V44.66h3.803l.25 4.453a9.018 9.018 0 0 1 3.453-3.703c1.501-.9 3.202-1.35 5.104-1.35 2.935 0 5.27.9 7.005 2.701 1.768 1.768 2.652 4.504 2.652 8.206v14.511h-4.203v-14.06c0-5.17-2.135-7.756-6.405-7.756-2.135 0-3.92.784-5.354 2.352-1.401 1.534-2.102 3.736-2.102 6.605v12.86h-4.203Zm-17.314.601c-2.068 0-3.786-.35-5.153-1.051-1.368-.7-2.386-1.635-3.053-2.802a7.535 7.535 0 0 1-1-3.803c0-2.535.967-4.487 2.902-5.854 1.934-1.368 4.57-2.052 7.906-2.052h6.705v-.3c0-2.168-.567-3.803-1.702-4.904-1.134-1.134-2.652-1.701-4.553-1.701-1.635 0-3.052.417-4.253 1.25-1.168.801-1.902 1.986-2.202 3.553h-4.303c.167-1.8.767-3.319 1.801-4.553 1.068-1.234 2.385-2.168 3.953-2.802a12.65 12.65 0 0 1 5.004-1c3.469 0 6.071.933 7.806 2.801 1.768 1.835 2.652 4.287 2.652 7.356v15.261h-3.753l-.25-4.453c-.701 1.401-1.735 2.602-3.102 3.603-1.335.967-3.136 1.45-5.405 1.45Zm.651-3.553c1.601 0 2.969-.417 4.103-1.25a7.903 7.903 0 0 0 2.652-3.253c.6-1.335.901-2.736.901-4.203v-.05h-6.355c-2.469 0-4.22.433-5.254 1.3-1.001.834-1.501 1.885-1.501 3.153 0 1.3.467 2.352 1.401 3.152.967.767 2.318 1.151 4.053 1.151Zm-49.521 2.952V34.452h4.904l12.61 24.418 12.509-24.418h4.954v35.026h-4.203v-27.52l-11.709 22.517h-3.153l-11.708-22.467v27.47h-4.204Zm-30.652.601c-2.469 0-4.637-.567-6.505-1.701-1.835-1.135-3.269-2.686-4.303-4.654-1.001-1.968-1.501-4.203-1.501-6.705s.517-4.72 1.551-6.655c1.034-1.968 2.468-3.503 4.303-4.603 1.835-1.135 4.003-1.702 6.505-1.702 2.035 0 3.836.417 5.404 1.251 1.568.834 2.785 2.002 3.653 3.503V33.45h4.203v36.027h-3.803l-.4-4.103c-.801 1.201-1.952 2.285-3.453 3.253-1.501.967-3.386 1.45-5.654 1.45Zm.45-3.653c1.668 0 3.136-.384 4.403-1.15 1.301-.801 2.302-1.902 3.003-3.303.734-1.401 1.101-3.036 1.101-4.904 0-1.868-.367-3.503-1.101-4.904-.701-1.4-1.702-2.485-3.003-3.252-1.267-.8-2.735-1.201-4.403-1.201-1.634 0-3.102.4-4.403 1.2-1.268.768-2.269 1.852-3.002 3.253-.701 1.401-1.051 3.036-1.051 4.904 0 1.868.35 3.503 1.051 4.904.733 1.4 1.734 2.502 3.002 3.302 1.301.767 2.769 1.151 4.403 1.151Zm-27.457 3.052V44.66h3.803l.35 4.753c.768-1.634 1.935-2.935 3.503-3.903 1.568-.967 3.503-1.45 5.804-1.45v4.402h-1.15c-1.468 0-2.819.267-4.054.801-1.234.5-2.218 1.368-2.952 2.602-.734 1.234-1.101 2.936-1.101 5.104v12.51h-4.203Zm-16.803.601c-2.335 0-4.436-.534-6.304-1.601-1.868-1.068-3.353-2.569-4.454-4.504-1.067-1.968-1.601-4.27-1.601-6.905 0-2.635.551-4.92 1.651-6.855 1.101-1.968 2.586-3.486 4.454-4.554 1.901-1.067 4.019-1.6 6.355-1.6 2.335 0 4.436.533 6.304 1.6 1.868 1.068 3.336 2.586 4.404 4.554 1.1 1.935 1.651 4.22 1.651 6.855 0 2.635-.551 4.937-1.651 6.905-1.101 1.935-2.602 3.436-4.504 4.504-1.868 1.067-3.969 1.6-6.305 1.6Zm0-3.603c1.435 0 2.769-.35 4.003-1.05 1.235-.701 2.235-1.752 3.003-3.153.767-1.401 1.151-3.136 1.151-5.204 0-2.068-.384-3.803-1.151-5.204-.734-1.401-1.718-2.452-2.952-3.152a7.884 7.884 0 0 0-3.953-1.051c-1.435 0-2.769.35-4.003 1.05-1.235.701-2.236 1.752-3.003 3.153-.767 1.401-1.151 3.136-1.151 5.204 0 2.068.384 3.803 1.151 5.204.767 1.401 1.752 2.452 2.952 3.152a7.883 7.883 0 0 0 3.953 1.051Zm-41.598 3.002-7.255-24.818h4.203l5.254 19.464 5.804-19.464h4.754l5.854 19.464 5.204-19.464h4.253l-7.255 24.818h-4.304l-6.104-20.465-6.105 20.465h-4.303Zm-18.087.601c-2.969 0-5.437-.75-7.405-2.252-1.968-1.501-3.119-3.536-3.453-6.105h4.303c.267 1.301.951 2.436 2.052 3.403 1.134.934 2.652 1.401 4.553 1.401 1.768 0 3.069-.367 3.903-1.1.834-.768 1.251-1.669 1.251-2.703 0-1.5-.55-2.502-1.651-3.002-1.068-.5-2.585-.95-4.554-1.351a25.84 25.84 0 0 1-4.003-1.15c-1.334-.501-2.451-1.202-3.352-2.102-.901-.934-1.351-2.152-1.351-3.653 0-2.169.801-3.937 2.402-5.304 1.634-1.401 3.836-2.102 6.605-2.102 2.635 0 4.787.667 6.455 2.002 1.701 1.3 2.685 3.169 2.952 5.604h-4.153c-.167-1.268-.718-2.252-1.652-2.952-.9-.734-2.118-1.101-3.652-1.101-1.501 0-2.669.317-3.503.95-.801.634-1.201 1.468-1.201 2.503 0 1 .517 1.784 1.551 2.351 1.068.567 2.502 1.051 4.304 1.451 1.534.334 2.985.75 4.353 1.251 1.401.467 2.535 1.184 3.402 2.152.901.934 1.351 2.302 1.351 4.103.034 2.235-.817 4.086-2.552 5.554-1.701 1.435-4.019 2.152-6.955 2.152Zm-23.517 0c-2.969 0-5.437-.75-7.405-2.252-1.969-1.501-3.119-3.536-3.453-6.105h4.303c.267 1.301.951 2.436 2.052 3.403 1.134.934 2.652 1.401 4.553 1.401 1.768 0 3.069-.367 3.903-1.1.834-.768 1.251-1.669 1.251-2.703 0-1.5-.55-2.502-1.651-3.002-1.068-.5-2.585-.95-4.554-1.351a25.84 25.84 0 0 1-4.003-1.15c-1.334-.501-2.451-1.202-3.352-2.102-.901-.934-1.351-2.152-1.351-3.653 0-2.169.8-3.937 2.402-5.304 1.634-1.401 3.836-2.102 6.605-2.102 2.635 0 4.787.667 6.454 2.002 1.702 1.3 2.686 3.169 2.953 5.604h-4.153c-.167-1.268-.718-2.252-1.652-2.952-.9-.734-2.118-1.101-3.652-1.101-1.502 0-2.669.317-3.503.95-.801.634-1.201 1.468-1.201 2.503 0 1 .517 1.784 1.551 2.351 1.068.567 2.502 1.051 4.303 1.451a33.15 33.15 0 0 1 4.354 1.251c1.401.467 2.535 1.184 3.402 2.152.901.934 1.351 2.302 1.351 4.103.034 2.235-.817 4.086-2.552 5.554-1.701 1.435-4.019 2.152-6.955 2.152Zm-26.821 0c-2.068 0-3.786-.35-5.153-1.051-1.368-.7-2.386-1.635-3.053-2.802a7.535 7.535 0 0 1-1-3.803c0-2.535.967-4.487 2.902-5.854 1.935-1.368 4.57-2.052 7.906-2.052h6.705v-.3c0-2.168-.567-3.803-1.702-4.904-1.134-1.134-2.652-1.701-4.553-1.701-1.635 0-3.052.417-4.253 1.25-1.168.801-1.902 1.986-2.202 3.553h-4.303c.167-1.8.767-3.319 1.801-4.553 1.068-1.234 2.385-2.168 3.953-2.802a12.65 12.65 0 0 1 5.004-1c3.469 0 6.071.933 7.806 2.801 1.768 1.835 2.652 4.287 2.652 7.356v15.261h-3.753l-.25-4.453c-.701 1.401-1.735 2.602-3.102 3.603-1.335.967-3.136 1.45-5.405 1.45Zm.651-3.553c1.601 0 2.969-.417 4.103-1.25a7.903 7.903 0 0 0 2.652-3.253c.601-1.335.901-2.736.901-4.203v-.05h-6.355c-2.469 0-4.22.433-5.254 1.3-1.001.834-1.501 1.885-1.501 3.153 0 1.3.467 2.352 1.401 3.152.967.767 2.318 1.151 4.053 1.151Zm-34.96 2.952V34.452h11.509c2.736 0 4.987.45 6.755 1.351 1.768.9 3.069 2.118 3.903 3.653.868 1.534 1.301 3.269 1.301 5.204 0 1.901-.417 3.62-1.251 5.154-.834 1.534-2.135 2.768-3.903 3.702-1.768.901-4.036 1.351-6.805 1.351h-7.305v14.611h-4.204Zm4.204-18.163h7.205c2.802 0 4.787-.584 5.955-1.752 1.2-1.2 1.801-2.835 1.801-4.903 0-2.102-.601-3.736-1.801-4.904-1.168-1.2-3.153-1.801-5.955-1.801h-7.205v13.36Z"/></svg>
-`;
diff --git a/apps/web/src/app/layouts/user-layout.component.ts b/apps/web/src/app/layouts/user-layout.component.ts
index db4c181cd0f..37b35ee41be 100644
--- a/apps/web/src/app/layouts/user-layout.component.ts
+++ b/apps/web/src/app/layouts/user-layout.component.ts
@@ -6,10 +6,11 @@ import { RouterModule } from "@angular/router";
 import { Observable, switchMap } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { PasswordManagerLogo } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
-import { IconModule, PasswordManagerLogo } from "@bitwarden/components";
+import { IconModule } from "@bitwarden/components";
 
 import { BillingFreeFamiliesNavItemComponent } from "../billing/shared/billing-free-families-nav-item.component";
 
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index 4c1ed1a7472..9536ba19cc8 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -12,6 +12,19 @@ import {
 } from "@bitwarden/angular/auth/guards";
 import { ChangePasswordComponent } from "@bitwarden/angular/auth/password-management/change-password";
 import { SetInitialPasswordComponent } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.component";
+import {
+  DevicesIcon,
+  RegistrationLockAltIcon,
+  RegistrationUserAddIcon,
+  TwoFactorTimeoutIcon,
+  DeviceVerificationIcon,
+  UserLockIcon,
+  VaultIcon,
+  RegistrationExpiredLinkIcon,
+  SsoKeyIcon,
+  LockIcon,
+  BrowserExtensionIcon,
+} from "@bitwarden/assets/svg";
 import {
   PasswordHintComponent,
   RegistrationFinishComponent,
@@ -21,25 +34,15 @@ import {
   RegistrationLinkExpiredComponent,
   LoginComponent,
   LoginSecondaryContentComponent,
-  TwoFactorTimeoutIcon,
-  UserLockIcon,
-  SsoKeyIcon,
   LoginViaAuthRequestComponent,
-  DevicesIcon,
-  RegistrationUserAddIcon,
-  RegistrationLockAltIcon,
-  RegistrationExpiredLinkIcon,
   SsoComponent,
-  VaultIcon,
   LoginDecryptionOptionsComponent,
   TwoFactorAuthComponent,
   TwoFactorAuthGuard,
   NewDeviceVerificationComponent,
-  DeviceVerificationIcon,
 } from "@bitwarden/auth/angular";
-import { AnonLayoutWrapperComponent, AnonLayoutWrapperData, Icons } from "@bitwarden/components";
+import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/components";
 import { LockComponent } from "@bitwarden/key-management-ui";
-import { VaultIcons } from "@bitwarden/vault";
 
 import { flagEnabled, Flags } from "../utils/flags";
 
@@ -374,7 +377,7 @@ const routes: Routes = [
           pageTitle: {
             key: "yourVaultIsLockedV2",
           },
-          pageIcon: Icons.LockIcon,
+          pageIcon: LockIcon,
           showReadonlyHostname: true,
         } satisfies AnonLayoutWrapperData,
       },
@@ -533,7 +536,7 @@ const routes: Routes = [
       {
         path: "browser-extension-prompt",
         data: {
-          pageIcon: VaultIcons.BrowserExtensionIcon,
+          pageIcon: BrowserExtensionIcon,
         } satisfies AnonLayoutWrapperData,
         children: [
           {
diff --git a/apps/web/src/app/tools/send/send-access/access.component.ts b/apps/web/src/app/tools/send/send-access/access.component.ts
index bc2851f0df7..1636ac37b87 100644
--- a/apps/web/src/app/tools/send/send-access/access.component.ts
+++ b/apps/web/src/app/tools/send/send-access/access.component.ts
@@ -4,6 +4,7 @@ import { Component, OnInit } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 
+import { ExpiredSendIcon } from "@bitwarden/assets/svg";
 import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -18,7 +19,6 @@ import { SEND_KDF_ITERATIONS } from "@bitwarden/common/tools/send/send-kdf";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { AnonLayoutWrapperDataService, NoItemsModule, ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
-import { ExpiredSendIcon } from "@bitwarden/send-ui";
 
 import { SharedModule } from "../../../shared";
 
diff --git a/apps/web/src/app/tools/send/send-access/routes.ts b/apps/web/src/app/tools/send/send-access/routes.ts
index 4f794aecd23..e94453c9351 100644
--- a/apps/web/src/app/tools/send/send-access/routes.ts
+++ b/apps/web/src/app/tools/send/send-access/routes.ts
@@ -1,7 +1,7 @@
 import { Routes } from "@angular/router";
 
+import { ActiveSendIcon } from "@bitwarden/assets/svg";
 import { AnonLayoutWrapperData } from "@bitwarden/components";
-import { ActiveSendIcon } from "@bitwarden/send-ui";
 
 import { RouteDataProperties } from "../../../core";
 
diff --git a/apps/web/src/app/tools/send/send.component.ts b/apps/web/src/app/tools/send/send.component.ts
index b74a3b80ee3..20b93a10975 100644
--- a/apps/web/src/app/tools/send/send.component.ts
+++ b/apps/web/src/app/tools/send/send.component.ts
@@ -4,6 +4,7 @@ import { Component, NgZone, OnInit, OnDestroy } from "@angular/core";
 import { lastValueFrom } from "rxjs";
 
 import { SendComponent as BaseSendComponent } from "@bitwarden/angular/tools/send/send.component";
+import { NoSendsIcon } from "@bitwarden/assets/svg";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
@@ -26,7 +27,6 @@ import {
 } from "@bitwarden/components";
 import {
   DefaultSendFormConfigService,
-  NoSendsIcon,
   SendFormConfig,
   SendAddEditDialogComponent,
   SendItemDialogResult,
diff --git a/apps/web/src/app/vault/components/manually-open-extension/manually-open-extension.component.ts b/apps/web/src/app/vault/components/manually-open-extension/manually-open-extension.component.ts
index 22041b61198..646ff76311e 100644
--- a/apps/web/src/app/vault/components/manually-open-extension/manually-open-extension.component.ts
+++ b/apps/web/src/app/vault/components/manually-open-extension/manually-open-extension.component.ts
@@ -1,8 +1,8 @@
 import { Component } from "@angular/core";
 
+import { BitwardenIcon } from "@bitwarden/assets/svg";
 import { IconModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
-import { VaultIcons } from "@bitwarden/vault";
 
 @Component({
   selector: "vault-manually-open-extension",
@@ -10,5 +10,5 @@ import { VaultIcons } from "@bitwarden/vault";
   imports: [I18nPipe, IconModule],
 })
 export class ManuallyOpenExtensionComponent {
-  protected BitwardenIcon = VaultIcons.BitwardenIcon;
+  protected BitwardenIcon = BitwardenIcon;
 }
diff --git a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.spec.ts b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.spec.ts
index 8bb80e6fb44..cd4d421a7b9 100644
--- a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.spec.ts
+++ b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.spec.ts
@@ -3,6 +3,7 @@ import { By } from "@angular/platform-browser";
 import { Router, RouterModule } from "@angular/router";
 import { BehaviorSubject } from "rxjs";
 
+import { BrowserExtensionIcon } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { DeviceType } from "@bitwarden/common/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -12,7 +13,6 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { StateProvider } from "@bitwarden/common/platform/state";
 import { AnonLayoutWrapperDataService } from "@bitwarden/components";
-import { VaultIcons } from "@bitwarden/vault";
 
 import { WebBrowserInteractionService } from "../../services/web-browser-interaction.service";
 
@@ -156,7 +156,7 @@ describe("SetupExtensionComponent", () => {
           pageTitle: {
             key: "somethingWentWrong",
           },
-          pageIcon: VaultIcons.BrowserExtensionIcon,
+          pageIcon: BrowserExtensionIcon,
           hideIcon: false,
           hideCardWrapper: false,
           maxWidth: "md",
diff --git a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts
index 67d13ef1e4f..a36627081f2 100644
--- a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts
+++ b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts
@@ -5,6 +5,7 @@ import { Router, RouterModule } from "@angular/router";
 import { firstValueFrom, pairwise, startWith } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { BrowserExtensionIcon, Party } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -22,7 +23,6 @@ import {
   IconModule,
   LinkModule,
 } from "@bitwarden/components";
-import { VaultIcons } from "@bitwarden/vault";
 
 import { SETUP_EXTENSION_DISMISSED } from "../../guards/setup-extension-redirect.guard";
 import { WebBrowserInteractionService } from "../../services/web-browser-interaction.service";
@@ -70,7 +70,7 @@ export class SetupExtensionComponent implements OnInit, OnDestroy {
   private anonLayoutWrapperDataService = inject(AnonLayoutWrapperDataService);
 
   protected SetupExtensionState = SetupExtensionState;
-  protected PartyIcon = VaultIcons.Party;
+  protected PartyIcon = Party;
 
   /** The current state of the setup extension component. */
   protected state: SetupExtensionState = SetupExtensionState.Loading;
@@ -167,7 +167,7 @@ export class SetupExtensionComponent implements OnInit, OnDestroy {
         pageTitle: {
           key: "somethingWentWrong",
         },
-        pageIcon: VaultIcons.BrowserExtensionIcon,
+        pageIcon: BrowserExtensionIcon,
         hideIcon: false,
         hideCardWrapper: false,
         maxWidth: "md",
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index ca8b05c2701..7593e9c59bf 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -35,6 +35,7 @@ import {
   Unassigned,
 } from "@bitwarden/admin-console/common";
 import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
+import { Search } from "@bitwarden/assets/svg";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
@@ -72,7 +73,7 @@ import {
   CipherViewLikeUtils,
 } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
 import { filterOutNullish } from "@bitwarden/common/vault/utils/observable-utilities";
-import { DialogRef, DialogService, Icons, ToastService } from "@bitwarden/components";
+import { DialogRef, DialogService, ToastService } from "@bitwarden/components";
 import { CipherListView } from "@bitwarden/sdk-internal";
 import {
   AddEditFolderDialogComponent,
@@ -163,7 +164,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
   kdfIterations: number;
   activeFilter: VaultFilter = new VaultFilter();
 
-  protected noItemIcon = Icons.Search;
+  protected noItemIcon = Search;
   protected performingInitialLoad = true;
   protected refreshing = false;
   protected processingEvent = false;
diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js
index d33f94e94a9..0e1ae28abd1 100644
--- a/apps/web/tailwind.config.js
+++ b/apps/web/tailwind.config.js
@@ -4,6 +4,7 @@ const config = require("../../libs/components/tailwind.config.base");
 config.content = [
   "./src/**/*.{html,ts}",
   "../../libs/components/src/**/*.{html,ts}",
+  "../../libs/assets/src/**/*.{html,ts}",
   "../../libs/auth/src/**/*.{html,ts}",
   "../../libs/key-management-ui/src/**/*.{html,ts}",
   "../../libs/vault/src/**/*.{html,ts}",
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
index 3f698421e2d..f41b91261f7 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/device-approvals/device-approvals.component.ts
@@ -6,6 +6,7 @@ import { BehaviorSubject, Subject, switchMap, takeUntil, tap } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
 import { SafeProvider, safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
+import { Devices } from "@bitwarden/assets/svg";
 import { OrganizationAuthRequestApiService } from "@bitwarden/bit-common/admin-console/auth-requests/organization-auth-request-api.service";
 import { OrganizationAuthRequestService } from "@bitwarden/bit-common/admin-console/auth-requests/organization-auth-request.service";
 import { PendingAuthRequestWithFingerprintView } from "@bitwarden/bit-common/admin-console/auth-requests/pending-auth-request-with-fingerprint.view";
@@ -20,7 +21,6 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { TableDataSource, NoItemsModule, ToastService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
-import { Devices } from "@bitwarden/web-vault/app/admin-console/icons";
 import { LooseComponentsModule } from "@bitwarden/web-vault/app/shared";
 import { SharedModule } from "@bitwarden/web-vault/app/shared/shared.module";
 
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts
index 7696742277a..9f28ba87186 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/accept-provider.component.ts
@@ -3,12 +3,12 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute, Params, Router } from "@angular/router";
 
+import { BitwardenLogo } from "@bitwarden/assets/svg";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { ProviderUserAcceptRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-accept.request";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { Icons } from "@bitwarden/components";
 import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept.component";
 
 @Component({
@@ -17,7 +17,7 @@ import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept
   standalone: false,
 })
 export class AcceptProviderComponent extends BaseAcceptComponent {
-  protected logo = Icons.BitwardenLogo;
+  protected logo = BitwardenLogo;
   providerName: string;
   providerId: string;
   providerUserId: string;
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts
index 5e2e9a14f2d..159a0105df9 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers-layout.component.ts
@@ -7,17 +7,13 @@ import { combineLatest, map, Observable, Subject, switchMap } from "rxjs";
 import { takeUntil } from "rxjs/operators";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { BusinessUnitPortalLogo, Icon, ProviderPortalLogo } from "@bitwarden/assets/svg";
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { ProviderStatusType, ProviderType } from "@bitwarden/common/admin-console/enums";
 import { Provider } from "@bitwarden/common/admin-console/models/domain/provider";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import {
-  Icon,
-  IconModule,
-  ProviderPortalLogo,
-  BusinessUnitPortalLogo,
-} from "@bitwarden/components";
+import { IconModule } from "@bitwarden/components";
 import { NonIndividualSubscriber } from "@bitwarden/web-vault/app/billing/types";
 import { TaxIdWarningComponent } from "@bitwarden/web-vault/app/billing/warnings/components";
 import { TaxIdWarningType } from "@bitwarden/web-vault/app/billing/warnings/types";
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts
index 47c30490af3..02ca72fa9b8 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { Params } from "@angular/router";
 
-import { Icons } from "@bitwarden/components";
+import { BitwardenLogo } from "@bitwarden/assets/svg";
 import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept.component";
 
 @Component({
@@ -10,7 +10,7 @@ import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept
   standalone: false,
 })
 export class SetupProviderComponent extends BaseAcceptComponent {
-  protected logo = Icons.BitwardenLogo;
+  protected logo = BitwardenLogo;
   failedShortMessage = "inviteAcceptFailedShort";
   failedMessage = "inviteAcceptFailed";
 
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts
index 039c42de302..8ff5d070241 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/no-clients.component.ts
@@ -1,27 +1,8 @@
 import { Component, EventEmitter, Input, Output } from "@angular/core";
 
-import { svgIcon } from "@bitwarden/components";
+import { GearIcon } from "@bitwarden/assets/svg";
 import { SharedOrganizationModule } from "@bitwarden/web-vault/app/admin-console/organizations/shared";
 
-const gearIcon = svgIcon`
-<svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M59.9995 37.9541C46.4641 37.9541 35.5465 48.6298 35.5465 61.7321C35.5465 74.8343 46.4641 85.51 59.9995 85.51C73.5349 85.51 84.4526 74.8343 84.4526 61.7321C84.4526 48.6298 73.5349 37.9541 59.9995 37.9541ZM33.1465 61.7321C33.1465 47.2444 45.1994 35.5541 59.9995 35.5541C74.7997 35.5541 86.8526 47.2444 86.8526 61.7321C86.8526 76.2197 74.7997 87.91 59.9995 87.91C45.1994 87.91 33.1465 76.2197 33.1465 61.7321Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M98.9992 8.4C94.36 8.4 90.5992 12.1608 90.5992 16.8C90.5992 21.4392 94.36 25.2 98.9992 25.2C103.638 25.2 107.399 21.4392 107.399 16.8C107.399 12.1608 103.638 8.4 98.9992 8.4ZM88.1992 16.8C88.1992 10.8353 93.0345 6 98.9992 6C104.964 6 109.799 10.8353 109.799 16.8C109.799 22.7647 104.964 27.6 98.9992 27.6C93.0345 27.6 88.1992 22.7647 88.1992 16.8Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M109.2 56.4C104.561 56.4 100.8 60.1608 100.8 64.8C100.8 69.4392 104.561 73.2 109.2 73.2C113.84 73.2 117.6 69.4392 117.6 64.8C117.6 60.1608 113.84 56.4 109.2 56.4ZM98.4004 64.8C98.4004 58.8353 103.236 54 109.2 54C115.165 54 120 58.8353 120 64.8C120 70.7647 115.165 75.6 109.2 75.6C103.236 75.6 98.4004 70.7647 98.4004 64.8Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M100.8 99C96.1608 99 92.4 102.761 92.4 107.4C92.4 112.039 96.1608 115.8 100.8 115.8C105.439 115.8 109.2 112.039 109.2 107.4C109.2 102.761 105.439 99 100.8 99ZM90 107.4C90 101.435 94.8353 96.6 100.8 96.6C106.765 96.6 111.6 101.435 111.6 107.4C111.6 113.365 106.765 118.2 100.8 118.2C94.8353 118.2 90 113.365 90 107.4Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M37.8 98.4C33.1608 98.4 29.4 102.161 29.4 106.8C29.4 111.439 33.1608 115.2 37.8 115.2C42.4392 115.2 46.2 111.439 46.2 106.8C46.2 102.161 42.4392 98.4 37.8 98.4ZM27 106.8C27 100.835 31.8353 96 37.8 96C43.7647 96 48.6 100.835 48.6 106.8C48.6 112.765 43.7647 117.6 37.8 117.6C31.8353 117.6 27 112.765 27 106.8Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M10.8 40.2C6.16081 40.2 2.4 43.9608 2.4 48.6C2.4 53.2392 6.16081 57 10.8 57C15.4392 57 19.2 53.2392 19.2 48.6C19.2 43.9608 15.4392 40.2 10.8 40.2ZM0 48.6C0 42.6353 4.83532 37.8 10.8 37.8C16.7647 37.8 21.6 42.6353 21.6 48.6C21.6 54.5647 16.7647 59.4 10.8 59.4C4.83532 59.4 0 54.5647 0 48.6Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M38.3996 3.60001C33.7604 3.60001 29.9996 7.36082 29.9996 12C29.9996 16.6392 33.7604 20.4 38.3996 20.4C43.0388 20.4 46.7996 16.6392 46.7996 12C46.7996 7.36082 43.0388 3.60001 38.3996 3.60001ZM27.5996 12C27.5996 6.03534 32.4349 1.20001 38.3996 1.20001C44.3643 1.20001 49.1996 6.03534 49.1996 12C49.1996 17.9647 44.3643 22.8 38.3996 22.8C32.4349 22.8 27.5996 17.9647 27.5996 12Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M42.217 21.3484C42.5229 21.221 42.8742 21.3656 43.0017 21.6715L49.7525 37.8734C49.8799 38.1793 49.7353 38.5306 49.4294 38.6581C49.1235 38.7855 48.7722 38.6409 48.6448 38.335L41.894 22.133C41.7665 21.8272 41.9112 21.4759 42.217 21.3484Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M92.7905 24.1445C93.0435 24.3585 93.075 24.7371 92.861 24.9901L78.0092 42.5422C77.7952 42.7951 77.4166 42.8267 77.1636 42.6126C76.9107 42.3986 76.8791 42.02 77.0932 41.767L91.9449 24.2149C92.159 23.962 92.5375 23.9304 92.7905 24.1445Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M20.4265 51.4253C20.523 51.1083 20.8582 50.9295 21.1752 51.026L34.9752 55.226C35.2923 55.3225 35.471 55.6577 35.3746 55.9747C35.2781 56.2917 34.9429 56.4705 34.6259 56.374L20.8259 52.174C20.5088 52.0776 20.3301 51.7424 20.4265 51.4253Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M49.4777 84.0684C49.7714 84.2219 49.8849 84.5845 49.7314 84.8781L42.9795 97.7892C42.8259 98.0829 42.4634 98.1964 42.1697 98.0429C41.8761 97.8893 41.7625 97.5268 41.9161 97.2331L48.668 84.322C48.8216 84.0284 49.1841 83.9148 49.4777 84.0684Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M77.1582 79.5058C77.4086 79.2888 77.7876 79.3159 78.0046 79.5663L95.5567 99.8187C95.7737 100.069 95.7466 100.448 95.4962 100.665C95.2458 100.882 94.8669 100.855 94.6499 100.605L77.0978 80.3522C76.8807 80.1018 76.9078 79.7229 77.1582 79.5058Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M85.0558 62.3473C85.0887 62.0176 85.3828 61.7771 85.7125 61.81L99.2141 63.1602C99.5438 63.1932 99.7844 63.4872 99.7514 63.8169C99.7184 64.1466 99.4244 64.3872 99.0947 64.3542L85.5931 63.0041C85.2634 62.9711 85.0228 62.6771 85.0558 62.3473Z" fill="#CED4DC"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M55.0583 45.4382C54.888 45.247 54.615 45.185 54.3788 45.2838L52.1688 46.2079C51.9281 46.3086 51.7801 46.5531 51.8024 46.8129L52.1362 50.6898C52.1819 51.2204 51.9902 51.744 51.6128 52.1197L50.2505 53.4761C49.894 53.8311 49.4052 54.0206 48.9027 53.9989L45.0074 53.8303C44.7569 53.8194 44.5261 53.9655 44.4286 54.1965L43.4934 56.4137C43.3921 56.6536 43.4573 56.9315 43.6545 57.1014L46.5356 59.5838C46.9324 59.9257 47.1606 60.4236 47.1606 60.9474V62.8948C47.1606 63.4058 46.9435 63.8927 46.5633 64.2341L43.7142 66.7927C43.5238 66.9636 43.4628 67.2365 43.5622 67.4723L44.4892 69.6698C44.5905 69.9098 44.835 70.0571 45.0945 70.0343L48.8457 69.7047C49.3746 69.6583 49.897 69.8477 50.2732 70.2223L51.6345 71.5776C51.9931 71.9346 52.1849 72.4261 52.1628 72.9317L51.994 76.7976C51.983 77.0488 52.1299 77.2803 52.3619 77.3773L54.5876 78.308C54.8286 78.4088 55.1071 78.3421 55.2763 78.143L57.6994 75.2918C58.0414 74.8894 58.5429 74.6575 59.071 74.6575H61.0298C61.5381 74.6575 62.0226 74.8723 62.3639 75.249L64.9399 78.0926C65.1106 78.281 65.3815 78.3414 65.616 78.2433L67.8309 77.3171C68.072 77.2163 68.2202 76.9709 68.1971 76.7106L67.8673 72.9892C67.8201 72.4571 68.0117 71.9316 68.3903 71.5547L69.7513 70.1996C70.1078 69.8447 70.5965 69.6551 71.0991 69.6769L74.9944 69.8455C75.2449 69.8563 75.4757 69.7103 75.5731 69.4793L76.5045 67.2715C76.6066 67.0293 76.5393 66.7488 76.3382 66.5794L73.4814 64.1727C73.0755 63.8307 72.8412 63.3269 72.8412 62.7961V60.856C72.8412 60.3457 73.0578 59.8594 73.4371 59.518L76.3646 56.8836C76.5546 56.7125 76.6154 56.4399 76.5161 56.2043L75.5887 54.006C75.4875 53.766 75.2429 53.6187 74.9834 53.6415L71.2322 53.9711C70.7034 54.0175 70.181 53.8281 69.8047 53.4535L68.4434 52.0982C68.0848 51.7411 67.8931 51.2496 67.9152 50.7441L68.084 46.8782C68.0949 46.627 67.9481 46.3955 67.716 46.2985L65.4903 45.3678C65.2493 45.267 64.9708 45.3337 64.8016 45.5328L62.3785 48.384C62.0365 48.7864 61.5351 49.0183 61.007 49.0183H59.0542C58.5406 49.0183 58.0516 48.799 57.71 48.4155L55.0583 45.4382ZM53.9158 44.1767C54.6246 43.8803 55.4434 44.0664 55.9544 44.6401L58.6061 47.6174C58.72 47.7452 58.883 47.8183 59.0542 47.8183H61.007C61.183 47.8183 61.3502 47.741 61.4642 47.6069L63.8872 44.7557C64.3947 44.1585 65.2303 43.9583 65.9532 44.2607L68.179 45.1914C68.8751 45.4825 69.3157 46.1768 69.2828 46.9306L69.114 50.7964C69.1067 50.965 69.1706 51.1288 69.2901 51.2478L70.6514 52.6031C70.7768 52.728 70.9509 52.7911 71.1272 52.7757L74.8784 52.4461C75.6569 52.3777 76.3906 52.8195 76.6944 53.5396L77.6217 55.7379C77.9198 56.4446 77.7374 57.2625 77.1673 57.7755L74.2398 60.41C74.1134 60.5238 74.0412 60.6859 74.0412 60.856V62.7961C74.0412 62.973 74.1193 63.1409 74.2546 63.2549L77.1114 65.6617C77.7145 66.1698 77.9166 67.0113 77.6101 67.7379L76.6788 69.9457C76.3864 70.6387 75.694 71.0769 74.9425 71.0444L71.0472 70.8758C70.8797 70.8685 70.7168 70.9317 70.598 71.05L69.2369 72.4051C69.1108 72.5307 69.0469 72.7059 69.0626 72.8833L69.3924 76.6046C69.4616 77.3857 69.0173 78.1217 68.2939 78.4242L66.079 79.3504C65.3753 79.6447 64.5626 79.4635 64.0505 78.8982L61.4745 76.0547C61.3608 75.9291 61.1993 75.8575 61.0298 75.8575H59.071C58.8949 75.8575 58.7278 75.9348 58.6138 76.0689L56.1907 78.9201C55.6832 79.5173 54.8477 79.7174 54.1247 79.4151L51.899 78.4844C51.2029 78.1933 50.7622 77.499 50.7951 76.7452L50.9639 72.8793C50.9713 72.7108 50.9074 72.547 50.7878 72.428L49.4265 71.0726C49.3011 70.9478 49.127 70.8846 48.9507 70.9001L45.1996 71.2297C44.421 71.298 43.6873 70.8562 43.3836 70.1362L42.4566 67.9387C42.1582 67.2314 42.3412 66.4127 42.9124 65.8998L45.7615 63.3412C45.8883 63.2274 45.9606 63.0651 45.9606 62.8948V60.9474C45.9606 60.7728 45.8846 60.6069 45.7523 60.4929L42.8712 58.0105C42.2794 57.5006 42.0841 56.6671 42.3877 55.9473L43.323 53.7301C43.6153 53.0371 44.3078 52.5989 45.0593 52.6314L48.9546 52.8C49.1221 52.8073 49.285 52.7441 49.4038 52.6258L50.7662 51.2694C50.892 51.1441 50.9558 50.9696 50.9406 50.7927L50.6069 46.9159C50.5398 46.1363 50.9839 45.4027 51.7058 45.1008L53.9158 44.1767ZM65.7734 59.49C64.5008 56.2102 60.7895 54.7187 57.5276 56.0511C54.2534 57.3885 52.7303 61.0753 54.0787 64.2677C55.4244 67.5297 59.1264 69.0401 62.327 67.6984C65.5088 66.3645 67.1209 62.6899 65.7734 59.49ZM64.6574 59.9312C63.6423 57.3035 60.6562 56.0694 57.9814 57.162C55.3169 58.2503 54.0985 61.2338 55.185 63.8029L55.1872 63.808L55.1872 63.808C56.2791 66.4579 59.2771 67.6758 61.863 66.5917C64.4656 65.5006 65.7472 62.5089 64.6645 59.9487C64.662 59.9429 64.6597 59.9371 64.6574 59.9312Z" fill="#CED4DC"/>
-</svg>
-`;
-
 @Component({
   selector: "app-no-clients",
   imports: [SharedOrganizationModule],
@@ -42,7 +23,7 @@ const gearIcon = svgIcon`
   </div>`,
 })
 export class NoClientsComponent {
-  icon = gearIcon;
+  icon = GearIcon;
   @Input() showAddOrganizationButton = true;
   @Input() disableAddOrganizationButton = false;
   @Output() addNewOrganizationClicked = new EventEmitter();
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts
index 0634c891a05..c964108936a 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/setup/setup-business-unit.component.ts
@@ -3,6 +3,7 @@ import { ActivatedRoute, Params, Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 import { filter, map, switchMap } from "rxjs/operators";
 
+import { BitwardenLogo } from "@bitwarden/assets/svg";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { OrganizationBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-billing-api.service.abstraction";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
@@ -12,7 +13,6 @@ import { StateProvider } from "@bitwarden/common/platform/state";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { ProviderKey } from "@bitwarden/common/types/key";
-import { Icons } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 import { BillingNotificationService } from "@bitwarden/web-vault/app/billing/services/billing-notification.service";
 import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept.component";
@@ -22,7 +22,7 @@ import { BaseAcceptComponent } from "@bitwarden/web-vault/app/common/base.accept
   standalone: false,
 })
 export class SetupBusinessUnitComponent extends BaseAcceptComponent {
-  protected bitwardenLogo = Icons.BitwardenLogo;
+  protected bitwardenLogo = BitwardenLogo;
 
   failedMessage = "emergencyInviteAcceptFailed";
   failedShortMessage = "emergencyInviteAcceptFailedShort";
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts
index ee08ec6661e..1ce9ab9a2e6 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts
@@ -4,6 +4,7 @@ import { FormControl } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 import { combineLatest, debounceTime, firstValueFrom, map, Observable, of, switchMap } from "rxjs";
 
+import { Security } from "@bitwarden/assets/svg";
 import {
   CriticalAppsService,
   RiskInsightsDataService,
@@ -27,7 +28,6 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import {
   IconButtonModule,
-  Icons,
   NoItemsModule,
   SearchModule,
   TableDataSource,
@@ -63,7 +63,7 @@ export class AllApplicationsComponent implements OnInit {
   protected searchControl = new FormControl("", { nonNullable: true });
   protected loading = true;
   protected organization = new Organization();
-  noItemsIcon = Icons.Security;
+  noItemsIcon = Security;
   protected markingAsCritical = false;
   protected applicationSummary: ApplicationHealthReportSummary = {
     totalMemberCount: 0,
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
index 4f9a9930f1c..531adc003c7 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.ts
@@ -6,6 +6,7 @@ import { FormControl } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { combineLatest, debounceTime, map, switchMap } from "rxjs";
 
+import { Security } from "@bitwarden/assets/svg";
 import {
   CriticalAppsService,
   RiskInsightsDataService,
@@ -20,13 +21,7 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { CipherId, OrganizationId } from "@bitwarden/common/types/guid";
 import { SecurityTaskType } from "@bitwarden/common/vault/tasks";
-import {
-  Icons,
-  NoItemsModule,
-  SearchModule,
-  TableDataSource,
-  ToastService,
-} from "@bitwarden/components";
+import { NoItemsModule, SearchModule, TableDataSource, ToastService } from "@bitwarden/components";
 import { CardComponent } from "@bitwarden/dirt-card";
 import { HeaderModule } from "@bitwarden/web-vault/app/layouts/header/header.module";
 import { SharedModule } from "@bitwarden/web-vault/app/shared";
@@ -61,7 +56,7 @@ export class CriticalApplicationsComponent implements OnInit {
   protected loading = false;
   protected organizationId: string;
   protected applicationSummary = {} as ApplicationHealthReportSummary;
-  noItemsIcon = Icons.Security;
+  noItemsIcon = Security;
   enableRequestPasswordChange = false;
 
   async ngOnInit() {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts
index 24da000f213..a714bc0d543 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts
@@ -15,6 +15,7 @@ import {
   takeUntil,
 } from "rxjs";
 
+import { SecretsManagerLogo } from "@bitwarden/assets/svg";
 import {
   getOrganizationById,
   OrganizationService,
@@ -22,7 +23,6 @@ import {
 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 { SecretsManagerLogo } from "@bitwarden/components";
 
 import { OrganizationCounts } from "../models/view/counts.view";
 import { ProjectService } from "../projects/project.service";
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
index 89baf969c34..0a7d6befde2 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts
@@ -2,13 +2,13 @@ import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { map, concatMap, firstValueFrom } from "rxjs";
 
+import { Icon, NoAccess } from "@bitwarden/assets/svg";
 import {
   getOrganizationById,
   OrganizationService,
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { Icon, Icons } from "@bitwarden/components";
 
 @Component({
   templateUrl: "./org-suspended.component.html",
@@ -21,7 +21,7 @@ export class OrgSuspendedComponent {
     private route: ActivatedRoute,
   ) {}
 
-  protected NoAccess: Icon = Icons.NoAccess;
+  protected NoAccess: Icon = NoAccess;
   protected organizationName$ = this.route.params.pipe(
     concatMap(async (params) => {
       const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
diff --git a/libs/angular/src/auth/components/two-factor-icon.component.ts b/libs/angular/src/auth/components/two-factor-icon.component.ts
index 0e811595bea..8c650b6b04c 100644
--- a/libs/angular/src/auth/components/two-factor-icon.component.ts
+++ b/libs/angular/src/auth/components/two-factor-icon.component.ts
@@ -2,10 +2,7 @@
 // @ts-strict-ignore
 import { Component, Input } from "@angular/core";
 
-import { EmailIcon } from "../icons/email.icon";
-import { RecoveryCodeIcon } from "../icons/recovery.icon";
-import { TOTPIcon } from "../icons/totp.icon";
-import { WebAuthnIcon } from "../icons/webauthn.icon";
+import { EmailIcon, RecoveryCodeIcon, TOTPIcon, WebAuthnIcon } from "@bitwarden/assets/svg";
 
 @Component({
   selector: "auth-two-factor-icon",
diff --git a/libs/angular/src/auth/icons/create-passkey.icon.ts b/libs/angular/src/auth/icons/create-passkey.icon.ts
deleted file mode 100644
index 79ba4021b58..00000000000
--- a/libs/angular/src/auth/icons/create-passkey.icon.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { svgIcon } from "@bitwarden/components";
-
-export const CreatePasskeyIcon = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" width="163" height="116" fill="none">
-  <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M31 19.58H9v22h22v-22Zm-24-2v26h26v-26H7Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M0 43.58a4 4 0 0 1 4-4h32a4 4 0 0 1 4 4v7h-4v-7H4v16.747l1.705 2.149a4 4 0 0 1 .866 2.486v22.204a4 4 0 0 1-1 2.646L4 91.595v17.985h32V91.595l-1.572-1.783a4 4 0 0 1-1-2.646V64.962a4 4 0 0 1 .867-2.486L36 60.327V56.58h4v3.747a4 4 0 0 1-.867 2.486l-1.704 2.149v22.204L39 88.95a4 4 0 0 1 1 2.646v17.985a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V91.595a4 4 0 0 1 1-2.646l1.571-1.783V64.962L.867 62.813A4 4 0 0 1 0 60.327V43.58Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M19.74 64.08a.5.5 0 0 1 .355.147l2.852 2.866a.5.5 0 0 1 .146.352V77.68c2.585 1.189 4.407 3.814 4.407 6.865 0 4.183-3.357 7.535-7.5 7.535-4.144 0-7.5-3.377-7.5-7.535a7.546 7.546 0 0 1 4.478-6.894V76.21a.5.5 0 0 1 .146-.353l1.275-1.282-1.322-1.329a.5.5 0 0 1 0-.705l.332-.334-.262-.263a.5.5 0 0 1-.005-.7l1.332-1.377-1.445-1.452a.5.5 0 0 1-.145-.353v-1.113a.5.5 0 0 1 .145-.353l2.357-2.368a.5.5 0 0 1 .355-.147Zm-1.856 3.074v.7l1.645 1.654a.5.5 0 0 1 .005.7l-1.332 1.377.267.268a.5.5 0 0 1 0 .706l-.333.334 1.323 1.329a.5.5 0 0 1 0 .705l-1.48 1.488v1.57a.5.5 0 0 1-.32.466 6.545 6.545 0 0 0-4.159 6.094c0 3.61 2.913 6.535 6.5 6.535 3.588 0 6.5-2.902 6.5-6.535 0-2.748-1.707-5.104-4.095-6.073a.5.5 0 0 1-.312-.463V67.651l-2.352-2.364-1.857 1.866ZM20 85.742a1.27 1.27 0 0 0-1.268 1.277c0 .701.56 1.276 1.268 1.276.712 0 1.268-.555 1.268-1.276A1.27 1.27 0 0 0 20 85.742Zm-2.268 1.277A2.27 2.27 0 0 1 20 84.742a2.27 2.27 0 0 1 2.268 2.277c0 1.268-1 2.276-2.268 2.276a2.27 2.27 0 0 1-2.268-2.276ZM41.796 42.844a1 1 0 0 1 1.413.058l5.526 6A1 1 0 0 1 48 50.58H27a1 1 0 1 1 0-2h18.72l-3.982-4.323a1 1 0 0 1 .058-1.413ZM33.315 62.315a1 1 0 0 1-1.413-.058l-5.526-6a1 1 0 0 1 .735-1.677h21a1 1 0 1 1 0 2h-18.72l3.982 4.322a1 1 0 0 1-.058 1.413ZM57.623 114.12a1 1 0 0 1 1-1h63.048a1 1 0 1 1 0 2H58.623a1 1 0 0 1-1-1Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M78.022 114.12V95.774h2v18.346h-2ZM98.418 114.12V95.774h2v18.346h-2Z" clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M16 14.58c0-7.732 6.268-14 14-14h119c7.732 0 14 6.268 14 14v68c0 7.732-6.268 14-14 14H39.5v-4H149c5.523 0 10-4.478 10-10v-68c0-5.523-4.477-10-10-10H30c-5.523 0-10 4.477-10 10v5h-4v-5Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd"
-    d="M25 15.58a6 6 0 0 1 6-6h117a6 6 0 0 1 6 6v66a6 6 0 0 1-6 6H36.5v-2H148a4 4 0 0 0 4-4v-66a4 4 0 0 0-4-4H31a4 4 0 0 0-4 4v3h-2v-3Z"
-    clip-rule="evenodd" />
-  <path class="tw-fill-secondary-600"
-    d="M104.269 32.98a1.42 1.42 0 0 0-1.007-.4h-25.83c-.39 0-.722.132-1.007.4a1.26 1.26 0 0 0-.425.947v16.199c0 1.207.25 2.406.75 3.597a13.222 13.222 0 0 0 1.861 3.165c.74.919 1.62 1.817 2.646 2.69a30.93 30.93 0 0 0 2.834 2.172c.868.577 1.77 1.121 2.712 1.636.942.515 1.612.861 2.007 1.043.394.18.714.325.95.42.18.082.373.128.583.128.21 0 .403-.042.582-.128.241-.099.557-.24.956-.42.394-.182 1.064-.532 2.006-1.043a36.56 36.56 0 0 0 2.712-1.636c.867-.577 1.813-1.302 2.838-2.172a19.943 19.943 0 0 0 2.646-2.69 13.24 13.24 0 0 0 1.862-3.165c.5-1.187.749-2.386.749-3.597V33.93c.005-.367-.14-.684-.425-.952Zm-3.329 17.298c0 5.864-10.593 10.916-10.593 10.916V36.049h10.593v14.23Z" />
-  <path class="tw-fill-secondary-600" fill-rule="evenodd" d="M18 24.58h-5v-2h5v2ZM27 24.58h-5v-2h5v2Z"
-    clip-rule="evenodd" />
-</svg>
-`;
diff --git a/libs/angular/src/auth/password-management/change-password/change-password.component.ts b/libs/angular/src/auth/password-management/change-password/change-password.component.ts
index 7bb9584e934..1512f348133 100644
--- a/libs/angular/src/auth/password-management/change-password/change-password.component.ts
+++ b/libs/angular/src/auth/password-management/change-password/change-password.component.ts
@@ -2,6 +2,7 @@ import { CommonModule } from "@angular/common";
 import { Component, Input, OnInit } from "@angular/core";
 import { firstValueFrom } from "rxjs";
 
+import { LockIcon } from "@bitwarden/assets/svg";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import {
@@ -24,7 +25,6 @@ import {
   AnonLayoutWrapperDataService,
   DialogService,
   ToastService,
-  Icons,
   CalloutComponent,
 } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
@@ -97,13 +97,13 @@ export class ChangePasswordComponent implements OnInit {
 
     if (this.forceSetPasswordReason === ForceSetPasswordReason.AdminForcePasswordReset) {
       this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
-        pageIcon: Icons.LockIcon,
+        pageIcon: LockIcon,
         pageTitle: { key: "updateMasterPassword" },
         pageSubtitle: { key: "accountRecoveryUpdateMasterPasswordSubtitle" },
       });
     } else if (this.forceSetPasswordReason === ForceSetPasswordReason.WeakMasterPassword) {
       this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
-        pageIcon: Icons.LockIcon,
+        pageIcon: LockIcon,
         pageTitle: { key: "updateMasterPassword" },
         pageSubtitle: { key: "updateMasterPasswordSubtitle" },
         maxWidth: "lg",
diff --git a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts
index 27d4c11f692..c31495b60fb 100644
--- a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts
+++ b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts
@@ -1,9 +1,9 @@
 import { CommonModule } from "@angular/common";
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
-// import { NoAccess } from "libs/components/src/icon/icons";
 import { firstValueFrom } from "rxjs";
 
+import { NoAccess } from "@bitwarden/assets/svg";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import {
@@ -35,7 +35,6 @@ import {
   CalloutComponent,
   DialogService,
   ToastService,
-  Icons,
 } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
@@ -113,7 +112,7 @@ export class SetInitialPasswordComponent implements OnInit {
       this.userType = SetInitialPasswordUserType.OFFBOARDED_TDE_ORG_USER_UNTRUSTED_DEVICE;
       this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
         pageTitle: { key: "unableToCompleteLogin" },
-        pageIcon: Icons.NoAccess,
+        pageIcon: NoAccess,
       });
     }
 
diff --git a/libs/angular/src/billing/components/invoices/no-invoices.component.ts b/libs/angular/src/billing/components/invoices/no-invoices.component.ts
index 987650d1c83..5251fc0133b 100644
--- a/libs/angular/src/billing/components/invoices/no-invoices.component.ts
+++ b/libs/angular/src/billing/components/invoices/no-invoices.component.ts
@@ -1,28 +1,6 @@
 import { Component } from "@angular/core";
 
-import { svgIcon } from "@bitwarden/components";
-
-const partnerTrustIcon = svgIcon`
-<svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M69 43.6511C70.1025 44.1328 71.32 44.4 72.6 44.4C77.5706 44.4 81.6 40.3706 81.6 35.4C81.6 30.4294 77.5706 26.4 72.6 26.4C67.6295 26.4 63.6 30.4294 63.6 35.4C63.6 36.0164 63.662 36.6184 63.7801 37.2" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M69 44.8416C70.1522 44.553 71.3559 44.4 72.5943 44.4C80.1533 44.4 86.4194 50.0998 87.5598 57.5529C87.7996 59.1204 86.9541 60 85.3451 60C79.7231 60 75.6474 60 71.4 60" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M51 43.6511C49.8976 44.1328 48.68 44.4 47.4 44.4C42.4295 44.4 38.4 40.3706 38.4 35.4C38.4 30.4294 42.4295 26.4 47.4 26.4C52.3706 26.4 56.4 30.4294 56.4 35.4C56.4 36.0164 56.338 36.6184 56.22 37.2" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M51 44.8416C49.8478 44.553 48.6441 44.4 47.4057 44.4C39.8467 44.4 33.5806 50.0998 32.4402 57.5529C32.2004 59.1204 33.0459 60 34.6549 60C40.2769 60 44.3526 60 48.6 60" stroke="#CED4DC" stroke-width="2"/>
-    <circle cx="60" cy="45.6" r="9" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M72.7451 70.2C62.3773 70.2 57.2682 70.2 46.6437 70.2C45.3864 70.2 44.8665 68.8141 45.0289 67.7529C46.1693 60.2998 52.4354 54.6 59.9943 54.6C67.5533 54.6 73.8194 60.2998 74.9598 67.7529C75.1996 69.3204 74.3541 70.2 72.7451 70.2Z" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M73.557 103.195C74.3197 104.319 74.3197 105.443 73.557 106.272C73.1462 106.745 72.3835 107.041 71.738 107.041C71.6242 107.041 71.5013 107.032 71.3801 107.011C71.3345 108.505 70.5896 109.217 70.0948 109.467C69.7427 109.703 69.3318 109.822 68.9212 109.822C68.8703 109.822 68.8204 109.82 68.7714 109.816C68.7035 109.811 68.6373 109.803 68.5729 109.792C68.5559 110.332 68.3591 110.827 67.9823 111.242C67.6302 111.833 66.926 112.129 66.2808 112.129C66.1045 112.129 65.9874 112.129 65.8112 112.07C65.7753 112.058 65.7381 112.044 65.6997 112.028C65.5215 112.624 65.0169 113.105 64.227 113.431C63.9924 113.49 63.8162 113.49 63.5815 113.49C62.4417 113.49 60.9477 112.633 60.0352 112.028M55.5 88.7567C53.6867 88.9991 51.6246 89.9258 50.4378 90.4744C50.2985 90.5095 50.1797 90.5655 50.0693 90.6176L50.0687 90.6179C49.9937 90.6534 49.9223 90.6871 49.851 90.711C49.5281 90.5373 49.0708 90.3955 48.4995 90.2184C47.5139 89.9127 46.1886 89.5016 44.6287 88.6402C44.3941 88.5219 44.0419 88.581 43.8657 88.8769L37.6461 99.5268C37.4699 99.8226 37.5287 100.178 37.822 100.355L46.8 105.019" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M73.7624 103.371C73.6448 103.371 73.4683 103.313 73.3507 103.195L67.7625 97.9108C63.1743 96.7365 61.8803 93.9181 61.4097 92.8024C61.0567 92.8612 60.5273 92.9199 59.645 92.9199C59.2332 93.2135 58.1744 94.0355 56.7039 94.7988C55.3509 95.5034 53.998 95.2098 53.4098 94.2117C53.0568 93.5658 52.998 92.8024 53.351 92.1566C55.7039 87.5766 58.4685 86.6372 60.3509 86.6372C61.4685 86.6372 62.1744 86.9895 62.2332 86.9895L69.2919 90.1015L75.7624 87.1656C75.8801 87.1069 76.0565 87.1069 76.233 87.1656C76.4095 87.2243 76.5271 87.3418 76.5859 87.4592L82.6447 97.8521C82.7623 98.1457 82.6447 98.4393 82.4094 98.6154L74.0565 103.313C73.9389 103.371 73.8801 103.371 73.7624 103.371Z" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M46.6097 107.206C47.0221 108.443 48.394 109.005 49.044 109.195C49.217 109.923 49.5794 110.391 49.9178 110.692C50.5086 111.164 51.1584 111.342 51.7491 111.342C51.9248 111.342 52.0796 111.321 52.2135 111.291C52.2516 111.368 52.2936 111.444 52.3399 111.519C52.8716 112.346 53.8168 112.818 55.2346 112.937C55.3143 112.937 55.3897 112.919 55.4573 112.887C56.0276 113.588 56.9845 114 57.893 114C58.7791 114 59.488 113.527 59.7243 112.759C60.0787 111.223 59.9606 109.628 59.7243 108.742C59.5602 108.031 59.1935 106.763 57.6392 106.673C57.4017 106.121 56.803 105.205 55.4709 105.08C55.1879 105.053 54.9235 105.086 54.6774 105.164C54.4496 104.62 54.0132 103.917 53.2851 103.662C52.7534 103.485 51.9264 103.662 51.1584 104.134C51.1181 104.161 51.0782 104.187 51.0387 104.215C50.6899 103.795 50.1003 103.263 49.3271 103.189C48.6182 103.13 48.0275 103.485 47.4367 104.193C46.5506 105.316 46.3143 106.32 46.6097 107.206Z" stroke="#CED4DC" stroke-width="2"/>
-    <path d="M51.9 104.4C51.5709 104.603 49.9229 105.531 49.5 106.8C49.2 107.7 49.5 108.9 49.8 109.5" stroke="#CED4DC" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M54.6703 105.317C54.1767 105.571 53.0709 106.485 52.597 108.109C52.1231 109.734 52.3995 110.816 52.597 111.155" stroke="#CED4DC" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M57.2 107.263C56.7063 107.517 56.051 108.431 55.7104 109.598C55.3697 110.766 55.5129 112.179 55.7104 112.517" stroke="#CED4DC" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M65.5675 111.739C64.0108 110.96 61.2866 108.431 61.2866 108.431" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M68.2914 109.598C66.1686 108.591 62.4538 105.317 62.4538 105.317" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M71.4049 106.874C68.9991 105.775 64.789 102.204 64.789 102.204" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    <path d="M86.9971 91.8C95.5145 86.0616 101.962 77.753 105.392 68.094C108.822 58.435 109.055 47.9345 106.056 38.134C103.057 28.3336 96.9838 19.7494 88.7289 13.6419C80.474 7.53438 70.4717 4.22518 60.1907 4.20014C49.9096 4.1751 39.8913 7.43554 31.6065 13.5028C23.3217 19.5701 17.2069 28.1245 14.1599 37.9102C11.1128 47.696 11.294 58.1975 14.6768 67.8731C18.0596 77.5486 24.4658 85.8885 32.955 91.6684" stroke="#CED4DC" stroke-width="2" stroke-linecap="round"/>
-    <path d="M84.6771 88.2C92.4374 82.9725 98.3114 75.4037 101.437 66.6048C104.562 57.8059 104.774 48.2403 102.042 39.3125C99.3091 30.3847 93.7761 22.5649 86.255 17.0012C78.7338 11.4375 69.6207 8.42293 60.2535 8.40012C50.8863 8.37731 41.7585 11.3474 34.2101 16.8745C26.6618 22.4015 21.0905 30.1942 18.3143 39.1086C15.5381 48.023 15.7032 57.5895 18.7853 66.4035C21.8674 75.2176 27.7042 82.8149 35.4388 88.0801" stroke="#CED4DC" stroke-linecap="round"/>
-</svg>
-`;
+import { PartnerTrustIcon } from "@bitwarden/assets/svg";
 
 @Component({
   selector: "app-no-invoices",
@@ -33,5 +11,5 @@ const partnerTrustIcon = svgIcon`
   standalone: false,
 })
 export class NoInvoicesComponent {
-  icon = partnerTrustIcon;
+  icon = PartnerTrustIcon;
 }
diff --git a/libs/assets/README.md b/libs/assets/README.md
new file mode 100644
index 00000000000..60df3f8992a
--- /dev/null
+++ b/libs/assets/README.md
@@ -0,0 +1,16 @@
+# Assets
+
+Owned by: ui-foundation
+
+This lib contains assets used by the Bitwarden clients. Unused assets are tree-shaken from client bundles. This means that all exports from this library must not have any [side effects](https://webpack.js.org/guides/tree-shaking/#mark-the-file-as-side-effect-free).
+
+## Usage
+
+### SVGs
+
+SVGs intended to be used with the `bit-icon` component live in `src/svgs`. These SVGs are built with the `icon-service` for security reasons. These SVGs can be viewed in our Component Library [Icon Story](https://components.bitwarden.com/?path=/story/component-library-icon--default).
+
+When adding a new SVG, follow the instructions in our Component Library: [SVG Icon Docs](https://components.bitwarden.com/?path=/docs/component-library-icon--docs)
+
+When importing an SVG in one of the clients:
+`import { ExampleSvg } from "@bitwarden/assets/svg";`
diff --git a/libs/assets/eslint.config.mjs b/libs/assets/eslint.config.mjs
new file mode 100644
index 00000000000..9c37d10e3ff
--- /dev/null
+++ b/libs/assets/eslint.config.mjs
@@ -0,0 +1,3 @@
+import baseConfig from "../../eslint.config.mjs";
+
+export default [...baseConfig];
diff --git a/libs/assets/jest.config.js b/libs/assets/jest.config.js
new file mode 100644
index 00000000000..fae52410152
--- /dev/null
+++ b/libs/assets/jest.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  displayName: "assets",
+  preset: "../../jest.preset.js",
+  testEnvironment: "node",
+  transform: {
+    "^.+\\.[tj]s$": ["ts-jest", { tsconfig: "<rootDir>/tsconfig.spec.json" }],
+  },
+  moduleFileExtensions: ["ts", "js", "html"],
+  coverageDirectory: "../../coverage/libs/assets",
+};
diff --git a/libs/assets/package.json b/libs/assets/package.json
new file mode 100644
index 00000000000..cc5935833bf
--- /dev/null
+++ b/libs/assets/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@bitwarden/assets",
+  "version": "0.0.1",
+  "description": "Assets used in Bitwarden clients",
+  "private": true,
+  "type": "commonjs",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "license": "GPL-3.0",
+  "author": "ui-foundation",
+  "scripts": {
+    "test": "jest"
+  },
+  "sideEffects": false
+}
diff --git a/libs/assets/project.json b/libs/assets/project.json
new file mode 100644
index 00000000000..97e32a24b33
--- /dev/null
+++ b/libs/assets/project.json
@@ -0,0 +1,33 @@
+{
+  "name": "assets",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/assets/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/assets",
+        "main": "libs/assets/src/index.ts",
+        "tsConfig": "libs/assets/tsconfig.lib.json",
+        "assets": ["libs/assets/*.md"]
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/assets/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/assets/jest.config.js"
+      }
+    }
+  }
+}
diff --git a/libs/components/src/icon/icon.spec.ts b/libs/assets/src/svg/icon-service.spec.ts
similarity index 94%
rename from libs/components/src/icon/icon.spec.ts
rename to libs/assets/src/svg/icon-service.spec.ts
index 3e7c011be93..2561c85aefa 100644
--- a/libs/components/src/icon/icon.spec.ts
+++ b/libs/assets/src/svg/icon-service.spec.ts
@@ -1,5 +1,5 @@
-import * as IconExports from "./icon";
-import { DynamicContentNotAllowedError, isIcon, svgIcon } from "./icon";
+import * as IconExports from "./icon-service";
+import { DynamicContentNotAllowedError, isIcon, svgIcon } from "./icon-service";
 
 describe("Icon", () => {
   it("exports should not expose Icon class", () => {
diff --git a/libs/components/src/icon/icon.ts b/libs/assets/src/svg/icon-service.ts
similarity index 100%
rename from libs/components/src/icon/icon.ts
rename to libs/assets/src/svg/icon-service.ts
diff --git a/libs/assets/src/svg/index.ts b/libs/assets/src/svg/index.ts
new file mode 100644
index 00000000000..9f86a14f772
--- /dev/null
+++ b/libs/assets/src/svg/index.ts
@@ -0,0 +1,2 @@
+export * from "./svgs";
+export * from "./icon-service";
diff --git a/libs/tools/send/send-ui/src/icons/active-send.icon.ts b/libs/assets/src/svg/svgs/active-send.icon.ts
similarity index 98%
rename from libs/tools/send/send-ui/src/icons/active-send.icon.ts
rename to libs/assets/src/svg/svgs/active-send.icon.ts
index da5932bf95c..be5cb4540f7 100644
--- a/libs/tools/send/send-ui/src/icons/active-send.icon.ts
+++ b/libs/assets/src/svg/svgs/active-send.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const ActiveSendIcon = svgIcon`
 <svg width="96" height="95" viewBox="0 0 96 95" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/components/src/icon/logos/bitwarden/admin-console.ts b/libs/assets/src/svg/svgs/admin-console.ts
similarity index 99%
rename from libs/components/src/icon/logos/bitwarden/admin-console.ts
rename to libs/assets/src/svg/svgs/admin-console.ts
index 5fa96d91dfe..aa59c3f7e86 100644
--- a/libs/components/src/icon/logos/bitwarden/admin-console.ts
+++ b/libs/assets/src/svg/svgs/admin-console.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../../icon";
+import { svgIcon } from "../icon-service";
 
 const AdminConsoleLogo = svgIcon`
     <svg xmlns="http://www.w3.org/2000/svg" width="200" height="46" fill="none"><g class="tw-fill-text-alt2" clip-path="url(#a)"><path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/><path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM92.66 45.44l3.974-10.782h1.37l3.959 10.782h-1.371l-.986-2.773h-4.59l-1 2.773H92.66Zm2.742-3.82h3.82l-1.91-5.33-1.91 5.33ZM106.533 45.624c-.76 0-1.427-.174-2.002-.523a3.634 3.634 0 0 1-1.325-1.433c-.308-.606-.462-1.294-.462-2.064s.159-1.453.478-2.048a3.523 3.523 0 0 1 1.324-1.417c.565-.35 1.232-.524 2.002-.524.627 0 1.181.129 1.664.385.482.257.857.616 1.124 1.078V34.35h1.294v11.09h-1.171l-.123-1.264c-.246.37-.6.704-1.063 1.002-.462.297-1.042.446-1.74.446Zm.139-1.124c.513 0 .965-.118 1.355-.354.4-.247.709-.586.924-1.017.226-.431.339-.934.339-1.51 0-.574-.113-1.077-.339-1.509a2.356 2.356 0 0 0-.924-1c-.39-.247-.842-.37-1.355-.37-.503 0-.955.123-1.356.37-.39.235-.698.57-.924 1-.215.432-.323.935-.323 1.51s.108 1.078.323 1.51c.226.43.534.77.924 1.016.401.236.853.354 1.356.354ZM112.739 45.44V37.8h1.171l.092 1.109c.246-.41.575-.729.986-.955.41-.226.872-.339 1.386-.339.606 0 1.124.123 1.555.37.442.246.781.621 1.017 1.124a2.943 2.943 0 0 1 1.094-1.093c.472-.267.98-.4 1.524-.4.914 0 1.643.276 2.187.83.545.545.817 1.387.817 2.527v4.467h-1.279v-4.328c0-.791-.159-1.387-.477-1.787-.318-.4-.775-.6-1.371-.6-.616 0-1.129.24-1.54.723-.4.472-.601 1.15-.601 2.033v3.959h-1.293v-4.328c0-.791-.16-1.387-.478-1.787-.318-.4-.775-.6-1.371-.6-.606 0-1.114.24-1.525.723-.4.472-.6 1.15-.6 2.033v3.959h-1.294ZM127.302 36.106a.908.908 0 0 1-.647-.247.909.909 0 0 1-.246-.647c0-.246.082-.451.246-.616a.908.908 0 0 1 .647-.246.89.89 0 0 1 .632.246c.174.165.261.37.261.617a.88.88 0 0 1-.261.646.89.89 0 0 1-.632.247Zm-.647 9.334V37.8h1.294v7.64h-1.294ZM130.202 45.44V37.8h1.17l.077 1.37a2.779 2.779 0 0 1 1.063-1.139 2.994 2.994 0 0 1 1.571-.416c.904 0 1.622.277 2.156.832.545.544.817 1.386.817 2.526v4.467h-1.294v-4.328c0-1.592-.657-2.388-1.972-2.388-.657 0-1.206.242-1.648.724-.431.472-.647 1.15-.647 2.033v3.959h-1.293ZM147.897 45.624c-1.057 0-1.971-.23-2.741-.693a4.804 4.804 0 0 1-1.771-1.956c-.421-.842-.632-1.817-.632-2.926 0-1.099.211-2.064.632-2.896.421-.842 1.011-1.499 1.771-1.971.77-.473 1.684-.709 2.741-.709 1.233 0 2.234.298 3.004.894.78.585 1.278 1.406 1.494 2.464h-1.433c-.164-.668-.503-1.202-1.016-1.602-.503-.41-1.186-.616-2.049-.616-.77 0-1.442.18-2.017.539-.575.35-1.022.857-1.34 1.525-.308.657-.462 1.448-.462 2.372 0 .924.154 1.72.462 2.387.318.657.765 1.166 1.34 1.525.575.349 1.247.523 2.017.523.863 0 1.546-.195 2.049-.585.513-.4.852-.929 1.016-1.586h1.433c-.216 1.037-.714 1.848-1.494 2.433-.77.586-1.771.878-3.004.878ZM157.658 45.624c-.719 0-1.366-.164-1.941-.493a3.62 3.62 0 0 1-1.37-1.386c-.329-.606-.493-1.314-.493-2.125 0-.811.169-1.515.508-2.11a3.602 3.602 0 0 1 1.371-1.402 3.924 3.924 0 0 1 1.956-.493c.719 0 1.366.164 1.941.493a3.497 3.497 0 0 1 1.355 1.402c.339.595.508 1.299.508 2.11 0 .81-.169 1.52-.508 2.125a3.598 3.598 0 0 1-1.386 1.386c-.575.329-1.222.493-1.941.493Zm0-1.109c.442 0 .852-.108 1.232-.323.38-.216.688-.54.924-.97.237-.432.355-.966.355-1.602 0-.637-.118-1.17-.355-1.602-.226-.431-.528-.755-.908-.97a2.428 2.428 0 0 0-1.217-.324c-.442 0-.852.108-1.232.324-.38.215-.688.539-.924.97-.237.431-.355.965-.355 1.602 0 .636.118 1.17.355 1.602.236.43.539.754.908.97.38.215.786.323 1.217.323ZM163.292 45.44V37.8h1.171l.077 1.37a2.77 2.77 0 0 1 1.062-1.139 2.994 2.994 0 0 1 1.571-.416c.904 0 1.623.277 2.157.832.544.544.816 1.386.816 2.526v4.467h-1.294v-4.328c0-1.592-.657-2.388-1.971-2.388-.657 0-1.207.242-1.648.724-.431.472-.647 1.15-.647 2.033v3.959h-1.294ZM175.033 45.624c-.914 0-1.674-.23-2.28-.693-.606-.462-.96-1.088-1.063-1.879h1.325c.082.4.293.75.631 1.047.35.288.817.432 1.402.432.544 0 .945-.113 1.201-.34.257-.235.385-.513.385-.83 0-.463-.169-.77-.508-.925-.328-.154-.796-.293-1.401-.416a7.95 7.95 0 0 1-1.233-.354 2.866 2.866 0 0 1-1.032-.647c-.277-.287-.415-.662-.415-1.124 0-.668.246-1.212.739-1.633.503-.431 1.181-.647 2.033-.647.811 0 1.473.206 1.987.616.524.4.826.976.909 1.725h-1.279c-.051-.39-.221-.693-.508-.908-.277-.226-.652-.34-1.124-.34-.462 0-.822.098-1.079.293a.935.935 0 0 0-.369.77c0 .309.159.55.477.724.329.175.77.324 1.325.447.472.103.919.231 1.34.385.431.144.78.365 1.047.662.277.288.416.709.416 1.263.01.688-.252 1.258-.786 1.71-.523.441-1.237.662-2.14.662ZM183.288 45.624c-.719 0-1.366-.164-1.941-.493a3.627 3.627 0 0 1-1.37-1.386c-.329-.606-.493-1.314-.493-2.125 0-.811.169-1.515.508-2.11a3.602 3.602 0 0 1 1.371-1.402 3.924 3.924 0 0 1 1.956-.493c.719 0 1.366.164 1.941.493a3.497 3.497 0 0 1 1.355 1.402c.339.595.508 1.299.508 2.11 0 .81-.169 1.52-.508 2.125a3.598 3.598 0 0 1-1.386 1.386c-.575.329-1.222.493-1.941.493Zm0-1.109c.442 0 .852-.108 1.232-.323.38-.216.688-.54.924-.97.237-.432.355-.966.355-1.602 0-.637-.118-1.17-.355-1.602a2.307 2.307 0 0 0-.908-.97 2.428 2.428 0 0 0-1.217-.324c-.442 0-.852.108-1.232.324-.38.215-.688.539-.924.97-.237.431-.355.965-.355 1.602 0 .636.118 1.17.355 1.602.236.43.539.754.908.97.38.215.786.323 1.217.323ZM188.922 45.44V34.35h1.294v11.09h-1.294ZM195.771 45.624c-.729 0-1.376-.164-1.941-.493a3.673 3.673 0 0 1-1.34-1.401c-.318-.596-.477-1.3-.477-2.11 0-.801.159-1.5.477-2.095a3.427 3.427 0 0 1 1.325-1.401c.575-.34 1.237-.509 1.987-.509.739 0 1.376.17 1.91.508.544.33.96.766 1.247 1.31a3.697 3.697 0 0 1 .416 2.094v.385h-6.084c.031.586.165 1.073.401 1.464a2.5 2.5 0 0 0 .909.862c.369.195.759.293 1.17.293.534 0 .981-.123 1.34-.37.359-.246.621-.58.786-1.001h1.278a3.47 3.47 0 0 1-1.186 1.771c-.575.462-1.314.693-2.218.693Zm0-6.915c-.616 0-1.165.19-1.648.57-.472.37-.744.913-.816 1.632h4.805c-.031-.688-.267-1.227-.708-1.617-.442-.39-.986-.585-1.633-.585Z"/></g><defs><clipPath id="a"><path class="tw-fill-text-alt2" d="M0 0h200v46H0z"/></clipPath></defs></svg>
diff --git a/libs/components/src/anon-layout/illustrations/left-illustration.ts b/libs/assets/src/svg/svgs/background-left-illustration.ts
similarity index 99%
rename from libs/components/src/anon-layout/illustrations/left-illustration.ts
rename to libs/assets/src/svg/svgs/background-left-illustration.ts
index 26fe9f6076b..50d9e76fb53 100644
--- a/libs/components/src/anon-layout/illustrations/left-illustration.ts
+++ b/libs/assets/src/svg/svgs/background-left-illustration.ts
@@ -1,5 +1,5 @@
-import { svgIcon } from "../../icon";
+import { svgIcon } from "../icon-service";
 
-export const LeftIllustration = svgIcon`
+export const BackgroundLeftIllustration = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 501 226"><g clip-path="url(#left-a)"><path class="tw-fill-illustration-bg-primary" d="M-71.691 6.821a4 4 0 0 1 4-4h296.5a4 4 0 0 1 4 4v188a4 4 0 0 1-4 4h-296.5a4 4 0 0 1-4-4v-188Z"/><path class="tw-fill-illustration-bg-primary" d="M-48.941 25.821a2 2 0 0 1 2-2h127.5v154h-127.5a2 2 0 0 1-2-2v-150Z"/><path class="tw-fill-illustration-bg-tertiary" d="M80.559 25.82a2 2 0 0 1 2-2h125.5a2 2 0 0 1 2 2v150.001a2 2 0 0 1-2 2h-125.5a2 2 0 0 1-2-2v-150ZM45.871 89.854c0 17.155-13.96 31.062-31.182 31.062-17.221 0-31.182-13.907-31.182-31.062s13.96-31.062 31.182-31.062c17.221 0 31.182 13.907 31.182 31.062Z"/><path class="tw-fill-illustration-bg-tertiary" d="M72.396 153.443a57.243 57.243 0 0 1 4.663 22.604v1.222a2 2 0 0 1-2 2h-118.5a2 2 0 0 1-2-2v-1.222a57.243 57.243 0 0 1 4.662-22.604c3.078-7.167 7.59-13.678 13.277-19.163 5.688-5.485 12.44-9.836 19.871-12.805a63.228 63.228 0 0 1 23.44-4.496 63.227 63.227 0 0 1 23.439 4.496c7.431 2.969 14.183 7.32 19.87 12.805 5.688 5.485 10.2 11.996 13.278 19.163Z"/><path class="tw-fill-illustration-bg-secondary" d="M161.629 57.193c0 9.182-7.579 16.625-16.927 16.625-9.349 0-16.928-7.443-16.928-16.625 0-9.181 7.579-16.625 16.928-16.625 9.348 0 16.927 7.444 16.927 16.625Z"/><path class="tw-fill-illustration-bg-secondary" d="M176.028 89.071a29.33 29.33 0 0 1 2.531 11.894c0 .937-.759 1.696-1.696 1.696h-63.109a1.695 1.695 0 0 1-1.695-1.696c0-4.081.86-8.123 2.531-11.894 1.671-3.77 4.12-7.197 7.207-10.083 3.088-2.886 6.753-5.176 10.787-6.738a35.275 35.275 0 0 1 12.725-2.366c4.366 0 8.69.804 12.724 2.366 4.034 1.562 7.699 3.852 10.787 6.738 3.087 2.886 5.537 6.312 7.208 10.083ZM161.629 134.193c0 9.182-7.579 16.625-16.927 16.625-9.349 0-16.928-7.443-16.928-16.625s7.579-16.625 16.928-16.625c9.348 0 16.927 7.443 16.927 16.625Z"/><path class="tw-fill-illustration-bg-secondary" d="M176.028 165.953a28.993 28.993 0 0 1 2.531 11.821c0 .93-.755 1.684-1.685 1.684h-63.131c-.93 0-1.684-.754-1.684-1.684 0-4.057.86-8.074 2.531-11.821 1.671-3.748 4.12-7.153 7.207-10.021 3.088-2.869 6.753-5.144 10.787-6.696a35.456 35.456 0 0 1 12.725-2.352c4.366 0 8.69.799 12.724 2.352 4.034 1.552 7.699 3.827 10.787 6.696 3.087 2.868 5.537 6.273 7.208 10.021ZM-87.441 199.521h332.5v14.5c0 5.523-4.478 10-10 10h-312.5c-5.523 0-10-4.477-10-10v-14.5Z"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M208.059 21.82a4 4 0 0 1 4 4v150.001a4 4 0 0 1-4 4l-255 .001a4 4 0 0 1-4-4v-150a4 4 0 0 1 4-4l255-.001Zm-255 154.002h1.5a57.23 57.23 0 0 1 4.378-21.706l.284-.673c2.982-6.943 7.31-13.27 12.748-18.646l.529-.517c5.688-5.485 12.44-9.836 19.871-12.805a62.937 62.937 0 0 1 10.036-3.065c-11.113-4.751-18.897-15.747-18.897-28.556 0-17.155 13.96-31.061 31.182-31.062 17.22 0 31.18 13.907 31.181 31.062 0 12.537-7.457 23.338-18.192 28.245a62.952 62.952 0 0 1 11.569 3.376c7.431 2.969 14.184 7.32 19.871 12.805 5.688 5.485 10.2 11.996 13.278 19.163a57.251 57.251 0 0 1 4.66 22.379h1.502v-150h-125.5v150Zm129.5-.001h29.568a29.02 29.02 0 0 1 2.159-9.161l.304-.706c1.671-3.748 4.12-7.154 7.207-10.022 2.894-2.689 6.297-4.857 10.035-6.396l.752-.299c.996-.383 2.01-.721 3.037-1.012-4.602-2.879-7.693-7.881-7.841-13.602l-.006-.429c0-9.182 7.579-16.625 16.928-16.625l.437.006c9.146.227 16.49 7.581 16.49 16.619l-.006.429c-.144 5.571-3.08 10.461-7.484 13.372 1.321.338 2.622.752 3.894 1.242 4.034 1.552 7.7 3.827 10.787 6.695 3.088 2.868 5.536 6.274 7.207 10.022a29.066 29.066 0 0 1 2.462 9.867h29.57v-73h-125.5v73Zm62.75-24.936c-3.881 0-7.718.71-11.288 2.084-3.571 1.374-6.797 3.382-9.501 5.894-2.704 2.511-4.831 5.478-6.277 8.72a25.125 25.125 0 0 0-2.074 7.876h58.279a25.125 25.125 0 0 0-2.074-7.876c-1.445-3.242-3.573-6.209-6.276-8.72-2.705-2.512-5.931-4.52-9.501-5.894a31.473 31.473 0 0 0-11.288-2.084Zm-129.5-29.906a59.215 59.215 0 0 0-21.955 4.211c-6.957 2.779-13.269 6.848-18.579 11.969-5.31 5.12-9.513 11.191-12.378 17.862a53.266 53.266 0 0 0-4.332 20.248H73.053a53.266 53.266 0 0 0-4.332-20.248c-2.866-6.671-7.07-12.742-12.38-17.862-5.31-5.121-11.621-9.19-18.577-11.969a59.215 59.215 0 0 0-21.955-4.211Zm128.893.59c-7.208 0-12.928 5.72-12.928 12.625.001 6.904 5.721 12.624 12.928 12.624 7.208 0 12.926-5.72 12.927-12.624 0-6.905-5.719-12.625-12.927-12.625ZM14.69 62.792c-15.027 0-27.182 12.13-27.182 27.062 0 14.931 12.155 27.062 27.181 27.063 15.027-.001 27.182-12.132 27.182-27.063S29.716 62.793 14.69 62.792Zm67.869 36.029h29.579c.229-3.094.952-6.141 2.148-9.04l.304-.71a30.936 30.936 0 0 1 6.636-9.536l.571-.547a33.416 33.416 0 0 1 10.035-6.437l.752-.3a34.78 34.78 0 0 1 3.047-1.021c-4.607-2.878-7.703-7.883-7.851-13.607l-.006-.43c0-9.18 7.579-16.624 16.928-16.624l.437.006c9.146.227 16.49 7.58 16.49 16.619l-.006.429c-.144 5.574-3.082 10.465-7.49 13.376 1.324.34 2.626.758 3.9 1.252 4.034 1.561 7.7 3.85 10.787 6.737 3.088 2.886 5.536 6.312 7.207 10.083a29.407 29.407 0 0 1 2.451 9.75h29.581v-73h-125.5v73Zm62.75-24.937c-3.878 0-7.712.714-11.281 2.096-3.568 1.382-6.795 3.401-9.5 5.93-2.704 2.528-4.833 5.515-6.281 8.782a25.432 25.432 0 0 0-2.08 7.969h58.283a25.432 25.432 0 0 0-2.08-7.97c-1.447-3.266-3.577-6.253-6.281-8.781-2.705-2.529-5.931-4.548-9.5-5.93a31.275 31.275 0 0 0-11.28-2.096Zm-.607-29.315c-7.208 0-12.928 5.72-12.928 12.625.001 6.904 5.721 12.624 12.928 12.624 7.208 0 12.926-5.72 12.927-12.624 0-6.905-5.719-12.625-12.927-12.625Z" clip-rule="evenodd"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M228.809.822a6 6 0 0 1 6 6v188a5.97 5.97 0 0 1-.643 2.699h12.893v16.5c0 6.627-5.373 12-12 12h-312.5c-6.628 0-12-5.373-12-12v-16.5h16.391a5.966 5.966 0 0 1-.634-2.391l-.007-.308v-188a6 6 0 0 1 6-6h296.5ZM-85.441 214.02a8 8 0 0 0 8 8h312.5a8 8 0 0 0 8-8v-12.5h-328.5v12.5Zm17.75-209.2a2 2 0 0 0-2 2v188.001l.01.204a2 2 0 0 0 1.99 1.796h296.5a2.001 2.001 0 0 0 2-2v-188a2 2 0 0 0-2-2h-296.5Z" clip-rule="evenodd"/><path class="tw-fill-illustration-bg-primary" d="M378.821 114.003a1.997 1.997 0 0 0-.675 1.497v8.396c0 .583.254 1.136.697 1.515l11.455 9.825a2 2 0 0 1 .543 2.286l-4.203 10.056a1.998 1.998 0 0 1-1.936 1.224l-15.288-.717a1.997 1.997 0 0 0-1.501.579l-6.014 5.979a1.995 1.995 0 0 0-.583 1.569l1.145 14.942a1.997 1.997 0 0 1-1.22 1.995l-9.958 4.169a1.997 1.997 0 0 1-2.252-.503l-10.221-11.309a1.998 1.998 0 0 0-1.482-.658h-8.474c-.579 0-1.129.252-1.508.689l-9.889 11.4a1.998 1.998 0 0 1-2.28.534l-9.969-4.174a1.998 1.998 0 0 1-1.224-1.937l.721-15.182a2 2 0 0 0-.587-1.51l-6.014-5.98a1.996 1.996 0 0 0-1.559-.575l-15.049 1.14a1.997 1.997 0 0 1-1.993-1.221l-4.198-10.045a1.997 1.997 0 0 1 .512-2.258l11.363-10.155c.424-.379.666-.92.666-1.489v-8.403c0-.583-.254-1.136-.696-1.516l-11.456-9.824a1.997 1.997 0 0 1-.542-2.286L279.354 92a1.998 1.998 0 0 1 1.936-1.224l15.288.717a1.998 1.998 0 0 0 1.502-.579l6.007-5.974c.418-.415.631-.995.582-1.582l-1.292-15.419a1.995 1.995 0 0 1 1.218-2.008l9.942-4.163a1.996 1.996 0 0 1 2.258.51l10.552 11.786c.379.423.92.665 1.488.665h8.469c.579 0 1.129-.25 1.508-.688l9.889-11.4a1.996 1.996 0 0 1 2.279-.534l9.97 4.174a1.999 1.999 0 0 1 1.224 1.937l-.721 15.181a2 2 0 0 0 .587 1.51l6.014 5.98c.411.41.98.62 1.558.576l15.049-1.14a1.996 1.996 0 0 1 1.993 1.22l4.195 10.036c.33.79.12 1.702-.521 2.268l-11.507 10.154Z"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M313.765 59.926a3.994 3.994 0 0 1 4.518 1.02l10.552 11.786h8.469l9.888-11.4a3.994 3.994 0 0 1 4.559-1.067l9.97 4.174a3.994 3.994 0 0 1 2.447 3.873l-.72 15.182 6.013 5.98 15.049-1.14a3.995 3.995 0 0 1 3.987 2.442l4.194 10.035a3.992 3.992 0 0 1-1.042 4.534L380.142 115.5v8.396l11.456 9.824a3.995 3.995 0 0 1 1.085 4.571l-4.203 10.056a3.993 3.993 0 0 1-3.872 2.449l-15.288-.717-6.013 5.98 1.145 14.943a3.994 3.994 0 0 1-2.44 3.988l-9.958 4.169a3.992 3.992 0 0 1-4.505-1.005l-10.221-11.309h-8.474l-9.889 11.4a3.993 3.993 0 0 1-4.559 1.067l-9.97-4.174a3.993 3.993 0 0 1-2.446-3.873l.72-15.181-6.014-5.98-15.049 1.14a3.993 3.993 0 0 1-3.986-2.442l-4.198-10.045a3.993 3.993 0 0 1 1.023-4.517l11.363-10.155v-8.403l-11.455-9.825a3.992 3.992 0 0 1-1.085-4.571l4.203-10.056a3.993 3.993 0 0 1 3.872-2.45l15.287.718 6.008-5.974-1.292-15.418a3.992 3.992 0 0 1 2.437-4.017l9.941-4.163Zm1.543 3.684-9.942 4.162 1.292 15.419a3.992 3.992 0 0 1-1.163 3.165l-6.008 5.974a3.994 3.994 0 0 1-3.003 1.157l-15.288-.717-4.202 10.056 11.455 9.824a3.993 3.993 0 0 1 1.394 3.032v8.403c0 1.137-.485 2.22-1.332 2.978l-11.364 10.154 4.198 10.045 15.049-1.14a3.994 3.994 0 0 1 3.118 1.15l6.014 5.98a3.996 3.996 0 0 1 1.173 3.021l-.72 15.181 9.969 4.175 9.889-11.401a3.994 3.994 0 0 1 3.017-1.377h8.474c1.129 0 2.206.478 2.963 1.316l10.221 11.309 9.958-4.169-1.145-14.943a3.996 3.996 0 0 1 1.166-3.137l6.013-5.979a3.997 3.997 0 0 1 3.003-1.158l15.288.717 4.203-10.056-11.456-9.824a3.995 3.995 0 0 1-1.393-3.031V115.5c0-1.146.492-2.236 1.351-2.994l11.506-10.155-4.194-10.035-15.049 1.14a3.991 3.991 0 0 1-3.117-1.15l-6.014-5.98a3.99 3.99 0 0 1-1.173-3.022l.72-15.181-9.97-4.174-9.889 11.4a3.992 3.992 0 0 1-3.016 1.377h-8.469a3.992 3.992 0 0 1-2.975-1.33L315.308 63.61Z" clip-rule="evenodd"/><path class="tw-fill-illustration-logo" d="M353.438 119.624c0 11.289-9.152 20.441-20.442 20.441-11.289 0-20.441-9.152-20.441-20.441 0-11.29 9.152-20.442 20.441-20.442 11.29 0 20.442 9.152 20.442 20.442Z"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M332.996 101.179c-10.186 0-18.444 8.258-18.444 18.444 0 10.187 8.258 18.445 18.444 18.445 10.187 0 18.445-8.258 18.445-18.445 0-10.186-8.258-18.444-18.445-18.444Zm-22.438 18.444c0-12.392 10.046-22.438 22.438-22.438 12.393 0 22.439 10.046 22.439 22.438 0 12.393-10.046 22.439-22.439 22.439-12.392 0-22.438-10.046-22.438-22.439Z" clip-rule="evenodd"/><path class="tw-fill-illustration-bg-tertiary" d="m497.152 164.106-7.588-7.587a3.004 3.004 0 0 0-4.245-.003l-4.055 4.047 11.83 11.83 4.055-4.047a2.996 2.996 0 0 0 .003-4.24Z"/><path class="tw-fill-illustration-bg-secondary" d="M500.922 194.274c0 22.644-18.356 41-41 41s-41-18.356-41-41 18.356-41 41-41 41 18.356 41 41Z"/><path class="tw-fill-illustration-outline" d="M459.03 177.416a2 2 0 1 1 4 0v18.469c0 .613-.282 1.192-.763 1.571l-12.032 9.48a2.001 2.001 0 0 1-2.809-.333 2.002 2.002 0 0 1 .334-2.809l11.27-8.881v-17.497Z"/><path class="tw-fill-illustration-bg-tertiary" d="M450.936 144.041a2 2 0 0 1 2-2h13.972a2 2 0 0 1 2 2v3.863a2 2 0 0 1-2 2h-13.972a2 2 0 0 1-2-2v-3.863Z"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M467.114 140.046a4 4 0 0 1 3.794 3.995v3.863a3.999 3.999 0 0 1-3.931 3.998v1.978a40.72 40.72 0 0 1 13.484 4.903l3.69-3.68a5.008 5.008 0 0 1 7.076.003l7.587 7.588.177.186a4.994 4.994 0 0 1-.181 6.881l-3.615 3.606a40.801 40.801 0 0 1 5.727 20.907c0 22.644-18.357 41-41 41-22.644 0-41-18.356-41-41 0-20.434 14.949-37.375 34.507-40.487v-1.883h-.493a4 4 0 0 1-4-4v-3.863a4 4 0 0 1 4-4h13.972l.206.005Zm-7.192 17.228c-20.435 0-37 16.566-37 37 0 20.435 16.565 37 37 37 20.434 0 37-16.565 37-37 0-20.434-16.566-37-37-37Zm28.473.658a1.002 1.002 0 0 0-1.416-.001l-2.638 2.633 9.001 9.002 2.639-2.633a1 1 0 0 0 .07-1.338l-.069-.075-7.587-7.588Zm-30.966-6.028v1.447a41.171 41.171 0 0 1 5.548.036v-1.483h-5.548Zm-4.493-4h13.972v-3.863h-13.972v3.863Z" clip-rule="evenodd"/></g><defs><clipPath id="left-a"><path class="tw-fill-illustration-bg-tertiary" d="M0 0h501v226H0z"/></clipPath></defs></svg>
 `;
diff --git a/libs/components/src/anon-layout/illustrations/right-illustration.ts b/libs/assets/src/svg/svgs/background-right-illustration.ts
similarity index 99%
rename from libs/components/src/anon-layout/illustrations/right-illustration.ts
rename to libs/assets/src/svg/svgs/background-right-illustration.ts
index ba3003ee01f..52be2213c3b 100644
--- a/libs/components/src/anon-layout/illustrations/right-illustration.ts
+++ b/libs/assets/src/svg/svgs/background-right-illustration.ts
@@ -1,5 +1,5 @@
-import { svgIcon } from "../../icon";
+import { svgIcon } from "../icon-service";
 
-export const RightIllustration = svgIcon`
+export const BackgroundRightIllustration = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 506 297"><g clip-path="url(#right-a)"><path class="tw-fill-illustration-bg-primary" d="M45.673 294.742v-29.124l22.323 16.198-15.395 15.75a4.04 4.04 0 0 1-6.928-2.824Z"/><path class="tw-fill-illustration-bg-tertiary" d="m4.978 240.865 95.568-44.738c3.52-1.648 7.492 1.175 7.093 5.041l-9.608 93.173c-.395 3.823-4.774 5.79-7.893 3.547l-43.43-31.233-41.47-16.621c-4.06-1.627-4.221-7.315-.26-9.169Z"/><path class="tw-fill-illustration-outline" d="M99.698 194.315c4.929-2.306 10.489 1.645 9.931 7.058l-9.608 93.174c-.552 5.351-6.683 8.105-11.05 4.965l-20.832-14.983-14.107 14.435a6.04 6.04 0 0 1-10.359-4.222v-27.151l-39.178-15.7c-5.684-2.278-5.91-10.242-.364-12.838l95.567-44.738Zm5.953 6.648c.239-2.32-2.144-4.013-4.256-3.025L5.827 242.676c-2.376 1.112-2.28 4.525.156 5.502l40.159 16.093 26.703-30.327a2.001 2.001 0 0 1 3.002 2.644l-26.178 29.731 41.637 29.945c1.872 1.346 4.5.165 4.736-2.128l9.609-93.173Zm-57.978 93.779a2.04 2.04 0 0 0 3.498 1.426l13.684-14.001-17.182-12.357v24.932Z"/><circle cx="86.719" cy="86.719" r="84.719" class="tw-fill-illustration-bg-tertiary" stroke="#020F66" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" transform="scale(-1 1) rotate(45.035 -184.565 -565.488)"/><circle cx="69.752" cy="69.752" r="69.752" class="tw-fill-illustration-bg-secondary" transform="scale(-1 1) rotate(45.035 -213.255 -553.709)"/><path class="tw-fill-illustration-outline" d="m445.838 353.214 2.95-180.467 12.372-.007 3.078 180.465a4.64 4.64 0 0 1-4.637 4.72l-9.12.005a4.64 4.64 0 0 1-4.643-4.716ZM453.82 52.947a2 2 0 0 1 1.998-2.001l35.638-.023a2 2 0 0 1 2.001 2.015l-.268 35.637a2 2 0 1 1-4-.03l.252-33.62-33.62.02a1.999 1.999 0 0 1-2.001-1.998ZM415.689 86.49a2 2 0 0 1 4.001.03l-.254 33.62 33.622-.021a2 2 0 0 1 .003 4l-35.637.022a2 2 0 0 1-2.001-2.015l.266-35.636Zm25.457-19.997a2 2 0 0 1 3.461-2.006l23.124 39.885a2 2 0 0 1-3.461 2.006l-23.124-39.885Z"/><path class="tw-fill-illustration-bg-primary" d="M259.264 277.271c21.107-4.293 34.791-24.62 30.565-45.402-4.227-20.782-24.764-34.15-45.871-29.857-21.107 4.293-34.791 24.62-30.565 45.402 4.227 20.783 24.764 34.15 45.871 29.857ZM299.993 173.472c7.793-1.585 12.826-9.188 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.187-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-bg-secondary" d="M329.869 242.094c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.188-12.826-16.981-11.241-7.794 1.585-12.827 9.188-11.241 16.981 1.585 7.794 9.187 12.827 16.981 11.241Z"/><path class="tw-fill-illustration-bg-tertiary" d="M330.088 309.401c7.794-1.585 12.826-9.188 11.241-16.981-1.585-7.794-9.187-12.827-16.981-11.242-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.827 16.981 11.242Z"/><path class="tw-fill-illustration-bg-primary" d="M234.598 327.597c7.793-1.585 12.826-9.187 11.241-16.981-1.585-7.793-9.187-12.826-16.981-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.794 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-bg-secondary" d="M176.919 248.71c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.794-9.188-12.827-16.982-11.242-7.793 1.586-12.826 9.188-11.241 16.982 1.585 7.793 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-bg-tertiary" d="M206.836 185.071c7.794-1.585 12.827-9.188 11.242-16.981-1.586-7.793-9.188-12.826-16.982-11.241-7.793 1.585-12.826 9.188-11.241 16.981 1.585 7.793 9.188 12.826 16.981 11.241Z"/><path class="tw-fill-illustration-outline" fill-rule="evenodd" d="M200.699 154.89c8.875-1.805 17.533 3.927 19.339 12.803 1.165 5.732-.814 11.372-4.752 15.135.131.223.29.502.489.845l14.805 21.386a41.483 41.483 0 0 1 12.979-5.007c9.276-1.886 18.455-.523 26.321 3.303.038-.221.111-.441.227-.648l17.035-30.333a16.337 16.337 0 0 1-6.09-9.744c-1.805-8.876 3.928-17.535 12.803-19.34 8.876-1.805 17.534 3.928 19.339 12.803 1.805 8.876-3.926 17.534-12.802 19.339-3.427.697-6.822.27-9.803-1.028l-16.994 30.262a1.98 1.98 0 0 1-.397.497c8.774 5.316 15.487 13.883 18.16 24.43l19.238-1.61c-.007-7.642 5.356-14.488 13.135-16.07 8.875-1.805 17.534 3.927 19.339 12.803 1.805 8.875-3.927 17.533-12.802 19.339-8.639 1.757-17.072-3.627-19.18-12.099l-18.935 1.585c1.474 9.839-.81 19.465-5.834 27.387l29.108 22.962a16.324 16.324 0 0 1 8.523-4.671c8.876-1.804 17.534 3.928 19.339 12.803 1.805 8.876-3.927 17.534-12.802 19.339-8.875 1.805-17.534-3.926-19.34-12.802a16.338 16.338 0 0 1 1.872-11.474l-29.007-22.882c-5.828 7.464-14.29 12.983-24.349 15.028a41.442 41.442 0 0 1-14.045.441l-6.224 19.317a16.365 16.365 0 0 1 8.405 11.229c1.805 8.876-3.927 17.534-12.802 19.339-8.876 1.805-17.535-3.926-19.34-12.802-1.805-8.875 3.927-17.534 12.803-19.34 2.461-.5 4.906-.42 7.192.145l6.007-18.641c-14.851-3.594-27.011-15.301-30.225-31.105a40.043 40.043 0 0 1-.808-8.184l-20.473-1.442c-.032-.002-.064-.008-.096-.011-1.37 6.114-6.201 11.162-12.739 12.492-8.875 1.805-17.534-3.926-19.339-12.802-1.805-8.875 3.927-17.534 12.802-19.34 8.876-1.804 17.534 3.928 19.339 12.803.196.962.302 1.921.327 2.869l20.401 1.436c1.206-11.333 7.247-21.627 16.399-28.363l-14.76-21.321a20.41 20.41 0 0 0-.435-.719 16.428 16.428 0 0 1-4.816 1.8c-8.876 1.805-17.535-3.927-19.34-12.802-1.805-8.876 3.927-17.535 12.803-19.34Zm124.048 128.249c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.364-6.71-7.911-11.044-14.622-9.68Zm-95.49 18.196c-6.711 1.365-11.045 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.621-1.365-6.711-7.911-11.045-14.622-9.681Zm15.1-97.363c-20.054 4.079-33.004 23.373-29.004 43.044 4.001 19.672 23.459 32.374 43.513 28.296 9.593-1.951 17.558-7.386 22.822-14.676a1.986 1.986 0 0 1 .612-.873c5.306-7.813 7.58-17.606 5.569-27.495-4.001-19.671-23.459-32.374-43.512-28.296Zm80.171 11.861c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.623 9.679 6.71-1.365 11.044-7.911 9.679-14.622-1.365-6.711-7.911-11.045-14.622-9.68Zm-152.949 6.614c-6.711 1.365-11.045 7.912-9.681 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.621-1.365-6.711-7.912-11.045-14.622-9.681Zm123.073-75.237c-6.71 1.365-11.044 7.912-9.68 14.623 1.365 6.711 7.912 11.044 14.623 9.679 6.711-1.365 11.044-7.911 9.68-14.622-1.365-6.71-7.912-11.045-14.623-9.68Zm-93.156 11.6c-6.711 1.364-11.045 7.912-9.68 14.623 1.365 6.71 7.912 11.044 14.622 9.679 6.711-1.365 11.044-7.912 9.68-14.622-1.365-6.711-7.911-11.045-14.622-9.68Z" clip-rule="evenodd"/><path class="tw-fill-illustration-logo" d="M272.266 232.544a1.998 1.998 0 0 0-.353 1.589l.554 2.725a2.002 2.002 0 0 0 1.002 1.357l4.786 2.611a2 2 0 0 1 1.003 2.15l-.667 3.313a1.998 1.998 0 0 1-1.647 1.58l-5.641.896a1.998 1.998 0 0 0-1.352.867l-1.524 2.291a2 2 0 0 0-.252 1.678l1.555 5.227a2 2 0 0 1-.794 2.224l-2.799 1.902a2 2 0 0 1-2.309-.043l-4.524-3.327a2 2 0 0 0-1.583-.348l-2.754.56a1.997 1.997 0 0 0-1.352.994l-2.638 4.785a2 2 0 0 1-2.14.996l-3.339-.661a2 2 0 0 1-1.587-1.649l-.886-5.597a2.003 2.003 0 0 0-.875-1.358l-2.298-1.514a2 2 0 0 0-1.669-.247l-5.272 1.563a2 2 0 0 1-2.22-.788l-1.897-2.774a2.001 2.001 0 0 1 .045-2.321l3.339-4.498a2.004 2.004 0 0 0 .354-1.591l-.557-2.736a2.001 2.001 0 0 0-.983-1.347l-4.848-2.715a2 2 0 0 1-.983-2.14l.669-3.329a2.001 2.001 0 0 1 1.648-1.581l5.641-.895a1.999 1.999 0 0 0 1.352-.868l1.526-2.293c.327-.493.42-1.105.253-1.673l-1.608-5.457a2 2 0 0 1 .794-2.22l2.793-1.897a2 2 0 0 1 2.322.053l4.676 3.5a1.999 1.999 0 0 0 1.597.359l2.744-.558a2.002 2.002 0 0 0 1.353-.995l2.637-4.784a1.997 1.997 0 0 1 2.14-.996l3.339.661a2 2 0 0 1 1.587 1.649l.886 5.597c.088.555.406 1.048.875 1.357l2.298 1.514a2.002 2.002 0 0 0 1.669.248l5.272-1.564a2 2 0 0 1 2.22.789l1.898 2.775a2 2 0 0 1-.044 2.319l-3.432 4.635Zm-24.977-.064c-4.049 2.702-5.078 8.076-2.395 11.991 2.705 4.028 8.1 5.044 12.035 2.365 3.936-2.678 5.078-8.076 2.395-11.991-2.592-4.051-7.986-5.067-12.035-2.365Z"/><path class="tw-fill-illustration-outline" d="m270.507 237.256-.554-2.724a4.004 4.004 0 0 1 .705-3.178l3.433-4.636-1.897-2.775-5.273 1.564a4 4 0 0 1-3.337-.494l-2.298-1.515a4 4 0 0 1-1.751-2.714l-.886-5.597-3.339-.661-2.637 4.784a4.001 4.001 0 0 1-2.706 1.989l-2.744.558a4 4 0 0 1-3.194-.718l-4.676-3.5-2.792 1.898 1.608 5.457a3.998 3.998 0 0 1-.507 3.345l-1.525 2.294c-.62.931-1.6 1.56-2.704 1.736l-5.642.895-.669 3.329 4.848 2.715a4 4 0 0 1 1.965 2.693l.557 2.737a3.999 3.999 0 0 1-.708 3.18l-3.338 4.499 1.897 2.774 5.272-1.563a3.998 3.998 0 0 1 3.338.494l2.298 1.514a4.001 4.001 0 0 1 1.75 2.715l.886 5.597 3.339.661 2.638-4.785a4 4 0 0 1 2.706-1.988l2.753-.56a4 4 0 0 1 3.166.697l4.524 3.327 2.8-1.902-1.555-5.227a4.002 4.002 0 0 1 .504-3.355l1.524-2.291a3.998 3.998 0 0 1 2.703-1.736l5.642-.895.667-3.313-4.787-2.611a4.004 4.004 0 0 1-2.004-2.714Zm-24.328-6.439c4.915-3.28 11.556-2.099 14.795 2.898h.001v.001l.034.051h-.001c3.294 4.868 1.835 11.464-2.953 14.723-4.855 3.304-11.499 2.043-14.821-2.903l.001-.001c-3.308-4.845-2.013-11.461 2.944-14.769Zm11.461 5.106c-1.959-3.06-6.075-3.891-9.24-1.779-3.036 2.026-3.85 5.957-2.039 8.913l.183.284.01.015c2.089 3.109 6.234 3.879 9.25 1.827 3.066-2.087 3.897-6.25 1.871-9.207a.97.97 0 0 1-.035-.053Zm16.787.536 4.787 2.611a4 4 0 0 1 2.005 4.3l-.666 3.313a4.001 4.001 0 0 1-3.295 3.161l-5.641.896-1.525 2.291 1.555 5.227a4.002 4.002 0 0 1-1.586 4.449l-2.8 1.901a4 4 0 0 1-4.618-.086l-4.523-3.326-2.753.56-2.638 4.784a4 4 0 0 1-4.279 1.993l-3.34-.661a4.002 4.002 0 0 1-3.174-3.298l-.886-5.598-2.298-1.514-5.273 1.564a3.999 3.999 0 0 1-4.438-1.577l-1.897-2.774a3.998 3.998 0 0 1 .09-4.641l3.338-4.499-.557-2.737-4.848-2.715a3.998 3.998 0 0 1-1.966-4.279l.669-3.329a4.002 4.002 0 0 1 3.294-3.162l5.642-.895 1.526-2.294-1.609-5.457a4.001 4.001 0 0 1 1.59-4.439l2.792-1.897a4 4 0 0 1 4.645.106l4.676 3.5 2.744-.558 2.636-4.785a4 4 0 0 1 4.281-1.992l3.339.661a4 4 0 0 1 3.174 3.298l.886 5.597 2.298 1.514 5.272-1.563a4 4 0 0 1 4.439 1.576l1.898 2.775a4.001 4.001 0 0 1-.087 4.639l-3.433 4.636.554 2.724Z"/></g><defs><clipPath id="right-a"><path class="tw-fill-illustration-bg-tertiary" d="M0 0h506v297H0z"/></clipPath></defs></svg>
 `;
diff --git a/libs/vault/src/icons/bitwarden-icon.ts b/libs/assets/src/svg/svgs/bitwarden-icon.ts
similarity index 97%
rename from libs/vault/src/icons/bitwarden-icon.ts
rename to libs/assets/src/svg/svgs/bitwarden-icon.ts
index 73e4304d5c7..710d20937bd 100644
--- a/libs/vault/src/icons/bitwarden-icon.ts
+++ b/libs/assets/src/svg/svgs/bitwarden-icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const BitwardenIcon = svgIcon`
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/components/src/icon/icons/bitwarden-logo.icon.ts b/libs/assets/src/svg/svgs/bitwarden-logo.icon.ts
similarity index 99%
rename from libs/components/src/icon/icons/bitwarden-logo.icon.ts
rename to libs/assets/src/svg/svgs/bitwarden-logo.icon.ts
index 27b8ece164d..9c1c7248ec6 100644
--- a/libs/components/src/icon/icons/bitwarden-logo.icon.ts
+++ b/libs/assets/src/svg/svgs/bitwarden-logo.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const BitwardenLogo = svgIcon`
   <svg viewBox="0 0 290 45" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/vault/src/icons/browser-extension.ts b/libs/assets/src/svg/svgs/browser-extension.ts
similarity index 97%
rename from libs/vault/src/icons/browser-extension.ts
rename to libs/assets/src/svg/svgs/browser-extension.ts
index ac54322292f..4e3b54e77cd 100644
--- a/libs/vault/src/icons/browser-extension.ts
+++ b/libs/assets/src/svg/svgs/browser-extension.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const BrowserExtensionIcon = svgIcon`
 <svg class="tw-max-w-full" width="115" height="114" viewBox="0 0 115 114" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/components/src/icon/logos/bitwarden/business-unit-portal.ts b/libs/assets/src/svg/svgs/business-unit-portal.ts
similarity index 99%
rename from libs/components/src/icon/logos/bitwarden/business-unit-portal.ts
rename to libs/assets/src/svg/svgs/business-unit-portal.ts
index 6206256f88b..66b30ba06be 100644
--- a/libs/components/src/icon/logos/bitwarden/business-unit-portal.ts
+++ b/libs/assets/src/svg/svgs/business-unit-portal.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../../icon";
+import { svgIcon } from "../icon-service";
 
 const BusinessUnitPortalLogo = svgIcon`
     <svg xmlns="http://www.w3.org/2000/svg" width="200" height="46" fill="none"><g class="tw-fill-text-alt2" clip-path="url(#a)"><path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/><path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM198.11 45.358V34.496h1.263v10.862h-1.263ZM192.412 45.539c-.611 0-1.123-.106-1.534-.317-.411-.221-.716-.508-.917-.86a2.355 2.355 0 0 1-.301-1.162c0-.512.131-.945.391-1.297.271-.362.647-.634 1.128-.815.491-.19 1.063-.286 1.714-.286h2.015c0-.473-.075-.865-.225-1.177a1.505 1.505 0 0 0-.632-.71c-.281-.16-.621-.24-1.022-.24-.482 0-.897.12-1.248.362-.351.241-.567.598-.647 1.07h-1.293c.06-.543.24-.995.541-1.357a2.942 2.942 0 0 1 1.173-.845 3.715 3.715 0 0 1 1.474-.302c.701 0 1.283.131 1.744.393.461.251.807.608 1.038 1.07.24.453.36.987.36 1.6v4.692h-1.127l-.076-1.343c-.1.211-.23.412-.391.603a2.49 2.49 0 0 1-.541.483c-.201.13-.436.237-.706.317-.271.08-.577.12-.918.12Zm.195-1.071c.351 0 .667-.07.948-.212.291-.15.536-.352.737-.603.2-.252.351-.533.451-.845.11-.322.165-.648.165-.98v-.046h-1.909c-.482 0-.873.06-1.173.181-.301.11-.517.272-.647.483a1.25 1.25 0 0 0-.195.694c0 .272.06.508.18.71.13.19.316.341.556.452.241.11.537.166.887.166ZM187.034 45.358c-.451 0-.842-.07-1.172-.211a1.545 1.545 0 0 1-.767-.71c-.171-.341-.256-.799-.256-1.372v-4.21h-1.308v-1.07h1.308l.166-1.826h1.097v1.826h2.211v1.07h-2.211v4.21c0 .473.096.794.286.965.19.161.526.242 1.008.242h.811v1.086h-1.173ZM178.521 45.358v-7.574h1.143l.105 1.449c.17-.342.386-.634.647-.875.27-.242.591-.428.962-.558.371-.131.792-.197 1.263-.197v1.328h-.436c-.32 0-.626.045-.917.136-.291.08-.552.216-.782.407-.221.181-.396.437-.526.77-.131.331-.196.739-.196 1.221v3.893h-1.263ZM173.006 45.539a3.741 3.741 0 0 1-1.895-.483 3.625 3.625 0 0 1-1.338-1.388c-.321-.593-.481-1.292-.481-2.097 0-.805.165-1.503.496-2.097a3.525 3.525 0 0 1 1.338-1.373 3.735 3.735 0 0 1 1.91-.498c.712 0 1.348.166 1.91.498.561.322 1.002.78 1.323 1.373.321.594.481 1.292.481 2.097 0 .805-.165 1.504-.496 2.097a3.489 3.489 0 0 1-1.339 1.388c-.561.322-1.197.483-1.909.483Zm0-1.086c.441 0 .847-.106 1.218-.317a2.37 2.37 0 0 0 .887-.966c.23-.432.346-.965.346-1.599 0-.644-.11-1.177-.331-1.599-.221-.423-.516-.74-.887-.95a2.307 2.307 0 0 0-1.203-.332c-.421 0-.822.11-1.203.332a2.355 2.355 0 0 0-.902.95c-.231.422-.346.955-.346 1.599 0 .634.115 1.167.346 1.6.23.422.526.744.887.965.371.21.767.317 1.188.317ZM161.415 45.358v-10.56h3.444c.822 0 1.499.14 2.03.422.532.271.927.638 1.188 1.101.261.463.391.986.391 1.569a3.22 3.22 0 0 1-.391 1.584c-.251.463-.641.835-1.173 1.116-.531.272-1.213.408-2.045.408h-2.18v4.36h-1.264Zm1.264-5.431h2.15c.842 0 1.444-.181 1.805-.544.36-.372.541-.87.541-1.493 0-.644-.181-1.142-.541-1.494-.361-.362-.963-.543-1.805-.543h-2.15v4.074ZM154.434 45.358c-.451 0-.842-.07-1.172-.211a1.545 1.545 0 0 1-.767-.71c-.171-.341-.256-.799-.256-1.372v-4.21h-1.308v-1.07h1.308l.166-1.826h1.097v1.826h2.211v1.07h-2.211v4.21c0 .473.096.794.286.965.19.161.526.242 1.007.242h.812v1.086h-1.173ZM147.995 45.358v-7.573h1.263v7.573h-1.263Zm.631-9.203a.884.884 0 0 1-.631-.241.889.889 0 0 1-.241-.634c0-.251.08-.452.241-.603a.884.884 0 0 1 .631-.242c.241 0 .446.08.617.242.17.15.255.352.255.603a.863.863 0 0 1-.255.634.867.867 0 0 1-.617.241ZM139.24 45.358v-7.574h1.142l.076 1.328a2.64 2.64 0 0 1 1.022-1.101 2.915 2.915 0 0 1 1.534-.408c.591 0 1.103.116 1.534.347.431.232.767.589 1.007 1.072.241.482.361 1.09.361 1.825v4.51h-1.263v-4.374c0-.765-.166-1.338-.497-1.72-.33-.382-.806-.573-1.428-.573-.421 0-.802.105-1.143.316-.33.202-.596.498-.796.89-.191.393-.286.87-.286 1.434v4.028h-1.263ZM133.251 45.539a4.397 4.397 0 0 1-1.97-.438 3.357 3.357 0 0 1-1.398-1.327c-.351-.604-.527-1.373-.527-2.309v-6.668h1.263v6.684c0 .683.111 1.241.331 1.674.231.433.547.75.948.95.401.202.862.302 1.383.302.531 0 .992-.1 1.383-.301.391-.202.697-.518.918-.95.22-.434.331-.992.331-1.675v-6.684h1.263v6.668c0 .936-.176 1.705-.527 2.309a3.335 3.335 0 0 1-1.413 1.327c-.592.292-1.253.438-1.985.438ZM120.686 45.539c-.611 0-1.152-.1-1.624-.302a2.779 2.779 0 0 1-1.128-.89 2.987 2.987 0 0 1-.511-1.343h1.294c.06.262.17.508.33.74.161.221.376.397.647.528.281.13.616.196 1.007.196.361 0 .657-.05.888-.151.23-.11.4-.257.511-.438.11-.18.165-.377.165-.588 0-.302-.075-.533-.225-.694-.141-.16-.351-.287-.632-.377a6.388 6.388 0 0 0-1.008-.257c-.33-.06-.656-.14-.977-.24a3.629 3.629 0 0 1-.842-.393 1.921 1.921 0 0 1-.602-.604 1.705 1.705 0 0 1-.225-.89c0-.432.11-.814.331-1.146.23-.342.546-.609.947-.8.411-.191.897-.287 1.459-.287.802 0 1.453.197 1.954.589.512.392.808.96.888 1.704h-1.248c-.04-.382-.201-.679-.481-.89-.281-.22-.657-.331-1.128-.331-.471 0-.832.095-1.083.286a.919.919 0 0 0-.361.755.78.78 0 0 0 .196.527c.14.151.346.282.616.393.271.1.597.19.978.271.491.091.942.212 1.353.362.411.151.742.373.993.664.26.292.391.71.391 1.252.009.473-.106.885-.346 1.238-.231.351-.562.628-.993.83-.431.19-.942.286-1.534.286ZM113.138 45.539c-.611 0-1.153-.1-1.624-.302a2.77 2.77 0 0 1-1.127-.89 2.976 2.976 0 0 1-.512-1.343h1.293c.061.262.171.508.331.74.161.221.376.397.647.528.28.13.616.196 1.007.196.361 0 .657-.05.888-.151.23-.11.401-.257.511-.438.11-.18.165-.377.165-.588 0-.302-.075-.533-.225-.694-.141-.16-.351-.287-.632-.377a6.43 6.43 0 0 0-1.007-.257 8.21 8.21 0 0 1-.978-.24 3.629 3.629 0 0 1-.842-.393 1.918 1.918 0 0 1-.601-.604 1.696 1.696 0 0 1-.226-.89c0-.432.111-.814.331-1.146.231-.342.546-.609.947-.8.411-.191.897-.287 1.459-.287.802 0 1.453.197 1.955.589.511.392.807.96.887 1.704h-1.248c-.04-.382-.201-.679-.481-.89-.281-.22-.657-.331-1.128-.331-.471 0-.832.095-1.083.286a.919.919 0 0 0-.361.755.78.78 0 0 0 .196.527c.14.151.346.282.616.393.271.1.597.19.978.271.491.091.942.212 1.353.362.411.151.742.373.992.664.261.292.392.71.392 1.252.01.473-.106.885-.346 1.238-.231.351-.562.628-.993.83-.431.19-.942.286-1.534.286ZM105.073 45.539c-.702 0-1.328-.166-1.88-.498a3.56 3.56 0 0 1-1.308-1.388c-.311-.593-.466-1.287-.466-2.082 0-.805.155-1.499.466-2.082a3.456 3.456 0 0 1 1.293-1.388c.562-.332 1.203-.498 1.925-.498.742 0 1.374.166 1.895.498.521.332.917.765 1.188 1.298.28.533.421 1.121.421 1.765v.317c0 .11-.005.236-.015.377h-6.226v-.981h4.993c-.031-.694-.261-1.232-.692-1.614-.421-.392-.952-.588-1.594-.588-.421 0-.817.1-1.188.301a2.271 2.271 0 0 0-.902.845c-.221.372-.331.84-.331 1.403v.423c0 .623.115 1.146.346 1.569.23.412.526.724.887.935.371.21.767.317 1.188.317.531 0 .967-.116 1.308-.347.351-.242.607-.569.767-.98h1.248c-.13.462-.345.874-.646 1.236a3.305 3.305 0 0 1-1.128.845c-.441.211-.958.317-1.549.317ZM93.115 45.358v-7.574h1.143l.075 1.328c.24-.473.581-.84 1.022-1.101a2.917 2.917 0 0 1 1.534-.408c.592 0 1.103.116 1.534.347.431.232.767.589 1.007 1.072.241.482.361 1.09.361 1.825v4.51h-1.263v-4.374c0-.765-.165-1.338-.496-1.72-.33-.382-.807-.573-1.428-.573-.421 0-.802.105-1.143.316-.331.202-.597.498-.797.89-.19.393-.286.87-.286 1.434v4.028h-1.263ZM89.653 45.358v-7.573h1.263v7.573h-1.263Zm.631-9.203a.885.885 0 0 1-.631-.241.89.89 0 0 1-.241-.634c0-.251.08-.452.24-.603a.885.885 0 0 1 .632-.242c.24 0 .446.08.616.242.171.15.256.352.256.603a.86.86 0 0 1-.256.634.866.866 0 0 1-.616.241ZM84.826 45.539c-.611 0-1.152-.1-1.624-.302a2.778 2.778 0 0 1-1.128-.89 2.982 2.982 0 0 1-.51-1.343h1.293c.06.262.17.508.33.74.16.221.376.397.647.528.28.13.616.196 1.007.196.361 0 .657-.05.888-.151.23-.11.4-.257.51-.438.111-.18.166-.377.166-.588 0-.302-.075-.533-.226-.694-.14-.16-.35-.287-.63-.377a6.412 6.412 0 0 0-1.008-.257c-.331-.06-.657-.14-.978-.24a3.63 3.63 0 0 1-.842-.393 1.914 1.914 0 0 1-.601-.604 1.7 1.7 0 0 1-.226-.89c0-.432.11-.814.33-1.146.231-.342.547-.609.948-.8.411-.191.898-.287 1.459-.287.802 0 1.453.197 1.955.589.51.392.806.96.887 1.704h-1.248c-.04-.382-.2-.679-.481-.89-.281-.22-.657-.331-1.128-.331-.471 0-.832.095-1.083.286a.917.917 0 0 0-.36.755c0 .2.064.377.195.527.14.151.345.282.616.393.27.1.597.19.978.271.491.091.942.212 1.353.362.411.151.742.373.993.664.26.292.39.71.39 1.252.01.473-.105.885-.345 1.238-.23.351-.562.628-.993.83-.431.19-.942.286-1.534.286ZM76.101 45.539c-.581 0-1.093-.116-1.534-.347-.43-.231-.767-.589-1.007-1.071-.23-.483-.346-1.092-.346-1.826v-4.51h1.263v4.375c0 .764.165 1.337.496 1.72.331.382.802.573 1.414.573.42 0 .802-.101 1.143-.302a2.13 2.13 0 0 0 .796-.905c.2-.393.301-.87.301-1.434v-4.028h1.264v7.574h-1.144l-.075-1.328a2.71 2.71 0 0 1-1.037 1.117 3.003 3.003 0 0 1-1.534.392ZM64.379 45.358v-10.56h3.7c.741 0 1.353.12 1.834.361.49.232.857.553 1.097.966.241.402.361.855.361 1.358 0 .543-.12.995-.36 1.357-.231.362-.537.64-.918.83a3.248 3.248 0 0 1-1.188.347l.21-.15a2.525 2.525 0 0 1 2.15 1.297c.231.392.347.83.347 1.312 0 .533-.13 1.021-.391 1.464-.26.432-.647.78-1.158 1.04-.501.252-1.123.378-1.865.378H64.38Zm1.263-1.056h2.421c.712 0 1.263-.166 1.654-.498.401-.342.602-.815.602-1.418 0-.594-.206-1.067-.617-1.418-.4-.362-.957-.544-1.669-.544h-2.39v3.878Zm0-4.888h2.346c.681 0 1.198-.161 1.549-.483.36-.322.541-.76.541-1.313 0-.533-.18-.96-.541-1.282-.351-.322-.883-.483-1.594-.483h-2.3v3.56Z"/></g><defs><clipPath id="a"><path class="tw-fill-text-alt2" d="M0 0h200v46H0z"/></clipPath></defs></svg>
diff --git a/libs/vault/src/components/carousel/carousel-icons/carousel-icon.ts b/libs/assets/src/svg/svgs/carousel-icon.ts
similarity index 85%
rename from libs/vault/src/components/carousel/carousel-icons/carousel-icon.ts
rename to libs/assets/src/svg/svgs/carousel-icon.ts
index 64052e6fa6c..802f6ff1435 100644
--- a/libs/vault/src/components/carousel/carousel-icons/carousel-icon.ts
+++ b/libs/assets/src/svg/svgs/carousel-icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const CarouselIcon = svgIcon`
   <svg class="tw-block" width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg" data-testid="inactive-carousel-icon">
diff --git a/libs/angular/src/auth/icons/create-passkey-failed.icon.ts b/libs/assets/src/svg/svgs/create-passkey-failed.icon.ts
similarity index 98%
rename from libs/angular/src/auth/icons/create-passkey-failed.icon.ts
rename to libs/assets/src/svg/svgs/create-passkey-failed.icon.ts
index 65902a64c9f..37e679b9b5e 100644
--- a/libs/angular/src/auth/icons/create-passkey-failed.icon.ts
+++ b/libs/assets/src/svg/svgs/create-passkey-failed.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const CreatePasskeyFailedIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" width="163" height="115" fill="none">
diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-passkey.icon.ts b/libs/assets/src/svg/svgs/create-passkey.icon.ts
similarity index 98%
rename from apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-passkey.icon.ts
rename to libs/assets/src/svg/svgs/create-passkey.icon.ts
index 79ba4021b58..efe180e1e2f 100644
--- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-passkey.icon.ts
+++ b/libs/assets/src/svg/svgs/create-passkey.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const CreatePasskeyIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" width="163" height="116" fill="none">
diff --git a/libs/vault/src/icons/deactivated-org.ts b/libs/assets/src/svg/svgs/deactivated-org.ts
similarity index 98%
rename from libs/vault/src/icons/deactivated-org.ts
rename to libs/assets/src/svg/svgs/deactivated-org.ts
index 5f7c910aec8..92a1064e31e 100644
--- a/libs/vault/src/icons/deactivated-org.ts
+++ b/libs/assets/src/svg/svgs/deactivated-org.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const DeactivatedOrg = svgIcon`
 <svg width="138" height="118" viewBox="0 0 138 118" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/auth/src/angular/icons/device-verification.icon.ts b/libs/assets/src/svg/svgs/device-verification.icon.ts
similarity index 89%
rename from libs/auth/src/angular/icons/device-verification.icon.ts
rename to libs/assets/src/svg/svgs/device-verification.icon.ts
index 6c5313a8705..c8fccbf7eca 100644
--- a/libs/auth/src/angular/icons/device-verification.icon.ts
+++ b/libs/assets/src/svg/svgs/device-verification.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const DeviceVerificationIcon = svgIcon`
 <svg viewBox="0 0 98 95" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/auth/src/angular/icons/devices.icon.ts b/libs/assets/src/svg/svgs/devices.icon.ts
similarity index 91%
rename from libs/auth/src/angular/icons/devices.icon.ts
rename to libs/assets/src/svg/svgs/devices.icon.ts
index dd268f0e6e2..471b44017b1 100644
--- a/libs/auth/src/angular/icons/devices.icon.ts
+++ b/libs/assets/src/svg/svgs/devices.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const DevicesIcon = svgIcon`
   <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
diff --git a/apps/web/src/app/admin-console/icons/devices.ts b/libs/assets/src/svg/svgs/devices.ts
similarity index 98%
rename from apps/web/src/app/admin-console/icons/devices.ts
rename to libs/assets/src/svg/svgs/devices.ts
index 9faddb0b2ee..517256ec591 100644
--- a/apps/web/src/app/admin-console/icons/devices.ts
+++ b/libs/assets/src/svg/svgs/devices.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const Devices = svgIcon`
 <svg width="201" height="201" viewBox="0 0 201 201" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/angular/src/auth/icons/email.icon.ts b/libs/assets/src/svg/svgs/email.icon.ts
similarity index 92%
rename from libs/angular/src/auth/icons/email.icon.ts
rename to libs/assets/src/svg/svgs/email.icon.ts
index 7b5163898fd..c6341707880 100644
--- a/libs/angular/src/auth/icons/email.icon.ts
+++ b/libs/assets/src/svg/svgs/email.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const EmailIcon = svgIcon`
   <svg
@@ -37,7 +37,6 @@ export const EmailIcon = svgIcon`
     <circle cx="21.324" cy="23.5" r="1.5" fill="currentColor" />
     <circle cx="31.324" cy="23.5" r="1.5" fill="currentColor" />
     <circle cx="41.324" cy="23.5" r="1.5" fill="currentColor" />
-    <circle cx="26.324" cy="23.5" r="1.5" fill="currentColor" />
     <circle cx="36.324" cy="23.5" r="1.5" fill="currentColor" />
     <circle cx="46.324" cy="23.5" r="1.5" fill="currentColor" />
   </svg>
diff --git a/libs/vault/src/icons/empty-trash.ts b/libs/assets/src/svg/svgs/empty-trash.ts
similarity index 99%
rename from libs/vault/src/icons/empty-trash.ts
rename to libs/assets/src/svg/svgs/empty-trash.ts
index df74602e6d1..61df8933d44 100644
--- a/libs/vault/src/icons/empty-trash.ts
+++ b/libs/assets/src/svg/svgs/empty-trash.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const EmptyTrash = svgIcon`
 <svg width="174" height="100" viewBox="0 0 174 100" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/tools/send/send-ui/src/icons/expired-send.icon.ts b/libs/assets/src/svg/svgs/expired-send.icon.ts
similarity index 98%
rename from libs/tools/send/send-ui/src/icons/expired-send.icon.ts
rename to libs/assets/src/svg/svgs/expired-send.icon.ts
index c699a544e7c..19283525b4c 100644
--- a/libs/tools/send/send-ui/src/icons/expired-send.icon.ts
+++ b/libs/assets/src/svg/svgs/expired-send.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const ExpiredSendIcon = svgIcon`
     <svg xmlns="http://www.w3.org/2000/svg" width="130" height="130" fill="none">
diff --git a/libs/components/src/icon/icons/extension-bitwarden-logo.icon.ts b/libs/assets/src/svg/svgs/extension-bitwarden-logo.icon.ts
similarity index 99%
rename from libs/components/src/icon/icons/extension-bitwarden-logo.icon.ts
rename to libs/assets/src/svg/svgs/extension-bitwarden-logo.icon.ts
index a8a07d5d1ef..42a74e006bc 100644
--- a/libs/components/src/icon/icons/extension-bitwarden-logo.icon.ts
+++ b/libs/assets/src/svg/svgs/extension-bitwarden-logo.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const ExtensionBitwardenLogo = svgIcon`
   <svg
diff --git a/libs/assets/src/svg/svgs/gear.ts b/libs/assets/src/svg/svgs/gear.ts
new file mode 100644
index 00000000000..35349f78cce
--- /dev/null
+++ b/libs/assets/src/svg/svgs/gear.ts
@@ -0,0 +1,20 @@
+import { svgIcon } from "../icon-service";
+
+export const GearIcon = svgIcon`
+<svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M59.9995 37.9541C46.4641 37.9541 35.5465 48.6298 35.5465 61.7321C35.5465 74.8343 46.4641 85.51 59.9995 85.51C73.5349 85.51 84.4526 74.8343 84.4526 61.7321C84.4526 48.6298 73.5349 37.9541 59.9995 37.9541ZM33.1465 61.7321C33.1465 47.2444 45.1994 35.5541 59.9995 35.5541C74.7997 35.5541 86.8526 47.2444 86.8526 61.7321C86.8526 76.2197 74.7997 87.91 59.9995 87.91C45.1994 87.91 33.1465 76.2197 33.1465 61.7321Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M98.9992 8.4C94.36 8.4 90.5992 12.1608 90.5992 16.8C90.5992 21.4392 94.36 25.2 98.9992 25.2C103.638 25.2 107.399 21.4392 107.399 16.8C107.399 12.1608 103.638 8.4 98.9992 8.4ZM88.1992 16.8C88.1992 10.8353 93.0345 6 98.9992 6C104.964 6 109.799 10.8353 109.799 16.8C109.799 22.7647 104.964 27.6 98.9992 27.6C93.0345 27.6 88.1992 22.7647 88.1992 16.8Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M109.2 56.4C104.561 56.4 100.8 60.1608 100.8 64.8C100.8 69.4392 104.561 73.2 109.2 73.2C113.84 73.2 117.6 69.4392 117.6 64.8C117.6 60.1608 113.84 56.4 109.2 56.4ZM98.4004 64.8C98.4004 58.8353 103.236 54 109.2 54C115.165 54 120 58.8353 120 64.8C120 70.7647 115.165 75.6 109.2 75.6C103.236 75.6 98.4004 70.7647 98.4004 64.8Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M100.8 99C96.1608 99 92.4 102.761 92.4 107.4C92.4 112.039 96.1608 115.8 100.8 115.8C105.439 115.8 109.2 112.039 109.2 107.4C109.2 102.761 105.439 99 100.8 99ZM90 107.4C90 101.435 94.8353 96.6 100.8 96.6C106.765 96.6 111.6 101.435 111.6 107.4C111.6 113.365 106.765 118.2 100.8 118.2C94.8353 118.2 90 113.365 90 107.4Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M37.8 98.4C33.1608 98.4 29.4 102.161 29.4 106.8C29.4 111.439 33.1608 115.2 37.8 115.2C42.4392 115.2 46.2 111.439 46.2 106.8C46.2 102.161 42.4392 98.4 37.8 98.4ZM27 106.8C27 100.835 31.8353 96 37.8 96C43.7647 96 48.6 100.835 48.6 106.8C48.6 112.765 43.7647 117.6 37.8 117.6C31.8353 117.6 27 112.765 27 106.8Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M10.8 40.2C6.16081 40.2 2.4 43.9608 2.4 48.6C2.4 53.2392 6.16081 57 10.8 57C15.4392 57 19.2 53.2392 19.2 48.6C19.2 43.9608 15.4392 40.2 10.8 40.2ZM0 48.6C0 42.6353 4.83532 37.8 10.8 37.8C16.7647 37.8 21.6 42.6353 21.6 48.6C21.6 54.5647 16.7647 59.4 10.8 59.4C4.83532 59.4 0 54.5647 0 48.6Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M38.3996 3.60001C33.7604 3.60001 29.9996 7.36082 29.9996 12C29.9996 16.6392 33.7604 20.4 38.3996 20.4C43.0388 20.4 46.7996 16.6392 46.7996 12C46.7996 7.36082 43.0388 3.60001 38.3996 3.60001ZM27.5996 12C27.5996 6.03534 32.4349 1.20001 38.3996 1.20001C44.3643 1.20001 49.1996 6.03534 49.1996 12C49.1996 17.9647 44.3643 22.8 38.3996 22.8C32.4349 22.8 27.5996 17.9647 27.5996 12Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M42.217 21.3484C42.5229 21.221 42.8742 21.3656 43.0017 21.6715L49.7525 37.8734C49.8799 38.1793 49.7353 38.5306 49.4294 38.6581C49.1235 38.7855 48.7722 38.6409 48.6448 38.335L41.894 22.133C41.7665 21.8272 41.9112 21.4759 42.217 21.3484Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M92.7905 24.1445C93.0435 24.3585 93.075 24.7371 92.861 24.9901L78.0092 42.5422C77.7952 42.7951 77.4166 42.8267 77.1636 42.6126C76.9107 42.3986 76.8791 42.02 77.0932 41.767L91.9449 24.2149C92.159 23.962 92.5375 23.9304 92.7905 24.1445Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M20.4265 51.4253C20.523 51.1083 20.8582 50.9295 21.1752 51.026L34.9752 55.226C35.2923 55.3225 35.471 55.6577 35.3746 55.9747C35.2781 56.2917 34.9429 56.4705 34.6259 56.374L20.8259 52.174C20.5088 52.0776 20.3301 51.7424 20.4265 51.4253Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M49.4777 84.0684C49.7714 84.2219 49.8849 84.5845 49.7314 84.8781L42.9795 97.7892C42.8259 98.0829 42.4634 98.1964 42.1697 98.0429C41.8761 97.8893 41.7625 97.5268 41.9161 97.2331L48.668 84.322C48.8216 84.0284 49.1841 83.9148 49.4777 84.0684Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M77.1582 79.5058C77.4086 79.2888 77.7876 79.3159 78.0046 79.5663L95.5567 99.8187C95.7737 100.069 95.7466 100.448 95.4962 100.665C95.2458 100.882 94.8669 100.855 94.6499 100.605L77.0978 80.3522C76.8807 80.1018 76.9078 79.7229 77.1582 79.5058Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M85.0558 62.3473C85.0887 62.0176 85.3828 61.7771 85.7125 61.81L99.2141 63.1602C99.5438 63.1932 99.7844 63.4872 99.7514 63.8169C99.7184 64.1466 99.4244 64.3872 99.0947 64.3542L85.5931 63.0041C85.2634 62.9711 85.0228 62.6771 85.0558 62.3473Z" fill="#CED4DC"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M55.0583 45.4382C54.888 45.247 54.615 45.185 54.3788 45.2838L52.1688 46.2079C51.9281 46.3086 51.7801 46.5531 51.8024 46.8129L52.1362 50.6898C52.1819 51.2204 51.9902 51.744 51.6128 52.1197L50.2505 53.4761C49.894 53.8311 49.4052 54.0206 48.9027 53.9989L45.0074 53.8303C44.7569 53.8194 44.5261 53.9655 44.4286 54.1965L43.4934 56.4137C43.3921 56.6536 43.4573 56.9315 43.6545 57.1014L46.5356 59.5838C46.9324 59.9257 47.1606 60.4236 47.1606 60.9474V62.8948C47.1606 63.4058 46.9435 63.8927 46.5633 64.2341L43.7142 66.7927C43.5238 66.9636 43.4628 67.2365 43.5622 67.4723L44.4892 69.6698C44.5905 69.9098 44.835 70.0571 45.0945 70.0343L48.8457 69.7047C49.3746 69.6583 49.897 69.8477 50.2732 70.2223L51.6345 71.5776C51.9931 71.9346 52.1849 72.4261 52.1628 72.9317L51.994 76.7976C51.983 77.0488 52.1299 77.2803 52.3619 77.3773L54.5876 78.308C54.8286 78.4088 55.1071 78.3421 55.2763 78.143L57.6994 75.2918C58.0414 74.8894 58.5429 74.6575 59.071 74.6575H61.0298C61.5381 74.6575 62.0226 74.8723 62.3639 75.249L64.9399 78.0926C65.1106 78.281 65.3815 78.3414 65.616 78.2433L67.8309 77.3171C68.072 77.2163 68.2202 76.9709 68.1971 76.7106L67.8673 72.9892C67.8201 72.4571 68.0117 71.9316 68.3903 71.5547L69.7513 70.1996C70.1078 69.8447 70.5965 69.6551 71.0991 69.6769L74.9944 69.8455C75.2449 69.8563 75.4757 69.7103 75.5731 69.4793L76.5045 67.2715C76.6066 67.0293 76.5393 66.7488 76.3382 66.5794L73.4814 64.1727C73.0755 63.8307 72.8412 63.3269 72.8412 62.7961V60.856C72.8412 60.3457 73.0578 59.8594 73.4371 59.518L76.3646 56.8836C76.5546 56.7125 76.6154 56.4399 76.5161 56.2043L75.5887 54.006C75.4875 53.766 75.2429 53.6187 74.9834 53.6415L71.2322 53.9711C70.7034 54.0175 70.181 53.8281 69.8047 53.4535L68.4434 52.0982C68.0848 51.7411 67.8931 51.2496 67.9152 50.7441L68.084 46.8782C68.0949 46.627 67.9481 46.3955 67.716 46.2985L65.4903 45.3678C65.2493 45.267 64.9708 45.3337 64.8016 45.5328L62.3785 48.384C62.0365 48.7864 61.5351 49.0183 61.007 49.0183H59.0542C58.5406 49.0183 58.0516 48.799 57.71 48.4155L55.0583 45.4382ZM53.9158 44.1767C54.6246 43.8803 55.4434 44.0664 55.9544 44.6401L58.6061 47.6174C58.72 47.7452 58.883 47.8183 59.0542 47.8183H61.007C61.183 47.8183 61.3502 47.741 61.4642 47.6069L63.8872 44.7557C64.3947 44.1585 65.2303 43.9583 65.9532 44.2607L68.179 45.1914C68.8751 45.4825 69.3157 46.1768 69.2828 46.9306L69.114 50.7964C69.1067 50.965 69.1706 51.1288 69.2901 51.2478L70.6514 52.6031C70.7768 52.728 70.9509 52.7911 71.1272 52.7757L74.8784 52.4461C75.6569 52.3777 76.3906 52.8195 76.6944 53.5396L77.6217 55.7379C77.9198 56.4446 77.7374 57.2625 77.1673 57.7755L74.2398 60.41C74.1134 60.5238 74.0412 60.6859 74.0412 60.856V62.7961C74.0412 62.973 74.1193 63.1409 74.2546 63.2549L77.1114 65.6617C77.7145 66.1698 77.9166 67.0113 77.6101 67.7379L76.6788 69.9457C76.3864 70.6387 75.694 71.0769 74.9425 71.0444L71.0472 70.8758C70.8797 70.8685 70.7168 70.9317 70.598 71.05L69.2369 72.4051C69.1108 72.5307 69.0469 72.7059 69.0626 72.8833L69.3924 76.6046C69.4616 77.3857 69.0173 78.1217 68.2939 78.4242L66.079 79.3504C65.3753 79.6447 64.5626 79.4635 64.0505 78.8982L61.4745 76.0547C61.3608 75.9291 61.1993 75.8575 61.0298 75.8575H59.071C58.8949 75.8575 58.7278 75.9348 58.6138 76.0689L56.1907 78.9201C55.6832 79.5173 54.8477 79.7174 54.1247 79.4151L51.899 78.4844C51.2029 78.1933 50.7622 77.499 50.7951 76.7452L50.9639 72.8793C50.9713 72.7108 50.9074 72.547 50.7878 72.428L49.4265 71.0726C49.3011 70.9478 49.127 70.8846 48.9507 70.9001L45.1996 71.2297C44.421 71.298 43.6873 70.8562 43.3836 70.1362L42.4566 67.9387C42.1582 67.2314 42.3412 66.4127 42.9124 65.8998L45.7615 63.3412C45.8883 63.2274 45.9606 63.0651 45.9606 62.8948V60.9474C45.9606 60.7728 45.8846 60.6069 45.7523 60.4929L42.8712 58.0105C42.2794 57.5006 42.0841 56.6671 42.3877 55.9473L43.323 53.7301C43.6153 53.0371 44.3078 52.5989 45.0593 52.6314L48.9546 52.8C49.1221 52.8073 49.285 52.7441 49.4038 52.6258L50.7662 51.2694C50.892 51.1441 50.9558 50.9696 50.9406 50.7927L50.6069 46.9159C50.5398 46.1363 50.9839 45.4027 51.7058 45.1008L53.9158 44.1767ZM65.7734 59.49C64.5008 56.2102 60.7895 54.7187 57.5276 56.0511C54.2534 57.3885 52.7303 61.0753 54.0787 64.2677C55.4244 67.5297 59.1264 69.0401 62.327 67.6984C65.5088 66.3645 67.1209 62.6899 65.7734 59.49ZM64.6574 59.9312C63.6423 57.3035 60.6562 56.0694 57.9814 57.162C55.3169 58.2503 54.0985 61.2338 55.185 63.8029L55.1872 63.808L55.1872 63.808C56.2791 66.4579 59.2771 67.6758 61.863 66.5917C64.4656 65.5006 65.7472 62.5089 64.6645 59.9487C64.662 59.9429 64.6597 59.9371 64.6574 59.9312Z" fill="#CED4DC"/>
+</svg>
+`;
diff --git a/libs/components/src/icon/icons/generator.ts b/libs/assets/src/svg/svgs/generator.ts
similarity index 98%
rename from libs/components/src/icon/icons/generator.ts
rename to libs/assets/src/svg/svgs/generator.ts
index 6d1e25abc27..52368ddc204 100644
--- a/libs/components/src/icon/icons/generator.ts
+++ b/libs/assets/src/svg/svgs/generator.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const GeneratorInactive = svgIcon`
   <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/assets/src/svg/svgs/index.ts b/libs/assets/src/svg/svgs/index.ts
new file mode 100644
index 00000000000..a5a4c215a29
--- /dev/null
+++ b/libs/assets/src/svg/svgs/index.ts
@@ -0,0 +1,72 @@
+export * from "./active-send.icon";
+export { default as AdminConsoleLogo } from "./admin-console";
+export * from "./background-left-illustration";
+export * from "./background-right-illustration";
+export * from "./bitwarden-icon";
+export * from "./bitwarden-logo.icon";
+export * from "./browser-extension";
+export { default as BusinessUnitPortalLogo } from "./business-unit-portal";
+export * from "./carousel-icon";
+export * from "./create-passkey-failed.icon";
+export * from "./create-passkey.icon";
+export * from "./deactivated-org";
+export * from "./device-verification.icon";
+export * from "./devices.icon";
+export * from "./devices";
+export * from "./email.icon";
+export * from "./empty-trash";
+export * from "./expired-send.icon";
+export * from "./extension-bitwarden-logo.icon";
+export * from "./gear";
+export * from "./generator";
+export * from "./lock.icon";
+export * from "./login-cards";
+export * from "./no-access";
+export * from "./no-credentials.icon";
+export * from "./no-folders";
+export * from "./no-results";
+export * from "./no-send.icon";
+export * from "./partner-trust";
+export * from "./party";
+export { default as PasswordManagerLogo } from "./password-manager";
+export { default as ProviderPortalLogo } from "./provider-portal";
+export * from "./recovery.icon";
+export * from "./registration-check-email.icon";
+export * from "./registration-expired-link.icon";
+export * from "./registration-lock-alt.icon";
+export * from "./registration-user-add.icon";
+export * from "./report-breach.icon";
+export * from "./report-exposed-passwords.icon";
+export * from "./report-inactive-two-factor.icon";
+export * from "./report-member-access.icon";
+export * from "./report-reused-passwords.icon";
+export * from "./report-unsecured-websites.icon";
+export * from "./report-weak-passwords.icon";
+export * from "./restricted-view";
+export * from "./search";
+export * from "./secrets-manager-alt";
+export { default as SecretsManagerLogo } from "./secrets-manager";
+export * from "./secure-devices";
+export * from "./secure-user";
+export * from "./security-handshake";
+export * from "./security";
+export * from "./send";
+export * from "./settings";
+export * from "./shield";
+export * from "./sso-key.icon";
+export * from "./subscription-hidden";
+export * from "./totp.icon";
+export * from "./two-factor-auth-authenticator.icon";
+export * from "./two-factor-auth-duo.icon";
+export * from "./two-factor-auth-email.icon";
+export * from "./two-factor-auth-security-key.icon";
+export * from "./two-factor-auth-webauthn.icon";
+export * from "./two-factor-auth-yubico.icon";
+export * from "./two-factor-timeout.icon";
+export * from "./user-lock.icon";
+export * from "./user-verification-biometrics-fingerprint.icon";
+export * from "./vault-open";
+export * from "./vault.icon";
+export * from "./vault";
+export * from "./wave.icon";
+export * from "./webauthn.icon";
diff --git a/libs/components/src/icon/icons/lock.icon.ts b/libs/assets/src/svg/svgs/lock.icon.ts
similarity index 98%
rename from libs/components/src/icon/icons/lock.icon.ts
rename to libs/assets/src/svg/svgs/lock.icon.ts
index d7a7e4abb1b..5d5d23bcdd1 100644
--- a/libs/components/src/icon/icons/lock.icon.ts
+++ b/libs/assets/src/svg/svgs/lock.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const LockIcon = svgIcon`
   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100" fill="none">
diff --git a/libs/vault/src/icons/login-cards.ts b/libs/assets/src/svg/svgs/login-cards.ts
similarity index 98%
rename from libs/vault/src/icons/login-cards.ts
rename to libs/assets/src/svg/svgs/login-cards.ts
index 6e066a0d924..0eea164a512 100644
--- a/libs/vault/src/icons/login-cards.ts
+++ b/libs/assets/src/svg/svgs/login-cards.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const LoginCards = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="none">
diff --git a/libs/components/src/icon/icons/no-access.ts b/libs/assets/src/svg/svgs/no-access.ts
similarity index 96%
rename from libs/components/src/icon/icons/no-access.ts
rename to libs/assets/src/svg/svgs/no-access.ts
index 1011b3089cf..6c9dfae939e 100644
--- a/libs/components/src/icon/icons/no-access.ts
+++ b/libs/assets/src/svg/svgs/no-access.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const NoAccess = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" width="154" height="130" fill="none">
diff --git a/libs/tools/generator/components/src/icons/no-credentials.icon.ts b/libs/assets/src/svg/svgs/no-credentials.icon.ts
similarity index 99%
rename from libs/tools/generator/components/src/icons/no-credentials.icon.ts
rename to libs/assets/src/svg/svgs/no-credentials.icon.ts
index 7bb289600b8..a825de2f95b 100644
--- a/libs/tools/generator/components/src/icons/no-credentials.icon.ts
+++ b/libs/assets/src/svg/svgs/no-credentials.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const NoCredentialsIcon = svgIcon`
   <svg xmlns="http://www.w3.org/2000/svg" width="119" height="114" viewBox="0 0 119 114" fill="none">
diff --git a/libs/vault/src/icons/no-folders.ts b/libs/assets/src/svg/svgs/no-folders.ts
similarity index 98%
rename from libs/vault/src/icons/no-folders.ts
rename to libs/assets/src/svg/svgs/no-folders.ts
index 666bfc86c4c..ea06a9827e9 100644
--- a/libs/vault/src/icons/no-folders.ts
+++ b/libs/assets/src/svg/svgs/no-folders.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const NoFolders = svgIcon`
 <svg width="147" height="91" viewBox="0 0 147 91" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/components/src/icon/icons/no-results.ts b/libs/assets/src/svg/svgs/no-results.ts
similarity index 98%
rename from libs/components/src/icon/icons/no-results.ts
rename to libs/assets/src/svg/svgs/no-results.ts
index 7ed886a06e9..ce45fce7f3c 100644
--- a/libs/components/src/icon/icons/no-results.ts
+++ b/libs/assets/src/svg/svgs/no-results.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const NoResults = svgIcon`
 <svg width="98" height="96" viewBox="0 0 98 96" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/tools/send/send-ui/src/icons/no-send.icon.ts b/libs/assets/src/svg/svgs/no-send.icon.ts
similarity index 97%
rename from libs/tools/send/send-ui/src/icons/no-send.icon.ts
rename to libs/assets/src/svg/svgs/no-send.icon.ts
index 555d8024601..85106930961 100644
--- a/libs/tools/send/send-ui/src/icons/no-send.icon.ts
+++ b/libs/assets/src/svg/svgs/no-send.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const NoSendsIcon = svgIcon`
   <svg xmlns="http://www.w3.org/2000/svg" width="120" height="125" fill="none">
diff --git a/libs/assets/src/svg/svgs/partner-trust.ts b/libs/assets/src/svg/svgs/partner-trust.ts
new file mode 100644
index 00000000000..22249874118
--- /dev/null
+++ b/libs/assets/src/svg/svgs/partner-trust.ts
@@ -0,0 +1,23 @@
+import { svgIcon } from "../icon-service";
+
+export const PartnerTrustIcon = svgIcon`
+<svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M69 43.6511C70.1025 44.1328 71.32 44.4 72.6 44.4C77.5706 44.4 81.6 40.3706 81.6 35.4C81.6 30.4294 77.5706 26.4 72.6 26.4C67.6295 26.4 63.6 30.4294 63.6 35.4C63.6 36.0164 63.662 36.6184 63.7801 37.2" stroke="#CED4DC" stroke-width="2"/>
+    <path d="M69 44.8416C70.1522 44.553 71.3559 44.4 72.5943 44.4C80.1533 44.4 86.4194 50.0998 87.5598 57.5529C87.7996 59.1204 86.9541 60 85.3451 60C79.7231 60 75.6474 60 71.4 60" stroke="#CED4DC" stroke-width="2"/>
+    <path d="M51 43.6511C49.8976 44.1328 48.68 44.4 47.4 44.4C42.4295 44.4 38.4 40.3706 38.4 35.4C38.4 30.4294 42.4295 26.4 47.4 26.4C52.3706 26.4 56.4 30.4294 56.4 35.4C56.4 36.0164 56.338 36.6184 56.22 37.2" stroke="#CED4DC" stroke-width="2"/>
+    <path d="M51 44.8416C49.8478 44.553 48.6441 44.4 47.4057 44.4C39.8467 44.4 33.5806 50.0998 32.4402 57.5529C32.2004 59.1204 33.0459 60 34.6549 60C40.2769 60 44.3526 60 48.6 60" stroke="#CED4DC" stroke-width="2"/>
+    <circle cx="60" cy="45.6" r="9" stroke="#CED4DC" stroke-width="2"/>
+    <path d="M72.7451 70.2C62.3773 70.2 57.2682 70.2 46.6437 70.2C45.3864 70.2 44.8665 68.8141 45.0289 67.7529C46.1693 60.2998 52.4354 54.6 59.9943 54.6C67.5533 54.6 73.8194 60.2998 74.9598 67.7529C75.1996 69.3204 74.3541 70.2 72.7451 70.2Z" stroke="#CED4DC" stroke-width="2"/>
+    <path d="M73.557 103.195C74.3197 104.319 74.3197 105.443 73.557 106.272C73.1462 106.745 72.3835 107.041 71.738 107.041C71.6242 107.041 71.5013 107.032 71.3801 107.011C71.3345 108.505 70.5896 109.217 70.0948 109.467C69.7427 109.703 69.3318 109.822 68.9212 109.822C68.8703 109.822 68.8204 109.82 68.7714 109.816C68.7035 109.811 68.6373 109.803 68.5729 109.792C68.5559 110.332 68.3591 110.827 67.9823 111.242C67.6302 111.833 66.926 112.129 66.2808 112.129C66.1045 112.129 65.9874 112.129 65.8112 112.07C65.7753 112.058 65.7381 112.044 65.6997 112.028C65.5215 112.624 65.0169 113.105 64.227 113.431C63.9924 113.49 63.8162 113.49 63.5815 113.49C62.4417 113.49 60.9477 112.633 60.0352 112.028M55.5 88.7567C53.6867 88.9991 51.6246 89.9258 50.4378 90.4744C50.2985 90.5095 50.1797 90.5655 50.0693 90.6176L50.0687 90.6179C49.9937 90.6534 49.9223 90.6871 49.851 90.711C49.5281 90.5373 49.0708 90.3955 48.4995 90.2184C47.5139 89.9127 46.1886 89.5016 44.6287 88.6402C44.3941 88.5219 44.0419 88.581 43.8657 88.8769L37.6461 99.5268C37.4699 99.8226 37.5287 100.178 37.822 100.355L46.8 105.019" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M73.7624 103.371C73.6448 103.371 73.4683 103.313 73.3507 103.195L67.7625 97.9108C63.1743 96.7365 61.8803 93.9181 61.4097 92.8024C61.0567 92.8612 60.5273 92.9199 59.645 92.9199C59.2332 93.2135 58.1744 94.0355 56.7039 94.7988C55.3509 95.5034 53.998 95.2098 53.4098 94.2117C53.0568 93.5658 52.998 92.8024 53.351 92.1566C55.7039 87.5766 58.4685 86.6372 60.3509 86.6372C61.4685 86.6372 62.1744 86.9895 62.2332 86.9895L69.2919 90.1015L75.7624 87.1656C75.8801 87.1069 76.0565 87.1069 76.233 87.1656C76.4095 87.2243 76.5271 87.3418 76.5859 87.4592L82.6447 97.8521C82.7623 98.1457 82.6447 98.4393 82.4094 98.6154L74.0565 103.313C73.9389 103.371 73.8801 103.371 73.7624 103.371Z" stroke="#CED4DC" stroke-width="2"/>
+    <path d="M46.6097 107.206C47.0221 108.443 48.394 109.005 49.044 109.195C49.217 109.923 49.5794 110.391 49.9178 110.692C50.5086 111.164 51.1584 111.342 51.7491 111.342C51.9248 111.342 52.0796 111.321 52.2135 111.291C52.2516 111.368 52.2936 111.444 52.3399 111.519C52.8716 112.346 53.8168 112.818 55.2346 112.937C55.3143 112.937 55.3897 112.919 55.4573 112.887C56.0276 113.588 56.9845 114 57.893 114C58.7791 114 59.488 113.527 59.7243 112.759C60.0787 111.223 59.9606 109.628 59.7243 108.742C59.5602 108.031 59.1935 106.763 57.6392 106.673C57.4017 106.121 56.803 105.205 55.4709 105.08C55.1879 105.053 54.9235 105.086 54.6774 105.164C54.4496 104.62 54.0132 103.917 53.2851 103.662C52.7534 103.485 51.9264 103.662 51.1584 104.134C51.1181 104.161 51.0782 104.187 51.0387 104.215C50.6899 103.795 50.1003 103.263 49.3271 103.189C48.6182 103.13 48.0275 103.485 47.4367 104.193C46.5506 105.316 46.3143 106.32 46.6097 107.206Z" stroke="#CED4DC" stroke-width="2"/>
+    <path d="M51.9 104.4C51.5709 104.603 49.9229 105.531 49.5 106.8C49.2 107.7 49.5 108.9 49.8 109.5" stroke="#CED4DC" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M54.6703 105.317C54.1767 105.571 53.0709 106.485 52.597 108.109C52.1231 109.734 52.3995 110.816 52.597 111.155" stroke="#CED4DC" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M57.2 107.263C56.7063 107.517 56.051 108.431 55.7104 109.598C55.3697 110.766 55.5129 112.179 55.7104 112.517" stroke="#CED4DC" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M65.5675 111.739C64.0108 110.96 61.2866 108.431 61.2866 108.431" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M68.2914 109.598C66.1686 108.591 62.4538 105.317 62.4538 105.317" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M71.4049 106.874C68.9991 105.775 64.789 102.204 64.789 102.204" stroke="#CED4DC" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M86.9971 91.8C95.5145 86.0616 101.962 77.753 105.392 68.094C108.822 58.435 109.055 47.9345 106.056 38.134C103.057 28.3336 96.9838 19.7494 88.7289 13.6419C80.474 7.53438 70.4717 4.22518 60.1907 4.20014C49.9096 4.1751 39.8913 7.43554 31.6065 13.5028C23.3217 19.5701 17.2069 28.1245 14.1599 37.9102C11.1128 47.696 11.294 58.1975 14.6768 67.8731C18.0596 77.5486 24.4658 85.8885 32.955 91.6684" stroke="#CED4DC" stroke-width="2" stroke-linecap="round"/>
+    <path d="M84.6771 88.2C92.4374 82.9725 98.3114 75.4037 101.437 66.6048C104.562 57.8059 104.774 48.2403 102.042 39.3125C99.3091 30.3847 93.7761 22.5649 86.255 17.0012C78.7338 11.4375 69.6207 8.42293 60.2535 8.40012C50.8863 8.37731 41.7585 11.3474 34.2101 16.8745C26.6618 22.4015 21.0905 30.1942 18.3143 39.1086C15.5381 48.023 15.7032 57.5895 18.7853 66.4035C21.8674 75.2176 27.7042 82.8149 35.4388 88.0801" stroke="#CED4DC" stroke-linecap="round"/>
+</svg>
+`;
diff --git a/libs/vault/src/icons/party.ts b/libs/assets/src/svg/svgs/party.ts
similarity index 99%
rename from libs/vault/src/icons/party.ts
rename to libs/assets/src/svg/svgs/party.ts
index 2e506c5d705..6fb587a7c14 100644
--- a/libs/vault/src/icons/party.ts
+++ b/libs/assets/src/svg/svgs/party.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const Party = svgIcon`
   <svg width="90" height="89" viewBox="0 0 90 89" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/components/src/icon/logos/bitwarden/password-manager.ts b/libs/assets/src/svg/svgs/password-manager.ts
similarity index 99%
rename from libs/components/src/icon/logos/bitwarden/password-manager.ts
rename to libs/assets/src/svg/svgs/password-manager.ts
index 7586e28bfae..42b3df1a0ed 100644
--- a/libs/components/src/icon/logos/bitwarden/password-manager.ts
+++ b/libs/assets/src/svg/svgs/password-manager.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../../icon";
+import { svgIcon } from "../icon-service";
 
 const PasswordManagerLogo = svgIcon`
   <svg xmlns="http://www.w3.org/2000/svg" width="200" height="49" fill="none"><g class="tw-fill-text-alt2" clip-path="url(#a)"><path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/><path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM195.312 44.882v-7.738h1.118l.089 1.412c.176-.353.407-.647.691-.883a2.845 2.845 0 0 1 1.03-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.295 0-.579.039-.854.117a2.184 2.184 0 0 0-.75.383 1.82 1.82 0 0 0-.515.72c-.127.305-.191.687-.191 1.148v4.252h-1.236ZM190.187 45.058c-.687 0-1.295-.166-1.824-.5-.53-.333-.947-.804-1.251-1.412-.294-.608-.441-1.32-.441-2.133 0-.814.147-1.525.441-2.133.304-.608.721-1.08 1.251-1.413.539-.333 1.157-.5 1.853-.5.746 0 1.368.167 1.869.5.5.334.877.78 1.132 1.34.255.558.383 1.171.383 1.838v.294c0 .098-.005.216-.015.353h-5.987v-.956h4.795c-.019-.755-.24-1.329-.662-1.721-.411-.402-.926-.603-1.544-.603a2.214 2.214 0 0 0-1.986 1.192c-.216.392-.324.882-.324 1.47v.412c0 .648.108 1.192.324 1.633.216.432.495.755.838.971.353.216.736.324 1.148.324.549 0 .981-.103 1.294-.31.314-.215.545-.519.692-.911h1.221a2.97 2.97 0 0 1-.618 1.162 2.929 2.929 0 0 1-1.089.81c-.431.195-.931.293-1.5.293ZM181.836 48.295c-.697 0-1.31-.088-1.839-.265-.52-.167-.927-.427-1.221-.78-.285-.353-.427-.79-.427-1.309 0-.245.044-.5.132-.765.099-.265.26-.52.486-.765.235-.245.564-.466.986-.662l.941.5c-.559.216-.922.466-1.089.75-.166.285-.25.56-.25.824 0 .324.094.594.28.81.196.215.466.377.809.485.343.108.74.162 1.192.162.441 0 .819-.059 1.132-.177.324-.108.569-.27.736-.485.177-.206.265-.451.265-.736 0-.412-.133-.735-.397-.97-.265-.226-.78-.359-1.545-.398a14.992 14.992 0 0 1-1.501-.162 6.92 6.92 0 0 1-1-.235 3.296 3.296 0 0 1-.647-.324 4.326 4.326 0 0 1-.456-.368v-.338l1.456-1.398 1.162.383-1.589 1.31.192-.56c.108.079.211.152.309.22.098.07.23.133.397.192.176.05.417.098.721.147.314.05.725.093 1.235.133.707.049 1.27.166 1.692.353.422.186.726.446.912.78.187.323.28.72.28 1.191 0 .412-.118.804-.353 1.177-.226.373-.589.677-1.089.912-.49.245-1.128.368-1.912.368Zm-.015-5.826c-.628 0-1.162-.117-1.604-.353a2.505 2.505 0 0 1-.985-.986 2.942 2.942 0 0 1-.339-1.412c0-.52.113-.986.339-1.397.235-.412.569-.74 1-.986.441-.245.971-.368 1.589-.368.637 0 1.172.123 1.603.368.432.245.761.574.986.986.226.412.338.877.338 1.397s-.112.99-.338 1.412a2.5 2.5 0 0 1-.986.986c-.431.236-.966.353-1.603.353Zm0-1.015c.549 0 .976-.142 1.28-.426.304-.295.456-.731.456-1.31 0-.579-.152-1.01-.456-1.294-.304-.285-.731-.427-1.28-.427-.52 0-.946.142-1.28.427-.324.284-.485.715-.485 1.294 0 .579.157 1.015.47 1.31.324.284.756.426 1.295.426Zm1.295-3.266-.368-1.044h3.03v.927l-2.662.117ZM173.115 45.058c-.588 0-1.079-.108-1.471-.323a2.247 2.247 0 0 1-.883-.883 2.523 2.523 0 0 1-.294-1.192c0-.51.128-.941.383-1.294.264-.363.632-.638 1.103-.824.471-.186 1.02-.28 1.648-.28h1.927c0-.5-.059-.916-.177-1.25-.118-.333-.309-.584-.574-.75-.264-.167-.617-.25-1.059-.25-.441 0-.819.112-1.133.338-.313.216-.51.54-.588.971h-1.265c.059-.51.23-.937.515-1.28a2.63 2.63 0 0 1 1.074-.794c.441-.187.907-.28 1.397-.28.697 0 1.27.128 1.721.383.452.245.785.593 1.001 1.044.216.442.323.966.323 1.574v4.914h-1.103l-.073-1.324a2.782 2.782 0 0 1-.383.588 2.46 2.46 0 0 1-.53.471 2.575 2.575 0 0 1-.706.324 2.89 2.89 0 0 1-.853.117Zm.177-1.044c.323 0 .622-.074.897-.22a2.26 2.26 0 0 0 .706-.59c.206-.254.363-.539.471-.852.108-.314.162-.643.162-.986v-.147h-1.824c-.461 0-.839.059-1.133.176-.285.118-.491.285-.618.5a1.309 1.309 0 0 0-.191.707c0 .284.058.534.176.75.118.206.289.368.515.485.235.118.515.177.839.177ZM162.197 44.882v-7.738h1.118l.059 1.22c.226-.44.55-.784.971-1.03.432-.244.927-.367 1.486-.367.569 0 1.064.108 1.486.324.422.216.75.544.986.986.235.44.353 1 .353 1.677v4.928h-1.236v-4.796c0-.687-.172-1.201-.515-1.545-.333-.343-.785-.515-1.353-.515-.383 0-.736.094-1.06.28a1.964 1.964 0 0 0-.779.794c-.187.353-.28.785-.28 1.295v4.487h-1.236ZM156.507 45.058c-.588 0-1.078-.108-1.471-.323a2.245 2.245 0 0 1-.882-.883 2.513 2.513 0 0 1-.295-1.192c0-.51.128-.941.383-1.294.265-.363.632-.638 1.103-.824.471-.186 1.02-.28 1.648-.28h1.927c0-.5-.059-.916-.177-1.25a1.397 1.397 0 0 0-.573-.75c-.265-.167-.618-.25-1.059-.25-.442 0-.819.112-1.133.338-.314.216-.51.54-.589.971h-1.265c.059-.51.231-.937.515-1.28a2.63 2.63 0 0 1 1.074-.794c.441-.187.907-.28 1.398-.28.696 0 1.27.128 1.721.383a2.29 2.29 0 0 1 1 1.044c.216.442.324.966.324 1.574v4.914h-1.104l-.073-1.324a2.743 2.743 0 0 1-.383.588 2.455 2.455 0 0 1-.529.471 2.603 2.603 0 0 1-.706.324c-.255.078-.54.117-.854.117Zm.177-1.044c.324 0 .623-.074.897-.22a2.26 2.26 0 0 0 .706-.59c.206-.254.363-.539.471-.852.108-.314.162-.643.162-.986v-.147h-1.824c-.461 0-.839.059-1.133.176-.284.118-.49.285-.618.5a1.318 1.318 0 0 0-.191.707c0 .284.059.534.176.75.118.206.29.368.515.485.236.118.515.177.839.177ZM142.043 44.882V34.584h1.442l3.501 7.253 3.472-7.253h1.457v10.298h-1.236v-8.077l-3.237 6.724h-.927l-3.236-6.665v8.018h-1.236ZM132.059 45.059c-.686 0-1.294-.177-1.824-.53a3.562 3.562 0 0 1-1.236-1.442c-.294-.618-.441-1.314-.441-2.089 0-.784.147-1.476.441-2.074a3.456 3.456 0 0 1 1.236-1.427c.53-.353 1.143-.53 1.839-.53.608 0 1.128.123 1.56.368.441.245.789.588 1.044 1.03V34.29h1.236v10.592h-1.118l-.103-1.236a2.948 2.948 0 0 1-.589.692 2.803 2.803 0 0 1-.868.53c-.333.127-.725.19-1.177.19Zm.162-1.074c.491 0 .917-.118 1.28-.353.363-.246.643-.589.839-1.03.196-.451.294-.981.294-1.59 0-.607-.098-1.132-.294-1.573-.196-.451-.476-.795-.839-1.03-.363-.245-.789-.368-1.28-.368-.461 0-.873.123-1.236.368-.362.235-.647.579-.853 1.03-.206.441-.309.966-.309 1.574 0 .608.103 1.138.309 1.589.206.441.491.784.853 1.03.363.235.775.353 1.236.353ZM123.408 44.882v-7.738h1.118l.088 1.412a2.69 2.69 0 0 1 .692-.883 2.84 2.84 0 0 1 1.029-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.294 0-.578.039-.853.117a2.166 2.166 0 0 0-.75.383 1.81 1.81 0 0 0-.515.72c-.128.305-.191.687-.191 1.148v4.252h-1.236ZM117.955 45.058c-.716 0-1.349-.166-1.898-.5a3.377 3.377 0 0 1-1.28-1.412c-.304-.608-.456-1.32-.456-2.133 0-.824.152-1.535.456-2.133a3.471 3.471 0 0 1 1.295-1.413c.559-.333 1.196-.5 1.912-.5.726 0 1.358.167 1.898.5.549.334.976.805 1.28 1.413.304.598.456 1.309.456 2.133 0 .814-.157 1.525-.471 2.133a3.377 3.377 0 0 1-1.28 1.412c-.549.334-1.187.5-1.912.5Zm0-1.059c.451 0 .858-.108 1.221-.324.363-.225.647-.558.853-1 .216-.451.324-1.005.324-1.662 0-.667-.103-1.221-.309-1.663-.206-.44-.491-.77-.854-.985a2.192 2.192 0 0 0-1.206-.339 2.24 2.24 0 0 0-1.206.339c-.363.215-.652.544-.868.985-.216.442-.324.996-.324 1.663 0 .657.103 1.211.309 1.662.216.442.5.775.853 1 .363.216.765.324 1.207.324ZM104.913 44.882l-2.281-7.738h1.236l1.692 6.164 1.795-6.164h1.397l1.81 6.149 1.677-6.15h1.25l-2.28 7.739h-1.265l-1.883-6.444-1.883 6.444h-1.265ZM98.892 45.058c-.696 0-1.275-.103-1.736-.309-.45-.215-.794-.51-1.03-.882a3.06 3.06 0 0 1-.426-1.324h1.265c.04.265.127.51.265.735.147.216.358.393.632.53.275.137.623.206 1.045.206.333 0 .618-.05.853-.147.236-.108.412-.255.53-.442.127-.186.191-.402.191-.647 0-.323-.074-.574-.221-.75-.137-.186-.343-.324-.618-.412a4.496 4.496 0 0 0-1-.22 6.681 6.681 0 0 1-1.147-.25 2.896 2.896 0 0 1-.854-.427 1.708 1.708 0 0 1-.515-.663 2.304 2.304 0 0 1-.176-.941c0-.422.113-.794.338-1.118.226-.324.545-.574.957-.75.421-.187.916-.28 1.485-.28.834 0 1.491.191 1.972.574.49.382.779.927.868 1.633h-1.221a1.207 1.207 0 0 0-.5-.853c-.285-.206-.663-.31-1.133-.31-.5 0-.878.094-1.133.28a.87.87 0 0 0-.383.736c0 .225.054.431.162.618.118.176.314.328.589.456.274.117.642.206 1.103.264.579.07 1.069.182 1.471.339.402.147.706.377.912.691.216.314.319.74.309 1.28 0 .51-.122.942-.368 1.295a2.222 2.222 0 0 1-1 .809c-.422.186-.917.28-1.486.28ZM91.407 45.058c-.696 0-1.275-.103-1.736-.309-.45-.215-.794-.51-1.03-.882a3.06 3.06 0 0 1-.426-1.324h1.265c.04.265.127.51.265.735.147.216.358.393.632.53.275.137.623.206 1.045.206.333 0 .618-.05.853-.147.236-.108.412-.255.53-.442.127-.186.191-.402.191-.647 0-.323-.073-.574-.22-.75-.138-.186-.344-.324-.618-.412a4.496 4.496 0 0 0-1-.22 6.681 6.681 0 0 1-1.148-.25 2.896 2.896 0 0 1-.854-.427 1.71 1.71 0 0 1-.515-.663 2.304 2.304 0 0 1-.176-.941c0-.422.113-.794.338-1.118.226-.324.545-.574.957-.75.421-.187.916-.28 1.485-.28.834 0 1.491.191 1.972.574.49.382.78.927.868 1.633h-1.221a1.207 1.207 0 0 0-.5-.853c-.285-.206-.663-.31-1.133-.31-.5 0-.878.094-1.133.28a.87.87 0 0 0-.383.736c0 .225.054.431.162.618.118.176.314.328.589.456.274.117.642.206 1.103.264.579.07 1.07.182 1.471.339.402.147.706.377.912.691.216.314.319.74.31 1.28 0 .51-.123.942-.369 1.295a2.228 2.228 0 0 1-1 .809c-.422.186-.917.28-1.486.28ZM82.922 45.058c-.588 0-1.079-.108-1.471-.323a2.246 2.246 0 0 1-.883-.883 2.522 2.522 0 0 1-.294-1.192c0-.51.127-.941.382-1.294.265-.363.633-.638 1.104-.824.47-.186 1.02-.28 1.647-.28h1.928c0-.5-.06-.916-.177-1.25a1.402 1.402 0 0 0-.574-.75c-.264-.167-.618-.25-1.059-.25-.441 0-.819.112-1.133.338-.313.216-.51.54-.588.971h-1.265c.059-.51.23-.937.515-1.28a2.635 2.635 0 0 1 1.074-.794c.441-.187.907-.28 1.397-.28.697 0 1.27.128 1.721.383a2.29 2.29 0 0 1 1 1.044c.217.442.324.966.324 1.574v4.914h-1.103l-.073-1.324a2.74 2.74 0 0 1-.383.588 2.46 2.46 0 0 1-.53.471 2.591 2.591 0 0 1-.706.324c-.255.078-.54.117-.853.117Zm.177-1.044c.323 0 .622-.074.897-.22.275-.148.51-.344.706-.59.206-.254.363-.539.47-.852.109-.314.163-.643.163-.986v-.147H83.51c-.46 0-.838.059-1.132.176-.285.118-.49.285-.618.5a1.314 1.314 0 0 0-.191.707c0 .284.058.534.176.75.118.206.29.368.515.485.235.118.515.177.839.177ZM72.351 44.882V34.584h3.31c.824 0 1.5.137 2.03.412.53.274.922.647 1.177 1.118.255.46.383.986.383 1.574 0 .579-.128 1.103-.383 1.574-.255.47-.647.844-1.176 1.118-.52.275-1.197.412-2.03.412h-2.075v4.09h-1.236Zm1.236-5.134h2.06c.863 0 1.466-.187 1.81-.56.352-.382.529-.882.529-1.5 0-.647-.177-1.152-.53-1.515-.343-.373-.946-.56-1.81-.56h-2.059v4.135Z"/></g><defs><clipPath id="a"><path class="tw-fill-text-alt2" d="M0 0h200v48.819H0z"/></clipPath></defs></svg>
diff --git a/libs/components/src/icon/logos/bitwarden/provider-portal.ts b/libs/assets/src/svg/svgs/provider-portal.ts
similarity index 99%
rename from libs/components/src/icon/logos/bitwarden/provider-portal.ts
rename to libs/assets/src/svg/svgs/provider-portal.ts
index b9c4d76b0e3..9626cc30c57 100644
--- a/libs/components/src/icon/logos/bitwarden/provider-portal.ts
+++ b/libs/assets/src/svg/svgs/provider-portal.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../../icon";
+import { svgIcon } from "../icon-service";
 
 const ProviderPortalLogo = svgIcon`
   <svg xmlns="http://www.w3.org/2000/svg" width="200" height="46" fill="none"><g class="tw-fill-text-alt2" clip-path="url(#a)"><path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/><path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM97.887 45.44V34.658h3.543c.842 0 1.536.139 2.08.416.544.277.945.652 1.202 1.124.267.473.4 1.007.4 1.603 0 .585-.128 1.114-.385 1.586-.257.473-.657.853-1.202 1.14-.544.278-1.242.416-2.095.416h-2.249v4.499h-1.294Zm1.294-5.591h2.218c.863 0 1.474-.18 1.834-.54.369-.37.554-.873.554-1.51 0-.646-.185-1.15-.554-1.51-.36-.369-.971-.554-1.834-.554h-2.218v4.114ZM106.731 45.44V37.8h1.171l.108 1.463a2.767 2.767 0 0 1 1.078-1.201c.483-.298 1.079-.447 1.787-.447v1.355h-.354c-.452 0-.868.083-1.248.247-.38.154-.683.421-.909.801-.226.38-.339.904-.339 1.571v3.852h-1.294ZM115.523 45.626c-.719 0-1.366-.165-1.941-.493a3.63 3.63 0 0 1-1.371-1.387c-.328-.606-.493-1.315-.493-2.126 0-.811.17-1.515.509-2.11a3.602 3.602 0 0 1 1.371-1.402 3.924 3.924 0 0 1 1.956-.493c.719 0 1.366.164 1.941.493a3.5 3.5 0 0 1 1.356 1.402c.339.595.508 1.299.508 2.11 0 .812-.169 1.52-.508 2.126a3.595 3.595 0 0 1-1.387 1.386c-.575.33-1.222.494-1.941.494Zm0-1.11c.442 0 .853-.108 1.233-.323.38-.216.688-.54.924-.97.236-.432.354-.966.354-1.603s-.118-1.17-.354-1.602c-.226-.431-.529-.755-.909-.97a2.424 2.424 0 0 0-1.217-.324c-.441 0-.852.108-1.232.324-.38.215-.688.539-.925.97-.236.431-.354.965-.354 1.602 0 .637.118 1.17.354 1.602.237.432.54.755.909.97.38.216.786.324 1.217.324ZM122.97 45.44l-2.896-7.64h1.356l2.295 6.393 2.311-6.393h1.325l-2.896 7.64h-1.495ZM129.587 36.105a.907.907 0 0 1-.647-.246.906.906 0 0 1-.247-.647c0-.247.082-.452.247-.617a.906.906 0 0 1 .647-.246c.246 0 .457.082.631.246a.81.81 0 0 1 .262.617.878.878 0 0 1-.262.647.887.887 0 0 1-.631.246Zm-.647 9.336V37.8h1.294v7.64h-1.294ZM135.953 45.626c-.76 0-1.428-.175-2.003-.524a3.643 3.643 0 0 1-1.325-1.433c-.308-.606-.462-1.294-.462-2.064s.159-1.453.478-2.05a3.526 3.526 0 0 1 1.325-1.416c.565-.35 1.232-.524 2.002-.524.627 0 1.181.128 1.664.385.483.257.858.616 1.125 1.078v-4.73h1.294v11.093h-1.171l-.123-1.264c-.247.37-.601.704-1.063 1.002-.462.298-1.043.447-1.741.447Zm.139-1.125c.513 0 .965-.118 1.355-.354a2.46 2.46 0 0 0 .925-1.017c.226-.431.339-.935.339-1.51s-.113-1.078-.339-1.51a2.359 2.359 0 0 0-.925-1c-.39-.247-.842-.37-1.355-.37-.504 0-.955.123-1.356.37-.39.235-.698.57-.924 1-.216.432-.324.935-.324 1.51s.108 1.079.324 1.51c.226.431.534.77.924 1.017.401.236.852.354 1.356.354ZM145.596 45.626c-.73 0-1.377-.165-1.941-.493a3.67 3.67 0 0 1-1.341-1.402c-.318-.596-.477-1.3-.477-2.11 0-.802.159-1.5.477-2.096a3.427 3.427 0 0 1 1.325-1.402c.575-.339 1.238-.508 1.987-.508.74 0 1.377.17 1.911.508.544.329.96.765 1.247 1.31a3.699 3.699 0 0 1 .416 2.095v.385h-6.085c.031.585.165 1.073.401 1.463a2.5 2.5 0 0 0 .909.863c.37.195.76.293 1.171.293.534 0 .98-.123 1.34-.37.359-.246.621-.58.786-1.001H149a3.472 3.472 0 0 1-1.186 1.771c-.575.462-1.315.694-2.218.694Zm0-6.917c-.617 0-1.166.19-1.649.57-.472.37-.744.914-.816 1.632h4.806c-.031-.688-.267-1.227-.708-1.617-.442-.39-.986-.585-1.633-.585ZM150.931 45.44V37.8h1.171l.108 1.463a2.767 2.767 0 0 1 1.078-1.201c.483-.298 1.078-.447 1.787-.447v1.355h-.354c-.452 0-.868.083-1.248.247-.38.154-.683.421-.909.801-.226.38-.339.904-.339 1.571v3.852h-1.294ZM160.681 45.44V34.658h3.544c.842 0 1.535.139 2.079.416.545.277.945.652 1.202 1.124.267.473.4 1.007.4 1.603 0 .585-.128 1.114-.385 1.586-.256.473-.657.853-1.201 1.14-.545.278-1.243.416-2.095.416h-2.25v4.499h-1.294Zm1.294-5.591h2.219c.862 0 1.474-.18 1.833-.54.37-.37.555-.873.555-1.51 0-.646-.185-1.15-.555-1.51-.359-.369-.971-.554-1.833-.554h-2.219v4.114ZM172.556 45.626c-.719 0-1.366-.165-1.941-.493a3.63 3.63 0 0 1-1.371-1.387c-.329-.606-.493-1.315-.493-2.126 0-.811.169-1.515.508-2.11a3.602 3.602 0 0 1 1.371-1.402 3.93 3.93 0 0 1 1.957-.493c.719 0 1.366.164 1.941.493a3.49 3.49 0 0 1 1.355 1.402c.339.595.509 1.299.509 2.11 0 .812-.17 1.52-.509 2.126a3.6 3.6 0 0 1-1.386 1.386c-.575.33-1.222.494-1.941.494Zm0-1.11c.441 0 .852-.108 1.232-.323.38-.216.688-.54.925-.97.236-.432.354-.966.354-1.603s-.118-1.17-.354-1.602c-.226-.431-.529-.755-.909-.97a2.427 2.427 0 0 0-1.217-.324c-.442 0-.853.108-1.233.324-.38.215-.688.539-.924.97-.236.431-.354.965-.354 1.602 0 .637.118 1.17.354 1.602.236.432.539.755.909.97.38.216.785.324 1.217.324ZM178.191 45.44V37.8h1.171l.108 1.463a2.767 2.767 0 0 1 1.078-1.201c.483-.298 1.078-.447 1.787-.447v1.355h-.354c-.452 0-.868.083-1.248.247-.38.154-.683.421-.909.801-.226.38-.339.904-.339 1.571v3.852h-1.294ZM186.807 45.44c-.699 0-1.248-.169-1.649-.508-.4-.339-.6-.95-.6-1.833v-4.206h-1.325V37.8h1.325l.169-1.834h1.125V37.8h2.249v1.093h-2.249V43.1c0 .483.097.811.292.986.196.164.54.246 1.033.246h.801v1.11h-1.171ZM192.287 45.626c-.637 0-1.166-.108-1.587-.324-.421-.216-.734-.503-.94-.863a2.324 2.324 0 0 1-.308-1.17c0-.781.298-1.382.894-1.803.595-.421 1.407-.632 2.434-.632h2.064v-.092c0-.667-.175-1.17-.524-1.51-.349-.349-.816-.523-1.402-.523-.503 0-.939.128-1.309.385-.359.246-.585.61-.678 1.093h-1.325c.052-.554.236-1.021.555-1.401.329-.38.734-.668 1.217-.863a3.893 3.893 0 0 1 1.54-.308c1.068 0 1.87.287 2.404.862.544.565.816 1.32.816 2.265v4.699h-1.155l-.077-1.371a3.072 3.072 0 0 1-.955 1.109c-.411.298-.966.447-1.664.447Zm.2-1.094c.493 0 .914-.129 1.263-.385.36-.257.632-.59.817-1.002.185-.41.277-.842.277-1.294v-.015h-1.956c-.76 0-1.3.133-1.618.4a1.21 1.21 0 0 0-.462.97c0 .401.144.725.431.971.298.237.714.355 1.248.355ZM198.079 45.44V34.35h1.294V45.44h-1.294Z"/></g><defs><clipPath id="a"><path class="tw-fill-text-alt2" d="M0 0h200v46H0z"/></clipPath></defs></svg>
diff --git a/libs/angular/src/auth/icons/recovery.icon.ts b/libs/assets/src/svg/svgs/recovery.icon.ts
similarity index 98%
rename from libs/angular/src/auth/icons/recovery.icon.ts
rename to libs/assets/src/svg/svgs/recovery.icon.ts
index e23b46bebe1..95de89cad03 100644
--- a/libs/angular/src/auth/icons/recovery.icon.ts
+++ b/libs/assets/src/svg/svgs/recovery.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const RecoveryCodeIcon = svgIcon`
   <svg
diff --git a/libs/components/src/icon/icons/registration-check-email.icon.ts b/libs/assets/src/svg/svgs/registration-check-email.icon.ts
similarity index 97%
rename from libs/components/src/icon/icons/registration-check-email.icon.ts
rename to libs/assets/src/svg/svgs/registration-check-email.icon.ts
index f0e881e5b2d..dd8a5c2cbdb 100644
--- a/libs/components/src/icon/icons/registration-check-email.icon.ts
+++ b/libs/assets/src/svg/svgs/registration-check-email.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const RegistrationCheckEmailIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100" fill="none">
diff --git a/libs/auth/src/angular/icons/registration-expired-link.icon.ts b/libs/assets/src/svg/svgs/registration-expired-link.icon.ts
similarity index 83%
rename from libs/auth/src/angular/icons/registration-expired-link.icon.ts
rename to libs/assets/src/svg/svgs/registration-expired-link.icon.ts
index 099cf16d1d8..fbeda6c25ad 100644
--- a/libs/auth/src/angular/icons/registration-expired-link.icon.ts
+++ b/libs/assets/src/svg/svgs/registration-expired-link.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const RegistrationExpiredLinkIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100" fill="none">
diff --git a/libs/auth/src/angular/icons/registration-lock-alt.icon.ts b/libs/assets/src/svg/svgs/registration-lock-alt.icon.ts
similarity index 94%
rename from libs/auth/src/angular/icons/registration-lock-alt.icon.ts
rename to libs/assets/src/svg/svgs/registration-lock-alt.icon.ts
index d312e909413..2e81989c304 100644
--- a/libs/auth/src/angular/icons/registration-lock-alt.icon.ts
+++ b/libs/assets/src/svg/svgs/registration-lock-alt.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const RegistrationLockAltIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100" fill="none">
diff --git a/libs/auth/src/angular/icons/registration-user-add.icon.ts b/libs/assets/src/svg/svgs/registration-user-add.icon.ts
similarity index 93%
rename from libs/auth/src/angular/icons/registration-user-add.icon.ts
rename to libs/assets/src/svg/svgs/registration-user-add.icon.ts
index 4f68453639d..2aa5bcc81b5 100644
--- a/libs/auth/src/angular/icons/registration-user-add.icon.ts
+++ b/libs/assets/src/svg/svgs/registration-user-add.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const RegistrationUserAddIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 120 100" fill="none">
diff --git a/apps/web/src/app/dirt/reports/icons/report-breach.icon.ts b/libs/assets/src/svg/svgs/report-breach.icon.ts
similarity index 96%
rename from apps/web/src/app/dirt/reports/icons/report-breach.icon.ts
rename to libs/assets/src/svg/svgs/report-breach.icon.ts
index 749779a87bc..6e7fde74cbc 100644
--- a/apps/web/src/app/dirt/reports/icons/report-breach.icon.ts
+++ b/libs/assets/src/svg/svgs/report-breach.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const ReportBreach = svgIcon`
   <svg width="58" height="75" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/apps/web/src/app/dirt/reports/icons/report-exposed-passwords.icon.ts b/libs/assets/src/svg/svgs/report-exposed-passwords.icon.ts
similarity index 97%
rename from apps/web/src/app/dirt/reports/icons/report-exposed-passwords.icon.ts
rename to libs/assets/src/svg/svgs/report-exposed-passwords.icon.ts
index df532fe1582..0a019885805 100644
--- a/apps/web/src/app/dirt/reports/icons/report-exposed-passwords.icon.ts
+++ b/libs/assets/src/svg/svgs/report-exposed-passwords.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const ReportExposedPasswords = svgIcon`
   <svg width="101" height="77" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/apps/web/src/app/dirt/reports/icons/report-inactive-two-factor.icon.ts b/libs/assets/src/svg/svgs/report-inactive-two-factor.icon.ts
similarity index 94%
rename from apps/web/src/app/dirt/reports/icons/report-inactive-two-factor.icon.ts
rename to libs/assets/src/svg/svgs/report-inactive-two-factor.icon.ts
index 65ca4469648..d7ad3c9084c 100644
--- a/apps/web/src/app/dirt/reports/icons/report-inactive-two-factor.icon.ts
+++ b/libs/assets/src/svg/svgs/report-inactive-two-factor.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const ReportInactiveTwoFactor = svgIcon`
   <svg width="42" height="75" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/apps/web/src/app/dirt/reports/icons/report-member-access.icon.ts b/libs/assets/src/svg/svgs/report-member-access.icon.ts
similarity index 96%
rename from apps/web/src/app/dirt/reports/icons/report-member-access.icon.ts
rename to libs/assets/src/svg/svgs/report-member-access.icon.ts
index 825968cd0c0..c47fed9cd2a 100644
--- a/apps/web/src/app/dirt/reports/icons/report-member-access.icon.ts
+++ b/libs/assets/src/svg/svgs/report-member-access.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const MemberAccess = svgIcon`
     <svg width="94" height="63" viewBox="0 0 94 63" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/apps/web/src/app/dirt/reports/icons/report-reused-passwords.icon.ts b/libs/assets/src/svg/svgs/report-reused-passwords.icon.ts
similarity index 96%
rename from apps/web/src/app/dirt/reports/icons/report-reused-passwords.icon.ts
rename to libs/assets/src/svg/svgs/report-reused-passwords.icon.ts
index d28790ba051..30aaeee80fa 100644
--- a/apps/web/src/app/dirt/reports/icons/report-reused-passwords.icon.ts
+++ b/libs/assets/src/svg/svgs/report-reused-passwords.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const ReportReusedPasswords = svgIcon`
   <svg width="102" height="102" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/apps/web/src/app/dirt/reports/icons/report-unsecured-websites.icon.ts b/libs/assets/src/svg/svgs/report-unsecured-websites.icon.ts
similarity index 94%
rename from apps/web/src/app/dirt/reports/icons/report-unsecured-websites.icon.ts
rename to libs/assets/src/svg/svgs/report-unsecured-websites.icon.ts
index 083ddb40db7..d55c06987ca 100644
--- a/apps/web/src/app/dirt/reports/icons/report-unsecured-websites.icon.ts
+++ b/libs/assets/src/svg/svgs/report-unsecured-websites.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const ReportUnsecuredWebsites = svgIcon`
   <svg width="113" height="76" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/apps/web/src/app/dirt/reports/icons/report-weak-passwords.icon.ts b/libs/assets/src/svg/svgs/report-weak-passwords.icon.ts
similarity index 95%
rename from apps/web/src/app/dirt/reports/icons/report-weak-passwords.icon.ts
rename to libs/assets/src/svg/svgs/report-weak-passwords.icon.ts
index 8a0ef324c73..9709255169b 100644
--- a/apps/web/src/app/dirt/reports/icons/report-weak-passwords.icon.ts
+++ b/libs/assets/src/svg/svgs/report-weak-passwords.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const ReportWeakPasswords = svgIcon`
   <svg width="78" height="78" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/assets/src/svg/svgs/restricted-view.ts b/libs/assets/src/svg/svgs/restricted-view.ts
new file mode 100644
index 00000000000..afe6c752870
--- /dev/null
+++ b/libs/assets/src/svg/svgs/restricted-view.ts
@@ -0,0 +1,6 @@
+import { svgIcon } from "../icon-service";
+
+export const RestrictedView = svgIcon`<svg xmlns="http://www.w3.org/2000/svg" width="120" height="120" viewBox="10 -10 120 140" fill="none">
+  <rect class="tw-stroke-secondary-600" width="134" height="86" x="3" y="31.485" stroke-width="6" rx="11"/>
+  <path class="tw-fill-secondary-600" d="M123.987 20.15H14.779a3.114 3.114 0 0 1-2.083-.95 3.036 3.036 0 0 1 0-4.208 3.125 3.125 0 0 1 2.083-.951h109.208c.792.043 1.536.38 2.083.95a3.035 3.035 0 0 1 0 4.208 3.115 3.115 0 0 1-2.083.95Zm-6.649-14.041h-95.91a3.114 3.114 0 0 1-2.082-.95 3.036 3.036 0 0 1-.848-2.105c0-.782.306-1.538.848-2.104A3.125 3.125 0 0 1 21.43 0h95.909c.791.043 1.535.38 2.082.95.547.57.849 1.322.849 2.104a3.05 3.05 0 0 1-.849 2.104 3.115 3.115 0 0 1-2.082.95ZM95.132 74.407A42.317 42.317 0 0 0 83.59 65.43l8.799-8.657a1.59 1.59 0 0 0 .004-2.27 1.641 1.641 0 0 0-2.298-.004l-9.64 9.479a28.017 28.017 0 0 0-10.483-2.13c-14.323 0-24.814 12.342-25.298 12.89a2.431 2.431 0 0 0-.675 1.64c-.01.612.215 1.203.626 1.66a43.981 43.981 0 0 0 11.873 9.485l-8.806 8.658a1.601 1.601 0 0 0-.499 1.138 1.602 1.602 0 0 0 1.008 1.5 1.651 1.651 0 0 0 1.255-.009c.199-.085.379-.205.528-.359l9.634-9.443a27.16 27.16 0 0 0 10.359 2.158c14.323 0 24.753-12.086 25.23-12.63a2.983 2.983 0 0 0-.078-4.128h.002ZM49.204 77.82a1.82 1.82 0 0 1-.43-.6 1.767 1.767 0 0 1-.152-.72 1.778 1.778 0 0 1 .582-1.32c3.857-3.564 11.782-9.686 20.77-9.676 2.564.037 5.105.508 7.508 1.395l-3.291 3.235a7.793 7.793 0 0 0-5.02-1.226 7.746 7.746 0 0 0-4.676 2.18 7.528 7.528 0 0 0-1 9.563l-4.199 4.143a43.135 43.135 0 0 1-10.092-6.974Zm26.059-1.318a5.19 5.19 0 0 1-1.557 3.68 5.326 5.326 0 0 1-3.733 1.521c-.82-.005-1.63-.2-2.359-.57l7.067-6.952c.377.718.575 1.513.582 2.321Zm-10.58 0a5.136 5.136 0 0 1 .673-2.555 5.204 5.204 0 0 1 1.862-1.897 5.302 5.302 0 0 1 5.172-.146l-7.096 6.977a5.06 5.06 0 0 1-.61-2.379Zm26.053 1.331c-3.857 3.56-11.779 9.677-20.763 9.677a22.723 22.723 0 0 1-7.454-1.369l3.292-3.226a7.793 7.793 0 0 0 4.995 1.192 7.734 7.734 0 0 0 4.642-2.176 7.524 7.524 0 0 0 1.033-9.506l4.224-4.168a43.258 43.258 0 0 1 10.02 6.945 1.788 1.788 0 0 1 .585 1.313 1.788 1.788 0 0 1-.577 1.318h.003Z"/>
+</svg>`;
diff --git a/libs/components/src/icon/icons/search.ts b/libs/assets/src/svg/svgs/search.ts
similarity index 98%
rename from libs/components/src/icon/icons/search.ts
rename to libs/assets/src/svg/svgs/search.ts
index 914fa0e9813..40f323acf3e 100644
--- a/libs/components/src/icon/icons/search.ts
+++ b/libs/assets/src/svg/svgs/search.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const Search = svgIcon`
 <svg width="120" height="120" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/apps/web/src/app/layouts/secrets-manager-logo.ts b/libs/assets/src/svg/svgs/secrets-manager-alt.ts
similarity index 99%
rename from apps/web/src/app/layouts/secrets-manager-logo.ts
rename to libs/assets/src/svg/svgs/secrets-manager-alt.ts
index 70f0f46540e..293bd99cbf3 100644
--- a/apps/web/src/app/layouts/secrets-manager-logo.ts
+++ b/libs/assets/src/svg/svgs/secrets-manager-alt.ts
@@ -1,5 +1,5 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
-export const SecretsManagerLogo = svgIcon`
+export const SecretsManagerAlt = svgIcon`
   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 580 104" fill="none"><path fill="#fff" d="M102.539 52.27c0 28.315-22.954 51.269-51.27 51.269C22.955 103.539 0 80.585 0 52.269 0 23.955 22.954 1 51.27 1c28.315 0 51.269 22.954 51.269 51.27Z"/><path fill="#175DDC" fill-rule="evenodd" d="M75.971 26.765c-.516-.49-1.111-.777-1.786-.777H28.39c-.675 0-1.31.287-1.786.777-.516.49-.754 1.145-.754 1.84v31.47c0 2.371.437 4.66 1.31 6.95.873 2.288 1.984 4.332 3.294 6.13s2.897 3.515 4.682 5.232a62.036 62.036 0 0 0 5 4.25 82.731 82.731 0 0 0 4.802 3.188c1.667.981 2.857 1.676 3.572 2.003.714.368 1.27.613 1.706.817a2.26 2.26 0 0 0 1.032.246 2.26 2.26 0 0 0 1.032-.246c.436-.204.992-.45 1.706-.817.715-.368 1.905-1.022 3.572-2.003a54.848 54.848 0 0 0 4.801-3.188c1.548-1.103 3.215-2.534 5.04-4.25 1.826-1.717 3.373-3.434 4.683-5.232 1.31-1.798 2.42-3.842 3.294-6.13.912-2.29 1.31-4.62 1.31-6.95v-31.47c.04-.695-.239-1.309-.715-1.84Zm-5.913 33.597c0 11.403-18.77 21.172-18.77 21.172V32.732h18.77v27.63Z" clip-rule="evenodd"/><path fill="#fff" d="M142.208 70.81c-2.804 0-5.243-.511-7.319-1.533-2.075-1.023-3.678-2.447-4.806-4.272-1.129-1.826-1.694-3.943-1.694-6.353h4.807c0 1.497.346 2.884 1.038 4.162.692 1.241 1.693 2.246 3.004 3.012 1.347.73 3.004 1.096 4.97 1.096 2.585 0 4.588-.621 6.008-1.862 1.42-1.242 2.13-2.794 2.13-4.656 0-1.533-.327-2.756-.983-3.669-.655-.95-1.547-1.716-2.676-2.3-1.092-.585-2.367-1.096-3.823-1.534a126.43 126.43 0 0 1-4.479-1.479c-2.95-1.022-5.134-2.281-6.555-3.778-1.42-1.534-2.13-3.524-2.13-5.97-.036-2.045.437-3.852 1.42-5.422.984-1.607 2.367-2.848 4.151-3.724 1.821-.913 3.969-1.37 6.446-1.37 2.439 0 4.551.457 6.335 1.37 1.821.913 3.223 2.172 4.206 3.779 1.02 1.606 1.548 3.432 1.584 5.476h-4.806c0-1.058-.274-2.099-.82-3.121-.546-1.06-1.383-1.917-2.512-2.574-1.093-.658-2.476-.986-4.151-.986-2.076-.037-3.787.493-5.135 1.588-1.31 1.095-1.966 2.61-1.966 4.546 0 1.643.455 2.903 1.366 3.779.946.876 2.257 1.606 3.932 2.19 1.675.548 3.605 1.187 5.79 1.917 1.821.657 3.459 1.424 4.916 2.3 1.456.877 2.585 2.009 3.386 3.396.838 1.388 1.256 3.158 1.256 5.313 0 1.825-.473 3.56-1.42 5.203-.946 1.606-2.385 2.92-4.315 3.943-1.893 1.022-4.278 1.533-7.155 1.533ZM172.42 70.81c-2.586 0-4.88-.584-6.882-1.752-2.003-1.205-3.587-2.867-4.752-4.984-1.129-2.118-1.694-4.619-1.694-7.503 0-2.848.565-5.331 1.694-7.449 1.128-2.154 2.694-3.815 4.697-4.983 2.039-1.205 4.388-1.808 7.046-1.808 2.622 0 4.879.603 6.773 1.807 1.93 1.169 3.404 2.72 4.424 4.656a13.201 13.201 0 0 1 1.529 6.243c0 .402-.018.803-.054 1.205v1.37h-21.575c.109 2.08.582 3.815 1.42 5.202.874 1.351 1.948 2.373 3.222 3.067a8.754 8.754 0 0 0 4.152 1.04c1.893 0 3.477-.437 4.751-1.314 1.275-.876 2.203-2.063 2.786-3.56h4.533c-.728 2.52-2.13 4.62-4.205 6.299-2.039 1.643-4.661 2.464-7.865 2.464Zm0-24.59c-2.185 0-4.133.675-5.845 2.026-1.675 1.314-2.64 3.25-2.895 5.805h17.042c-.11-2.446-.947-4.363-2.513-5.75-1.566-1.388-3.495-2.081-5.789-2.081ZM202.697 70.81c-2.585 0-4.916-.584-6.991-1.752-2.039-1.205-3.66-2.867-4.861-4.984-1.166-2.154-1.748-4.655-1.748-7.503s.582-5.331 1.748-7.449c1.201-2.154 2.822-3.815 4.861-4.983 2.075-1.205 4.406-1.808 6.991-1.808 3.204 0 5.899.84 8.084 2.52 2.221 1.679 3.623 3.924 4.206 6.736h-4.698c-.364-1.68-1.256-2.976-2.676-3.889-1.42-.949-3.077-1.424-4.97-1.424-1.53 0-2.968.384-4.315 1.15-1.348.767-2.44 1.917-3.278 3.45-.837 1.534-1.256 3.433-1.256 5.697 0 2.263.419 4.162 1.256 5.696.838 1.533 1.93 2.701 3.278 3.505a8.584 8.584 0 0 0 4.315 1.15c1.893 0 3.55-.457 4.97-1.37 1.42-.949 2.312-2.282 2.676-3.998h4.698c-.547 2.739-1.93 4.966-4.152 6.682-2.221 1.716-4.934 2.574-8.138 2.574ZM220.302 70.153V42.988h4.151l.382 5.203c.838-1.789 2.112-3.213 3.823-4.272 1.712-1.058 3.824-1.588 6.336-1.588v4.82h-1.256c-1.602 0-3.077.292-4.424.876-1.347.548-2.422 1.497-3.223 2.848-.801 1.35-1.201 3.213-1.201 5.586v13.692h-4.588ZM250.218 70.81c-2.585 0-4.879-.584-6.882-1.752-2.003-1.205-3.587-2.867-4.752-4.984-1.129-2.118-1.693-4.619-1.693-7.503 0-2.848.564-5.331 1.693-7.449 1.129-2.154 2.695-3.815 4.698-4.983 2.039-1.205 4.387-1.808 7.045-1.808 2.622 0 4.88.603 6.773 1.807 1.93 1.169 3.405 2.72 4.424 4.656 1.02 1.935 1.53 4.016 1.53 6.243 0 .402-.018.803-.055 1.205v1.37h-21.575c.11 2.08.583 3.815 1.421 5.202.874 1.351 1.948 2.373 3.222 3.067a8.753 8.753 0 0 0 4.151 1.04c1.894 0 3.478-.437 4.752-1.314 1.275-.876 2.203-2.063 2.786-3.56h4.533c-.728 2.52-2.13 4.62-4.206 6.299-2.039 1.643-4.66 2.464-7.865 2.464Zm0-24.59c-2.185 0-4.133.675-5.844 2.026-1.675 1.314-2.64 3.25-2.895 5.805h17.041c-.109-2.446-.946-4.363-2.512-5.75-1.566-1.388-3.496-2.081-5.79-2.081ZM277.841 70.153c-2.476 0-4.424-.603-5.844-1.807-1.42-1.205-2.13-3.378-2.13-6.518V46.877h-4.698v-3.889h4.698l.601-6.517h3.987v6.517h7.974v3.889h-7.974v14.951c0 1.716.346 2.885 1.038 3.505.691.585 1.911.877 3.659.877h2.84v3.943h-4.151ZM297.544 70.81c-3.241 0-5.936-.821-8.084-2.464-2.149-1.643-3.405-3.87-3.769-6.682h4.697c.292 1.424 1.038 2.665 2.24 3.724 1.238 1.022 2.895 1.534 4.97 1.534 1.93 0 3.35-.402 4.26-1.205.911-.84 1.366-1.826 1.366-2.958 0-1.643-.601-2.738-1.803-3.286-1.165-.547-2.822-1.04-4.97-1.478a28.114 28.114 0 0 1-4.369-1.26c-1.457-.548-2.677-1.315-3.66-2.3-.983-1.023-1.475-2.355-1.475-3.998 0-2.373.874-4.309 2.622-5.806 1.784-1.533 4.188-2.3 7.21-2.3 2.876 0 5.225.73 7.046 2.19 1.857 1.425 2.931 3.47 3.222 6.135h-4.533c-.182-1.388-.783-2.465-1.803-3.231-.983-.804-2.312-1.205-3.987-1.205-1.638 0-2.913.346-3.823 1.04-.874.694-1.311 1.607-1.311 2.739 0 1.095.564 1.953 1.693 2.574 1.165.62 2.731 1.15 4.697 1.588 1.675.365 3.259.821 4.752 1.37 1.53.51 2.768 1.295 3.714 2.354.984 1.022 1.475 2.52 1.475 4.491.037 2.446-.892 4.473-2.785 6.08-1.857 1.57-4.388 2.354-7.592 2.354ZM327.019 70.153V31.816h5.353l13.764 26.726 13.655-26.726h5.407v38.337h-4.588V40.031l-12.781 24.645h-3.441l-12.781-24.59v30.067h-4.588ZM380.911 70.81c-2.258 0-4.133-.383-5.626-1.15-1.493-.767-2.604-1.789-3.332-3.067a8.266 8.266 0 0 1-1.092-4.162c0-2.775 1.056-4.911 3.168-6.408 2.112-1.497 4.988-2.245 8.63-2.245h7.319v-.33c0-2.372-.619-4.161-1.857-5.366-1.238-1.242-2.895-1.862-4.971-1.862-1.784 0-3.332.456-4.642 1.369-1.275.876-2.076 2.172-2.404 3.888h-4.697c.182-1.971.838-3.633 1.966-4.983 1.166-1.352 2.604-2.374 4.315-3.068 1.712-.73 3.532-1.095 5.462-1.095 3.787 0 6.627 1.022 8.521 3.067 1.93 2.008 2.895 4.692 2.895 8.05v16.705h-4.097l-.273-4.874c-.765 1.533-1.893 2.848-3.386 3.943-1.457 1.059-3.423 1.588-5.899 1.588Zm.71-3.888c1.748 0 3.241-.457 4.479-1.37a8.66 8.66 0 0 0 2.895-3.56c.655-1.46.983-2.993.983-4.6v-.055h-6.937c-2.695 0-4.606.475-5.735 1.424-1.092.913-1.639 2.063-1.639 3.45 0 1.425.51 2.575 1.53 3.451 1.056.84 2.53 1.26 4.424 1.26ZM400.356 70.153V42.988h4.151l.273 4.875a9.86 9.86 0 0 1 3.769-4.053c1.639-.986 3.496-1.479 5.571-1.479 3.205 0 5.754.986 7.647 2.958 1.93 1.935 2.895 4.929 2.895 8.981v15.883h-4.588v-15.39c0-5.659-2.331-8.489-6.991-8.489-2.331 0-4.279.858-5.845 2.575-1.529 1.679-2.294 4.089-2.294 7.229v14.075h-4.588ZM439.533 70.81c-2.258 0-4.133-.383-5.626-1.15-1.493-.767-2.603-1.789-3.332-3.067a8.266 8.266 0 0 1-1.092-4.162c0-2.775 1.056-4.911 3.168-6.408 2.112-1.497 4.988-2.245 8.63-2.245h7.319v-.33c0-2.372-.619-4.161-1.857-5.366-1.238-1.242-2.895-1.862-4.971-1.862-1.784 0-3.331.456-4.642 1.369-1.275.876-2.076 2.172-2.404 3.888h-4.697c.182-1.971.838-3.633 1.966-4.983 1.166-1.352 2.604-2.374 4.315-3.068 1.712-.73 3.532-1.095 5.462-1.095 3.787 0 6.627 1.022 8.521 3.067 1.93 2.008 2.895 4.692 2.895 8.05v16.705h-4.097l-.273-4.874c-.764 1.533-1.893 2.848-3.386 3.943-1.457 1.059-3.423 1.588-5.899 1.588Zm.71-3.888c1.748 0 3.241-.457 4.479-1.37a8.66 8.66 0 0 0 2.895-3.56c.655-1.46.983-2.993.983-4.6v-.055h-6.937c-2.694 0-4.606.475-5.735 1.424-1.092.913-1.639 2.063-1.639 3.45 0 1.425.51 2.575 1.53 3.451 1.056.84 2.531 1.26 4.424 1.26ZM469.684 61.61c-1.53 0-2.931-.202-4.206-.603l-2.731 2.574c.401.292.892.548 1.475.767.619.182 1.493.365 2.622.547 1.128.146 2.712.31 4.751.493 3.642.256 6.245 1.096 7.811 2.52 1.566 1.424 2.349 3.286 2.349 5.586 0 1.57-.437 3.067-1.311 4.49-.838 1.425-2.149 2.593-3.933 3.506-1.748.913-4.005 1.369-6.773 1.369-2.439 0-4.606-.329-6.499-.986-1.894-.62-3.369-1.588-4.425-2.903-1.055-1.277-1.583-2.902-1.583-4.874 0-1.022.273-2.136.819-3.34.546-1.169 1.566-2.282 3.059-3.341a13.725 13.725 0 0 1-2.076-1.041 13.173 13.173 0 0 1-1.529-1.314V63.8l4.642-4.6c-2.148-1.826-3.222-4.236-3.222-7.23 0-1.789.418-3.414 1.256-4.874.837-1.46 2.057-2.61 3.66-3.45 1.602-.877 3.55-1.315 5.844-1.315 1.566 0 2.986.22 4.26.657h9.995v3.45l-5.079.22c1.056 1.533 1.584 3.304 1.584 5.312 0 1.79-.437 3.414-1.311 4.874-.838 1.461-2.057 2.63-3.66 3.506-1.565.84-3.495 1.26-5.789 1.26Zm0-3.78c1.93 0 3.459-.493 4.588-1.478 1.165-1.023 1.748-2.483 1.748-4.382 0-1.862-.583-3.286-1.748-4.272-1.129-1.022-2.658-1.533-4.588-1.533-1.967 0-3.532.511-4.698 1.533-1.128.986-1.693 2.41-1.693 4.272 0 1.899.565 3.36 1.693 4.382 1.166.985 2.731 1.478 4.698 1.478Zm-7.975 15.828c0 1.826.765 3.177 2.294 4.053 1.53.913 3.441 1.37 5.735 1.37 2.258 0 4.06-.494 5.408-1.48 1.383-.986 2.075-2.3 2.075-3.943 0-1.168-.473-2.19-1.42-3.067-.947-.84-2.694-1.332-5.243-1.479-2.003-.146-3.733-.328-5.189-.547-1.493.803-2.476 1.661-2.95 2.574-.473.95-.71 1.789-.71 2.52ZM499.136 70.81c-2.585 0-4.879-.584-6.882-1.752-2.003-1.205-3.587-2.867-4.752-4.984-1.129-2.118-1.693-4.619-1.693-7.503 0-2.848.564-5.331 1.693-7.449 1.129-2.154 2.695-3.815 4.697-4.983 2.04-1.205 4.388-1.808 7.046-1.808 2.622 0 4.88.603 6.773 1.807 1.93 1.169 3.405 2.72 4.424 4.656 1.02 1.935 1.53 4.016 1.53 6.243 0 .402-.019.803-.055 1.205v1.37h-21.575c.11 2.08.583 3.815 1.42 5.202.874 1.351 1.949 2.373 3.223 3.067a8.753 8.753 0 0 0 4.151 1.04c1.894 0 3.478-.437 4.752-1.314 1.274-.876 2.203-2.063 2.786-3.56h4.533c-.728 2.52-2.13 4.62-4.206 6.299-2.039 1.643-4.661 2.464-7.865 2.464Zm0-24.59c-2.185 0-4.133.675-5.844 2.026-1.675 1.314-2.64 3.25-2.895 5.805h17.041c-.109-2.446-.947-4.363-2.512-5.75-1.566-1.388-3.496-2.081-5.79-2.081ZM516.96 70.153V42.988h4.151l.383 5.203c.837-1.789 2.112-3.213 3.823-4.272 1.712-1.058 3.824-1.588 6.336-1.588v4.82h-1.256c-1.602 0-3.077.292-4.424.876-1.348.548-2.422 1.497-3.223 2.848-.801 1.35-1.202 3.213-1.202 5.586v13.692h-4.588Z"/></svg>
 `;
diff --git a/libs/components/src/icon/logos/bitwarden/secrets-manager.ts b/libs/assets/src/svg/svgs/secrets-manager.ts
similarity index 99%
rename from libs/components/src/icon/logos/bitwarden/secrets-manager.ts
rename to libs/assets/src/svg/svgs/secrets-manager.ts
index 45f3418b1e8..b2657f8fb67 100644
--- a/libs/components/src/icon/logos/bitwarden/secrets-manager.ts
+++ b/libs/assets/src/svg/svgs/secrets-manager.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../../icon";
+import { svgIcon } from "../icon-service";
 
 const SecretsManagerLogo = svgIcon`
   <svg xmlns="http://www.w3.org/2000/svg" width="200" height="49" fill="none"><g class="tw-fill-text-alt2" clip-path="url(#a)"><path fill-rule="evenodd" d="M47.948 7.444c2.284 0 4.06.867 5.366 2.674 1.305 1.77 1.958 4.191 1.958 7.263 0 3.18-.653 5.637-1.995 7.371-1.341 1.77-3.154 2.602-5.438 2.602s-4.025-.795-5.33-2.457h-.363l-.688 1.698a.67.67 0 0 1-.617.398h-2.9a.649.649 0 0 1-.653-.65V.94c0-.362.29-.65.653-.65h3.915c.363 0 .653.288.653.65v5.564c0 .795-.072 2.06-.218 3.794h.218c1.197-1.879 3.046-2.854 5.439-2.854Zm-1.668 4.228c-1.27 0-2.248.397-2.865 1.192-.58.795-.906 2.132-.906 3.939v.578c0 2.06.29 3.541.906 4.408.617.867 1.596 1.337 2.937 1.337 1.052 0 1.958-.506 2.575-1.517.616-.976.942-2.458.942-4.3 0-1.88-.326-3.289-.943-4.228-.652-.94-1.559-1.41-2.646-1.41ZM63.9 27.029h-3.915a.649.649 0 0 1-.653-.65V8.491c0-.362.29-.65.653-.65h3.916c.362 0 .652.288.652.65v17.85c.037.326-.29.687-.652.687Zm14.322-3.867c.762 0 1.668-.144 2.756-.433a.435.435 0 0 1 .544.433v3c0 .18-.109.325-.254.397-1.233.506-2.792.759-4.532.759-2.103 0-3.626-.506-4.569-1.59-.942-1.048-1.45-2.638-1.45-4.734V11.78H68.65a.418.418 0 0 1-.435-.434V9.648c0-.036.037-.072.037-.108l2.864-1.699 1.414-3.758c.073-.18.218-.289.399-.289h2.61c.254 0 .435.18.435.434v3.65h5.185c.109 0 .218.108.218.216v3.252a.418.418 0 0 1-.435.434H76.01v9.178c0 .723.217 1.301.616 1.626.363.398.943.578 1.595.578Zm24.401 3.867c-.507 0-.906-.325-1.124-.795l-3.843-11.672c-.254-.83-.58-2.095-1.015-3.722h-.109l-.362 1.301-.762 2.457-3.952 11.672c-.145.47-.58.759-1.088.759a1.12 1.12 0 0 1-1.087-.831L84.459 9.395c-.145-.506.253-1.048.834-1.048h.108c.363 0 .69.253.798.614l2.828 10.227c.689 2.674 1.16 4.625 1.378 5.926h.108c.653-2.674 1.16-4.445 1.487-5.348L95.662 9.07c.145-.434.544-.723 1.051-.723.472 0 .87.29 1.016.723l3.408 10.623c.834 2.71 1.341 4.445 1.523 5.348h.108c.109-.722.544-2.746 1.378-5.998l2.72-10.082a.848.848 0 0 1 .797-.614c.544 0 .943.506.798 1.048l-4.569 16.803c-.145.506-.58.83-1.124.83h-.145Zm21.537 0a.663.663 0 0 1-.652-.578l-.327-2.385H123c-.943 1.192-1.885 2.06-2.901 2.565-.979.506-2.175.723-3.517.723-1.849 0-3.263-.47-4.278-1.41-.906-.83-1.414-1.95-1.486-3.36-.145-1.879.652-3.686 2.175-4.733 1.559-1.012 3.734-1.627 6.671-1.627l3.554-.108v-1.229c0-1.806-.363-3.107-1.124-4.01-.762-.904-1.886-1.337-3.481-1.337-1.523 0-3.046.36-4.641 1.12-.399.18-.87 0-1.052-.398-.181-.397 0-.867.399-1.011 1.813-.723 3.59-1.12 5.403-1.12 2.066 0 3.589.541 4.641 1.625 1.015 1.048 1.522 2.747 1.522 4.95v11.745c-.036.216-.362.578-.725.578Zm-7.505-1.229c2.03 0 3.589-.578 4.713-1.698 1.161-1.12 1.741-2.746 1.741-4.734v-1.806l-3.263.144c-2.647.108-4.496.542-5.657 1.229-1.124.686-1.704 1.806-1.704 3.252 0 1.156.363 2.096 1.052 2.746.797.542 1.813.867 3.118.867Zm21.464-17.814c.544 0 1.088.036 1.704.108a.815.815 0 0 1 .689.94c-.072.433-.507.686-.942.614-.544-.072-1.088-.145-1.632-.145-1.595 0-2.901.687-3.916 2.024-1.015 1.337-1.523 3.072-1.523 5.095v9.467c0 .47-.362.831-.834.831a.819.819 0 0 1-.833-.83V9.105c0-.398.326-.723.725-.723.398 0 .725.29.725.687l.145 2.674h.109c.761-1.373 1.595-2.349 2.465-2.891.834-.578 1.885-.867 3.118-.867Zm12.763 0c1.341 0 2.538.253 3.517.722 1.015.47 1.885 1.338 2.646 2.53h.109a86.156 86.156 0 0 1-.109-4.228V1.12a.82.82 0 0 1 .834-.83c.472 0 .834.36.834.83v25.258a.571.571 0 0 1-.58.579.588.588 0 0 1-.58-.543l-.363-2.348h-.145c-1.414 2.132-3.48 3.18-6.127 3.18-2.611 0-4.532-.795-5.946-2.421-1.342-1.627-2.067-3.94-2.067-7.01 0-3.217.653-5.674 2.031-7.408 1.377-1.554 3.335-2.421 5.946-2.421Zm0 1.554c-2.067 0-3.59.722-4.641 2.168-1.015 1.409-1.523 3.469-1.523 6.215 0 5.276 2.067 7.913 6.2 7.913 2.139 0 3.662-.614 4.641-1.842 1.015-1.23 1.486-3.253 1.486-6.071v-.29c0-2.89-.471-4.95-1.486-6.178-.943-1.301-2.502-1.915-4.677-1.915ZM172.6 27.354c-2.719 0-4.822-.831-6.381-2.53-1.523-1.662-2.285-4.01-2.285-7.01 0-2.999.725-5.384 2.212-7.154 1.487-1.807 3.444-2.71 5.946-2.71 2.176 0 3.952.758 5.185 2.276 1.305 1.518 1.922 3.614 1.922 6.251v1.374h-13.488c.036 2.565.616 4.516 1.813 5.89 1.196 1.373 2.864 1.987 5.076 1.987 1.051 0 2.03-.072 2.828-.217.58-.108 1.269-.289 2.103-.578.471-.18.979.18.979.687 0 .289-.182.578-.472.686-.87.361-1.704.578-2.465.723-.907.253-1.885.325-2.973.325Zm-.508-17.85c-1.813 0-3.263.578-4.351 1.77-1.087 1.156-1.704 2.89-1.921 5.095h11.602c0-2.132-.471-3.866-1.414-5.059-.943-1.192-2.248-1.807-3.916-1.807Zm26.25 17.525a.819.819 0 0 1-.833-.831v-11.31c0-1.88-.399-3.253-1.161-4.084-.834-.83-2.03-1.3-3.698-1.3-2.248 0-3.879.542-4.895 1.698-1.015 1.12-1.595 2.963-1.595 5.456v9.467a.82.82 0 0 1-.834.832.82.82 0 0 1-.834-.832V9.107c0-.434.326-.759.762-.759.398 0 .688.29.761.65l.218 1.88h.108c1.233-1.952 3.372-2.927 6.49-2.927 4.242 0 6.382 2.276 6.382 6.83v11.345c-.037.506-.435.904-.871.904ZM61.979 0c-1.704 0-3.082 1.3-3.082 2.927v.289c0 1.59 1.414 2.927 3.082 2.927s3.082-1.337 3.082-2.927v-.253C65.061 1.301 63.647 0 61.979 0Z" clip-rule="evenodd"/><path d="M22.01 17.055V4.135h-9.063v22.954c1.605-.848 3.041-1.77 4.31-2.766 3.169-2.476 4.753-4.899 4.753-7.268Zm3.884-15.504v15.504a9.255 9.255 0 0 1-.677 3.442 12.83 12.83 0 0 1-1.68 3.029 18.707 18.707 0 0 1-2.386 2.574 27.775 27.775 0 0 1-2.56 2.079 32.22 32.22 0 0 1-2.448 1.565c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.86 22.86 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.21 32.21 0 0 1-2.448-1.564 27.763 27.763 0 0 1-2.56-2.08 18.705 18.705 0 0 1-2.386-2.573 12.83 12.83 0 0 1-1.68-3.029A9.255 9.255 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642c.257-.256.56-.384.91-.384H24.6c.35 0 .654.128.91.384s.384.559.384.909ZM195.307 44.875v-7.739h1.118l.088 1.413a2.7 2.7 0 0 1 .691-.883 2.854 2.854 0 0 1 1.03-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.294 0-.579.039-.853.117a2.168 2.168 0 0 0-.75.383 1.81 1.81 0 0 0-.515.72c-.128.305-.192.687-.192 1.148v4.252h-1.235ZM190.181 45.051c-.686 0-1.294-.166-1.824-.5-.53-.334-.946-.804-1.25-1.412-.295-.608-.442-1.32-.442-2.133 0-.815.147-1.526.442-2.134.304-.608.72-1.078 1.25-1.412.539-.333 1.157-.5 1.854-.5.745 0 1.368.167 1.868.5.5.334.878.78 1.133 1.339.255.559.382 1.172.382 1.839v.294c0 .098-.005.216-.015.353h-5.987v-.956h4.796c-.02-.755-.24-1.33-.662-1.721-.412-.402-.927-.603-1.545-.603-.412 0-.794.102-1.147.308a2.21 2.21 0 0 0-.839.883c-.216.392-.324.883-.324 1.471v.412c0 .647.108 1.192.324 1.633.216.432.495.755.839.971.353.216.735.324 1.147.324.549 0 .981-.103 1.295-.31.314-.215.544-.52.691-.911h1.221a2.944 2.944 0 0 1-.618 1.162 2.933 2.933 0 0 1-1.088.809c-.432.196-.932.294-1.501.294ZM181.83 48.288c-.696 0-1.309-.089-1.839-.265-.52-.167-.927-.427-1.221-.78-.284-.353-.426-.79-.426-1.31 0-.244.044-.5.132-.764.098-.265.26-.52.485-.765.236-.245.564-.466.986-.662l.942.5c-.559.216-.922.466-1.089.75-.167.285-.25.56-.25.824 0 .324.093.593.279.81.196.215.466.377.809.485.344.108.741.162 1.192.162.441 0 .819-.06 1.133-.177.324-.108.569-.27.735-.485.177-.206.265-.452.265-.736 0-.412-.132-.736-.397-.97-.265-.227-.78-.359-1.545-.398a14.968 14.968 0 0 1-1.5-.162 6.937 6.937 0 0 1-1.001-.235 3.324 3.324 0 0 1-.647-.324 4.326 4.326 0 0 1-.456-.368v-.338l1.456-1.398 1.163.383-1.589 1.31.191-.56c.108.079.211.152.309.22.098.07.231.133.397.192a7 7 0 0 0 .721.147c.314.05.726.093 1.236.133.706.049 1.27.166 1.692.353.421.186.725.446.912.78.186.323.279.72.279 1.19 0 .413-.117.805-.353 1.178-.225.372-.588.676-1.088.912-.491.245-1.128.368-1.913.368Zm-.015-5.826c-.627 0-1.162-.118-1.603-.353a2.507 2.507 0 0 1-.986-.986 2.953 2.953 0 0 1-.338-1.412c0-.52.113-.986.338-1.398.236-.412.569-.74 1.001-.985.441-.245.971-.368 1.588-.368.638 0 1.172.123 1.604.368.431.245.76.573.986.985.225.412.338.878.338 1.398 0 .52-.113.99-.338 1.412-.226.412-.555.74-.986.986-.432.235-.966.353-1.604.353Zm0-1.015c.55 0 .976-.142 1.28-.427.304-.294.456-.73.456-1.309s-.152-1.01-.456-1.295c-.304-.284-.73-.426-1.28-.426-.519 0-.946.142-1.28.426-.323.285-.485.716-.485 1.295s.157 1.015.471 1.31c.323.284.755.426 1.294.426Zm1.295-3.266-.368-1.044h3.031v.926l-2.663.118ZM173.109 45.051c-.588 0-1.078-.108-1.471-.324a2.245 2.245 0 0 1-.882-.882 2.513 2.513 0 0 1-.295-1.192c0-.51.128-.941.383-1.294.265-.363.633-.638 1.103-.824.471-.186 1.02-.28 1.648-.28h1.927c0-.5-.059-.917-.176-1.25-.118-.334-.309-.584-.574-.75-.265-.167-.618-.25-1.059-.25-.442 0-.819.112-1.133.338-.314.216-.51.54-.589.97h-1.265c.059-.51.231-.936.515-1.28a2.643 2.643 0 0 1 1.074-.794c.441-.186.907-.279 1.398-.279.696 0 1.27.127 1.721.383a2.29 2.29 0 0 1 1 1.044c.216.441.324.966.324 1.574v4.914h-1.103l-.074-1.324a2.743 2.743 0 0 1-.383.588 2.452 2.452 0 0 1-.529.47 2.586 2.586 0 0 1-.706.325c-.255.078-.54.117-.854.117Zm.177-1.044c.324 0 .623-.074.897-.221.275-.147.51-.343.707-.588.205-.255.362-.54.47-.854.108-.313.162-.642.162-.985v-.148h-1.824c-.461 0-.839.06-1.133.177-.284.118-.49.285-.618.5a1.318 1.318 0 0 0-.191.706c0 .285.059.535.177.75.117.207.289.368.514.486.236.118.515.177.839.177ZM162.192 44.875v-7.739h1.118l.059 1.221c.225-.44.549-.784.971-1.03.431-.244.926-.367 1.486-.367.568 0 1.064.108 1.485.324.422.215.751.544.986.985.235.442.353 1 .353 1.677v4.929h-1.236v-4.796c0-.687-.171-1.202-.515-1.545-.333-.343-.784-.515-1.353-.515-.382 0-.736.093-1.059.28a1.96 1.96 0 0 0-.78.794c-.186.353-.279.785-.279 1.295v4.487h-1.236ZM156.502 45.051c-.589 0-1.079-.108-1.471-.324a2.241 2.241 0 0 1-.883-.882 2.523 2.523 0 0 1-.294-1.192c0-.51.127-.941.382-1.294.265-.363.633-.638 1.104-.824.47-.186 1.02-.28 1.647-.28h1.927c0-.5-.058-.917-.176-1.25-.118-.334-.309-.584-.574-.75-.265-.167-.618-.25-1.059-.25-.441 0-.819.112-1.133.338-.314.216-.51.54-.588.97h-1.265c.058-.51.23-.936.514-1.28a2.643 2.643 0 0 1 1.074-.794c.442-.186.908-.279 1.398-.279.696 0 1.27.127 1.721.383.451.245.785.593 1.001 1.044.215.441.323.966.323 1.574v4.914h-1.103l-.074-1.324a2.738 2.738 0 0 1-.382.588 2.457 2.457 0 0 1-.53.47 2.586 2.586 0 0 1-.706.325 2.89 2.89 0 0 1-.853.117Zm.176-1.044c.324 0 .623-.074.898-.221a2.27 2.27 0 0 0 .706-.588c.206-.255.363-.54.471-.854.108-.313.161-.642.161-.985v-.148h-1.824c-.461 0-.838.06-1.133.177-.284.118-.49.285-.617.5a1.31 1.31 0 0 0-.192.706c0 .285.059.535.177.75.118.207.289.368.515.486.235.118.515.177.838.177ZM142.038 44.875V34.577h1.441l3.502 7.253 3.472-7.253h1.456v10.298h-1.236v-8.077l-3.236 6.723h-.927l-3.237-6.664v8.018h-1.235ZM133.309 45.051c-.697 0-1.275-.103-1.736-.309-.451-.215-.795-.51-1.03-.882a3.064 3.064 0 0 1-.427-1.324h1.266c.039.264.127.51.264.735.148.216.358.392.633.53.275.137.623.206 1.045.206.333 0 .617-.05.853-.147.235-.108.412-.255.529-.442.128-.186.192-.402.192-.647 0-.324-.074-.574-.221-.75-.137-.187-.343-.324-.618-.412a4.496 4.496 0 0 0-1-.22 6.687 6.687 0 0 1-1.148-.251 2.894 2.894 0 0 1-.853-.427 1.708 1.708 0 0 1-.515-.662 2.3 2.3 0 0 1-.176-.941c0-.422.112-.795.338-1.118.225-.324.544-.574.956-.75.422-.187.917-.28 1.486-.28.834 0 1.491.191 1.971.574.491.382.78.927.868 1.633h-1.221a1.209 1.209 0 0 0-.5-.854c-.284-.206-.662-.309-1.133-.309-.5 0-.877.094-1.132.28a.87.87 0 0 0-.383.736c0 .225.054.431.162.617.118.177.314.329.588.456.275.118.643.206 1.104.265.578.069 1.069.182 1.471.339.402.147.706.377.912.691.216.314.319.74.309 1.28 0 .51-.123.941-.368 1.295a2.228 2.228 0 0 1-1 .809c-.422.186-.917.28-1.486.28ZM127.538 44.875c-.441 0-.824-.069-1.147-.206a1.506 1.506 0 0 1-.75-.692c-.167-.333-.251-.78-.251-1.338V38.18h-1.353v-1.044h1.353l.162-1.928h1.074v1.927h2.192v1.045h-2.192v4.458c0 .46.093.774.28.941.186.157.515.236.985.236h.898v1.059h-1.251ZM119.656 45.051c-.687 0-1.295-.166-1.824-.5-.53-.334-.947-.804-1.251-1.412-.294-.608-.441-1.32-.441-2.133 0-.815.147-1.526.441-2.134.304-.608.721-1.078 1.251-1.412.539-.333 1.157-.5 1.853-.5.746 0 1.368.167 1.869.5.5.334.877.78 1.132 1.339.255.559.383 1.172.383 1.839v.294c0 .098-.005.216-.015.353h-5.987v-.956h4.796c-.02-.755-.241-1.33-.662-1.721-.412-.402-.927-.603-1.545-.603a2.214 2.214 0 0 0-1.986 1.192c-.216.391-.324.882-.324 1.47v.412c0 .647.108 1.192.324 1.633.216.432.495.755.838.971.353.216.736.324 1.148.324.549 0 .981-.103 1.294-.31.314-.215.545-.52.692-.911h1.221a2.97 2.97 0 0 1-.618 1.162 2.929 2.929 0 0 1-1.089.809c-.431.196-.931.294-1.5.294ZM110.99 44.875v-7.739h1.118l.088 1.413c.176-.353.407-.648.691-.883a2.854 2.854 0 0 1 1.03-.53 5.031 5.031 0 0 1 1.383-.176v1.295h-.765c-.294 0-.579.039-.853.117a2.182 2.182 0 0 0-.751.383 1.818 1.818 0 0 0-.514.72c-.128.305-.192.687-.192 1.148v4.252h-1.235ZM105.838 45.051c-.706 0-1.333-.166-1.883-.5a3.58 3.58 0 0 1-1.294-1.427c-.314-.608-.471-1.314-.471-2.118 0-.815.157-1.52.471-2.119a3.475 3.475 0 0 1 1.294-1.412c.55-.343 1.177-.515 1.883-.515.883 0 1.619.235 2.207.706.598.47.981 1.104 1.148 1.898h-1.266c-.107-.49-.358-.868-.75-1.133-.382-.274-.834-.412-1.353-.412-.451 0-.858.113-1.221.339-.353.225-.633.559-.839 1-.206.441-.309.99-.309 1.648 0 .49.059.926.177 1.309.117.373.279.686.485.941.216.246.466.432.75.56.295.127.613.19.957.19.353 0 .672-.058.956-.176.294-.127.539-.309.735-.544.206-.236.344-.515.412-.839h1.266a3.113 3.113 0 0 1-1.148 1.883c-.598.48-1.334.721-2.207.721ZM97.373 45.051c-.686 0-1.294-.166-1.824-.5-.53-.334-.946-.804-1.25-1.412-.295-.608-.442-1.32-.442-2.133 0-.815.147-1.526.442-2.134.304-.608.72-1.078 1.25-1.412.54-.333 1.157-.5 1.854-.5.745 0 1.368.167 1.868.5.5.334.878.78 1.133 1.339.255.559.382 1.172.382 1.839v.294a4.9 4.9 0 0 1-.014.353h-5.988v-.956h4.796c-.02-.755-.24-1.33-.662-1.721-.412-.402-.927-.603-1.545-.603a2.213 2.213 0 0 0-1.986 1.192c-.215.391-.323.882-.323 1.47v.412c0 .647.108 1.192.323 1.633.216.432.496.755.839.971a2.16 2.16 0 0 0 1.147.324c.55 0 .981-.103 1.295-.31.314-.215.544-.52.691-.911h1.221a2.95 2.95 0 0 1-.617 1.162 2.936 2.936 0 0 1-1.089.809c-.432.196-.932.294-1.5.294ZM88.93 45.051c-.755 0-1.412-.137-1.971-.412a3.079 3.079 0 0 1-1.295-1.147c-.304-.49-.456-1.06-.456-1.707h1.295c0 .403.093.775.28 1.118.186.334.455.604.808.81.363.196.81.294 1.339.294.461 0 .853-.074 1.177-.22.333-.158.584-.369.75-.633.177-.265.265-.564.265-.898 0-.373-.083-.681-.25-.927a1.751 1.751 0 0 0-.662-.618 5.415 5.415 0 0 0-.986-.44c-.372-.128-.775-.26-1.206-.398-.863-.275-1.49-.618-1.883-1.03-.383-.422-.574-.961-.574-1.618 0-.56.128-1.05.383-1.471.264-.422.637-.75 1.118-.986.49-.245 1.069-.368 1.736-.368.657 0 1.226.123 1.706.368.49.245.873.584 1.148 1.015.274.422.412.912.412 1.471h-1.295c0-.284-.074-.564-.22-.838a1.725 1.725 0 0 0-.677-.677c-.295-.186-.667-.28-1.118-.28a2.199 2.199 0 0 0-1 .192 1.58 1.58 0 0 0-.678.559c-.156.245-.235.544-.235.897 0 .334.069.603.206.81.147.205.353.382.618.529.274.137.593.265.956.382.363.118.765.25 1.206.398a5.9 5.9 0 0 1 1.324.617c.393.236.697.54.913.913.225.372.338.848.338 1.427 0 .49-.133.956-.397 1.397-.255.432-.638.785-1.148 1.06-.51.274-1.152.411-1.927.411Z"/></g><defs><clipPath id="a"><path class="tw-fill-text-alt2" d="M0 0h200v48.819H0z"/></clipPath></defs></svg>
diff --git a/libs/vault/src/icons/secure-devices.ts b/libs/assets/src/svg/svgs/secure-devices.ts
similarity index 97%
rename from libs/vault/src/icons/secure-devices.ts
rename to libs/assets/src/svg/svgs/secure-devices.ts
index 4e123afad40..ed216f1bc87 100644
--- a/libs/vault/src/icons/secure-devices.ts
+++ b/libs/assets/src/svg/svgs/secure-devices.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const SecureDevices = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="none">
diff --git a/libs/vault/src/icons/secure-user.ts b/libs/assets/src/svg/svgs/secure-user.ts
similarity index 98%
rename from libs/vault/src/icons/secure-user.ts
rename to libs/assets/src/svg/svgs/secure-user.ts
index 39d9957030c..8684549a815 100644
--- a/libs/vault/src/icons/secure-user.ts
+++ b/libs/assets/src/svg/svgs/secure-user.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const SecureUser = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="none">
diff --git a/libs/vault/src/icons/security-handshake.ts b/libs/assets/src/svg/svgs/security-handshake.ts
similarity index 99%
rename from libs/vault/src/icons/security-handshake.ts
rename to libs/assets/src/svg/svgs/security-handshake.ts
index d68f8a948d3..f6309bc4c54 100644
--- a/libs/vault/src/icons/security-handshake.ts
+++ b/libs/assets/src/svg/svgs/security-handshake.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const SecurityHandshake = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" width="150" height="150" fill="none">
diff --git a/libs/components/src/icon/icons/security.ts b/libs/assets/src/svg/svgs/security.ts
similarity index 99%
rename from libs/components/src/icon/icons/security.ts
rename to libs/assets/src/svg/svgs/security.ts
index 5732b8066c6..0edf0aec14f 100644
--- a/libs/components/src/icon/icons/security.ts
+++ b/libs/assets/src/svg/svgs/security.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const Security = svgIcon`
 <svg width="96" height="96" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/components/src/icon/icons/send.ts b/libs/assets/src/svg/svgs/send.ts
similarity index 97%
rename from libs/components/src/icon/icons/send.ts
rename to libs/assets/src/svg/svgs/send.ts
index 19026fc74cc..f09f59a5388 100644
--- a/libs/components/src/icon/icons/send.ts
+++ b/libs/assets/src/svg/svgs/send.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const SendInactive = svgIcon`
   <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/components/src/icon/icons/settings.ts b/libs/assets/src/svg/svgs/settings.ts
similarity index 99%
rename from libs/components/src/icon/icons/settings.ts
rename to libs/assets/src/svg/svgs/settings.ts
index 361999bc244..3b54bbbd88c 100644
--- a/libs/components/src/icon/icons/settings.ts
+++ b/libs/assets/src/svg/svgs/settings.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const SettingsInactive = svgIcon`
   <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/components/src/icon/logos/bitwarden/shield.ts b/libs/assets/src/svg/svgs/shield.ts
similarity index 98%
rename from libs/components/src/icon/logos/bitwarden/shield.ts
rename to libs/assets/src/svg/svgs/shield.ts
index d736a44ba3e..57a92e66e82 100644
--- a/libs/components/src/icon/logos/bitwarden/shield.ts
+++ b/libs/assets/src/svg/svgs/shield.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../../icon";
+import { svgIcon } from "../icon-service";
 
 /**
  * Shield logo with extra space in the viewbox.
diff --git a/libs/auth/src/angular/icons/sso-key.icon.ts b/libs/assets/src/svg/svgs/sso-key.icon.ts
similarity index 92%
rename from libs/auth/src/angular/icons/sso-key.icon.ts
rename to libs/assets/src/svg/svgs/sso-key.icon.ts
index e00c3555906..533c033feac 100644
--- a/libs/auth/src/angular/icons/sso-key.icon.ts
+++ b/libs/assets/src/svg/svgs/sso-key.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const SsoKeyIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 120 100">
diff --git a/apps/web/src/app/billing/organizations/icons/subscription-hidden.icon.ts b/libs/assets/src/svg/svgs/subscription-hidden.ts
similarity index 99%
rename from apps/web/src/app/billing/organizations/icons/subscription-hidden.icon.ts
rename to libs/assets/src/svg/svgs/subscription-hidden.ts
index 82490e82a1d..38840580f86 100644
--- a/apps/web/src/app/billing/organizations/icons/subscription-hidden.icon.ts
+++ b/libs/assets/src/svg/svgs/subscription-hidden.ts
@@ -1,6 +1,6 @@
-import { Icon, svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
-export const SubscriptionHiddenIcon: Icon = svgIcon`
+export const SubscriptionHiddenIcon = svgIcon`
 <svg width="216" height="231" viewBox="0 0 216 231" fill="none" xmlns="http://www.w3.org/2000/svg">
   <path d="M133.356 85.6618C133.136 85.43 132.871 85.2457 132.577 85.1198C132.283 84.9939 131.968 84.93 131.648 84.9318H87.8482C87.5289 84.93 87.2113 84.9939 86.9175 85.1198C86.6237 85.2457 86.359 85.43 86.14 85.6618C85.9083 85.8808 85.7239 86.1473 85.598 86.4411C85.4721 86.7349 85.4082 87.0506 85.41 87.37V116.57C85.4192 118.793 85.8499 120.994 86.6802 123.056C87.4705 125.091 88.5326 127.011 89.8375 128.761C91.1789 130.515 92.6808 132.137 94.3233 133.612C95.8472 135.01 97.4532 136.318 99.1304 137.528C100.59 138.565 102.123 139.547 103.729 140.474C105.335 141.401 106.469 142.027 107.131 142.354C107.799 142.682 108.339 142.941 108.741 143.113C109.055 143.264 109.4 143.339 109.748 143.332C110.091 143.337 110.431 143.257 110.737 143.102C111.146 142.923 111.679 142.671 112.354 142.343C113.03 142.014 114.179 141.386 115.756 140.463C117.333 139.539 118.884 138.554 120.355 137.517C122.034 136.306 123.642 134.999 125.169 133.601C126.814 132.128 128.316 130.504 129.655 128.75C130.958 126.998 132.021 125.08 132.813 123.045C133.645 120.983 134.075 118.782 134.083 116.559V87.3591C134.085 87.0415 134.021 86.7276 133.895 86.4356C133.769 86.1436 133.586 85.8808 133.356 85.6618ZM127.71 116.836C127.71 127.421 109.748 136.514 109.748 136.514V91.1879H127.71V116.836Z" fill="rgb(var(--color-secondary-700))"/>
   <path d="M24.6216 122.3C24.7144 123.4 25.6819 124.217 26.7825 124.125C27.8832 124.032 28.7002 123.064 28.6074 121.964L24.6216 122.3ZM151.501 45.7445C152.57 45.4679 153.213 44.3768 152.936 43.3074L148.429 25.8809C148.152 24.8115 147.061 24.1688 145.992 24.4454C144.922 24.722 144.28 25.8131 144.556 26.8825L148.563 42.3728L133.073 46.3793C132.003 46.6559 131.361 47.747 131.637 48.8164C131.914 49.8858 133.005 50.5285 134.074 50.2519L151.501 45.7445ZM28.6074 121.964C26.6788 99.0874 34.4658 75.5543 51.9661 58.054L49.1377 55.2256C30.7695 73.5938 22.5982 98.2999 24.6216 122.3L28.6074 121.964ZM51.9661 58.054C78.5404 31.4797 119.036 27.3026 149.985 45.5315L152.015 42.0849C119.534 22.9534 77.0327 27.3306 49.1377 55.2256L51.9661 58.054Z" fill="rgb(var(--color-secondary-700))"/>
diff --git a/libs/angular/src/auth/icons/totp.icon.ts b/libs/assets/src/svg/svgs/totp.icon.ts
similarity index 98%
rename from libs/angular/src/auth/icons/totp.icon.ts
rename to libs/assets/src/svg/svgs/totp.icon.ts
index 1754e77b308..00e96c93b6f 100644
--- a/libs/angular/src/auth/icons/totp.icon.ts
+++ b/libs/assets/src/svg/svgs/totp.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const TOTPIcon = svgIcon`
 <svg
diff --git a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-authenticator.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-authenticator.icon.ts
similarity index 96%
rename from libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-authenticator.icon.ts
rename to libs/assets/src/svg/svgs/two-factor-auth-authenticator.icon.ts
index 4961e7207cb..1e6b40898c8 100644
--- a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-authenticator.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-authenticator.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthAuthenticatorIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
diff --git a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-duo.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-duo.icon.ts
similarity index 81%
rename from libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-duo.icon.ts
rename to libs/assets/src/svg/svgs/two-factor-auth-duo.icon.ts
index a64027c5fba..d56e3b325d1 100644
--- a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-duo.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-duo.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthDuoIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 40">
diff --git a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-email.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-email.icon.ts
similarity index 90%
rename from libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-email.icon.ts
rename to libs/assets/src/svg/svgs/two-factor-auth-email.icon.ts
index 380bc16a738..71ffc099e58 100644
--- a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-email.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-email.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthEmailIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
diff --git a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-security-key.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-security-key.icon.ts
similarity index 96%
rename from libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-security-key.icon.ts
rename to libs/assets/src/svg/svgs/two-factor-auth-security-key.icon.ts
index 573dc890428..644f98a0cbd 100644
--- a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-security-key.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-security-key.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthSecurityKeyIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
diff --git a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-webauthn.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-webauthn.icon.ts
similarity index 96%
rename from libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-webauthn.icon.ts
rename to libs/assets/src/svg/svgs/two-factor-auth-webauthn.icon.ts
index ff73bf2e255..f5e7519e024 100644
--- a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-webauthn.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-webauthn.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthWebAuthnIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
diff --git a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-yubico.icon.ts b/libs/assets/src/svg/svgs/two-factor-auth-yubico.icon.ts
similarity index 93%
rename from libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-yubico.icon.ts
rename to libs/assets/src/svg/svgs/two-factor-auth-yubico.icon.ts
index 8f6dca837ad..231b3c3f5b1 100644
--- a/libs/auth/src/angular/icons/two-factor-auth/two-factor-auth-yubico.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-auth-yubico.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const TwoFactorAuthYubicoIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 121 33">
diff --git a/libs/auth/src/angular/icons/two-factor-timeout.icon.ts b/libs/assets/src/svg/svgs/two-factor-timeout.icon.ts
similarity index 88%
rename from libs/auth/src/angular/icons/two-factor-timeout.icon.ts
rename to libs/assets/src/svg/svgs/two-factor-timeout.icon.ts
index 3681670c124..7a5e04c07a3 100644
--- a/libs/auth/src/angular/icons/two-factor-timeout.icon.ts
+++ b/libs/assets/src/svg/svgs/two-factor-timeout.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const TwoFactorTimeoutIcon = svgIcon`
 <svg viewBox="0 0 120 101" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/auth/src/angular/icons/user-lock.icon.ts b/libs/assets/src/svg/svgs/user-lock.icon.ts
similarity index 95%
rename from libs/auth/src/angular/icons/user-lock.icon.ts
rename to libs/assets/src/svg/svgs/user-lock.icon.ts
index bc4fdd9e268..ad56d612268 100644
--- a/libs/auth/src/angular/icons/user-lock.icon.ts
+++ b/libs/assets/src/svg/svgs/user-lock.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const UserLockIcon = svgIcon`
   <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
diff --git a/libs/auth/src/angular/icons/user-verification-biometrics-fingerprint.icon.ts b/libs/assets/src/svg/svgs/user-verification-biometrics-fingerprint.icon.ts
similarity index 92%
rename from libs/auth/src/angular/icons/user-verification-biometrics-fingerprint.icon.ts
rename to libs/assets/src/svg/svgs/user-verification-biometrics-fingerprint.icon.ts
index e329d889574..b3ace19a93d 100644
--- a/libs/auth/src/angular/icons/user-verification-biometrics-fingerprint.icon.ts
+++ b/libs/assets/src/svg/svgs/user-verification-biometrics-fingerprint.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const UserVerificationBiometricsIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" width="63" height="65" fill="none">
diff --git a/libs/vault/src/icons/vault.ts b/libs/assets/src/svg/svgs/vault-open.ts
similarity index 98%
rename from libs/vault/src/icons/vault.ts
rename to libs/assets/src/svg/svgs/vault-open.ts
index 577080b0f37..e644e316c05 100644
--- a/libs/vault/src/icons/vault.ts
+++ b/libs/assets/src/svg/svgs/vault-open.ts
@@ -1,6 +1,6 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
-export const Vault = svgIcon`
+export const VaultOpen = svgIcon`
 <svg fill="none" width="100" height="90" viewBox="0 0 100 90" xmlns="http://www.w3.org/2000/svg">
 <g>
 <path d="m73.446 81.044h17.001v3.4685c0 2.7615-2.2385 5-5 5h-7.0011c-2.7615 0-5-2.2385-5-5v-3.4685zm2 2v1.4685c0 1.6569 1.3431 3 3 3h7.0011c1.6569 0 3-1.3431 3-3v-1.4685h-13.001z" clip-rule="evenodd" class="tw-fill-art-accent" fill-rule="evenodd"/>
diff --git a/libs/auth/src/angular/icons/vault.icon.ts b/libs/assets/src/svg/svgs/vault.icon.ts
similarity index 92%
rename from libs/auth/src/angular/icons/vault.icon.ts
rename to libs/assets/src/svg/svgs/vault.icon.ts
index a341bcd99f5..21fcac24e7e 100644
--- a/libs/auth/src/angular/icons/vault.icon.ts
+++ b/libs/assets/src/svg/svgs/vault.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const VaultIcon = svgIcon`
   <svg viewBox="0 0 120 100" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/components/src/icon/icons/vault.ts b/libs/assets/src/svg/svgs/vault.ts
similarity index 99%
rename from libs/components/src/icon/icons/vault.ts
rename to libs/assets/src/svg/svgs/vault.ts
index eda2e3d6b60..1c699f2ba8e 100644
--- a/libs/components/src/icon/icons/vault.ts
+++ b/libs/assets/src/svg/svgs/vault.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "../icon";
+import { svgIcon } from "../icon-service";
 
 export const VaultInactive = svgIcon`
   <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/libs/auth/src/angular/icons/wave.icon.ts b/libs/assets/src/svg/svgs/wave.icon.ts
similarity index 90%
rename from libs/auth/src/angular/icons/wave.icon.ts
rename to libs/assets/src/svg/svgs/wave.icon.ts
index 5629c43fc8d..b7e16213d0f 100644
--- a/libs/auth/src/angular/icons/wave.icon.ts
+++ b/libs/assets/src/svg/svgs/wave.icon.ts
@@ -1,6 +1,4 @@
-// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
-// eslint-disable-next-line no-restricted-imports
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const WaveIcon = svgIcon`
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 120 100">
diff --git a/libs/angular/src/auth/icons/webauthn.icon.ts b/libs/assets/src/svg/svgs/webauthn.icon.ts
similarity index 96%
rename from libs/angular/src/auth/icons/webauthn.icon.ts
rename to libs/assets/src/svg/svgs/webauthn.icon.ts
index a72692233d8..c679438106c 100644
--- a/libs/angular/src/auth/icons/webauthn.icon.ts
+++ b/libs/assets/src/svg/svgs/webauthn.icon.ts
@@ -1,4 +1,4 @@
-import { svgIcon } from "@bitwarden/components";
+import { svgIcon } from "../icon-service";
 
 export const WebAuthnIcon = svgIcon`
  <svg
diff --git a/libs/assets/tsconfig.eslint.json b/libs/assets/tsconfig.eslint.json
new file mode 100644
index 00000000000..3daf120441a
--- /dev/null
+++ b/libs/assets/tsconfig.eslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": ["src/**/*.ts", "src/**/*.js"],
+  "exclude": ["**/build", "**/dist"]
+}
diff --git a/libs/assets/tsconfig.json b/libs/assets/tsconfig.json
new file mode 100644
index 00000000000..62ebbd94647
--- /dev/null
+++ b/libs/assets/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/libs/assets/tsconfig.lib.json b/libs/assets/tsconfig.lib.json
new file mode 100644
index 00000000000..9cbf6736007
--- /dev/null
+++ b/libs/assets/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.js", "src/**/*.spec.ts"]
+}
diff --git a/libs/assets/tsconfig.spec.json b/libs/assets/tsconfig.spec.json
new file mode 100644
index 00000000000..1275f148a18
--- /dev/null
+++ b/libs/assets/tsconfig.spec.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "moduleResolution": "node10",
+    "types": ["jest", "node"]
+  },
+  "include": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/libs/auth/src/angular/icons/index.ts b/libs/auth/src/angular/icons/index.ts
deleted file mode 100644
index 078e7f764c5..00000000000
--- a/libs/auth/src/angular/icons/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export * from "./devices.icon";
-export * from "./user-lock.icon";
-export * from "./user-verification-biometrics-fingerprint.icon";
-export * from "./wave.icon";
-export * from "./vault.icon";
-export * from "./registration-user-add.icon";
-export * from "./registration-lock-alt.icon";
-export * from "./registration-expired-link.icon";
-export * from "./sso-key.icon";
-export * from "./two-factor-timeout.icon";
-export * from "./device-verification.icon";
diff --git a/libs/auth/src/angular/icons/two-factor-auth/index.ts b/libs/auth/src/angular/icons/two-factor-auth/index.ts
deleted file mode 100644
index d5ac187a5b9..00000000000
--- a/libs/auth/src/angular/icons/two-factor-auth/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from "./two-factor-auth-authenticator.icon";
-export * from "./two-factor-auth-email.icon";
-export * from "./two-factor-auth-webauthn.icon";
-export * from "./two-factor-auth-security-key.icon";
-export * from "./two-factor-auth-duo.icon";
-export * from "./two-factor-auth-yubico.icon";
diff --git a/libs/auth/src/angular/index.ts b/libs/auth/src/angular/index.ts
index f8e93932511..fdd06509511 100644
--- a/libs/auth/src/angular/index.ts
+++ b/libs/auth/src/angular/index.ts
@@ -5,9 +5,6 @@
 // fingerprint dialog
 export * from "./fingerprint-dialog/fingerprint-dialog.component";
 
-// icons
-export * from "./icons";
-
 // input password
 export * from "./input-password/input-password.component";
 export * from "./input-password/password-input-result";
diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts
index f2954933bc6..546bb13e883 100644
--- a/libs/auth/src/angular/login/login.component.ts
+++ b/libs/auth/src/angular/login/login.component.ts
@@ -5,6 +5,7 @@ import { ActivatedRoute, Router, RouterModule } from "@angular/router";
 import { firstValueFrom, Subject, take, takeUntil } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { VaultIcon, WaveIcon } from "@bitwarden/assets/svg";
 import {
   LoginEmailServiceAbstraction,
   LoginStrategyServiceAbstraction,
@@ -44,8 +45,6 @@ import {
   ToastService,
 } from "@bitwarden/components";
 
-import { VaultIcon, WaveIcon } from "../icons";
-
 import { LoginComponentService, PasswordPolicies } from "./login-component.service";
 
 const BroadcasterSubscriptionId = "LoginComponent";
diff --git a/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts b/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts
index f98b711aeb8..d4267dba1e4 100644
--- a/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts
+++ b/libs/auth/src/angular/registration/registration-link-expired/registration-link-expired.component.ts
@@ -6,12 +6,11 @@ import { ActivatedRoute, RouterModule } from "@angular/router";
 import { Subject, firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { RegistrationExpiredLinkIcon } from "@bitwarden/assets/svg";
 // This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
 // eslint-disable-next-line no-restricted-imports
 import { ButtonModule, IconModule } from "@bitwarden/components";
 
-import { RegistrationExpiredLinkIcon } from "../../icons/registration-expired-link.icon";
-
 /**
  * RegistrationLinkExpiredComponentData
  * @loginRoute: string - The client specific route to the login page - configured at the app-routing.module level.
diff --git a/libs/auth/src/angular/registration/registration-start/registration-start.component.ts b/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
index 2545f86f665..98257de500a 100644
--- a/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
+++ b/libs/auth/src/angular/registration/registration-start/registration-start.component.ts
@@ -7,6 +7,7 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { Subject, takeUntil } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { RegistrationCheckEmailIcon, RegistrationUserAddIcon } from "@bitwarden/assets/svg";
 import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service";
 import { RegisterSendVerificationEmailRequest } from "@bitwarden/common/auth/models/request/registration/register-send-verification-email.request";
 import { RegionConfig, Region } from "@bitwarden/common/platform/abstractions/environment.service";
@@ -19,13 +20,11 @@ import {
   ButtonModule,
   CheckboxModule,
   FormFieldModule,
-  Icons,
   IconModule,
   LinkModule,
 } from "@bitwarden/components";
 
 import { LoginEmailService } from "../../../common";
-import { RegistrationUserAddIcon } from "../../icons";
 import { RegistrationEnvSelectorComponent } from "../registration-env-selector/registration-env-selector.component";
 
 // FIXME: update to use a const object instead of a typescript enum
@@ -170,7 +169,7 @@ export class RegistrationStartComponent implements OnInit, OnDestroy {
       pageTitle: {
         key: "checkYourEmail",
       },
-      pageIcon: Icons.RegistrationCheckEmailIcon,
+      pageIcon: RegistrationCheckEmailIcon,
     });
     this.registrationStartStateChange.emit(this.state);
   };
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts b/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts
index 07746cf6479..035598b873b 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-auth.component.ts
@@ -15,6 +15,13 @@ import { lastValueFrom, firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
+import {
+  TwoFactorAuthAuthenticatorIcon,
+  TwoFactorAuthEmailIcon,
+  TwoFactorAuthWebAuthnIcon,
+  TwoFactorAuthSecurityKeyIcon,
+  TwoFactorAuthDuoIcon,
+} from "@bitwarden/assets/svg";
 import {
   LoginStrategyServiceAbstraction,
   UserDecryptionOptionsServiceAbstraction,
@@ -49,14 +56,6 @@ import {
   ToastService,
 } from "@bitwarden/components";
 
-import {
-  TwoFactorAuthAuthenticatorIcon,
-  TwoFactorAuthEmailIcon,
-  TwoFactorAuthWebAuthnIcon,
-  TwoFactorAuthSecurityKeyIcon,
-  TwoFactorAuthDuoIcon,
-} from "../icons/two-factor-auth";
-
 import { TwoFactorAuthAuthenticatorComponent } from "./child-components/two-factor-auth-authenticator/two-factor-auth-authenticator.component";
 import { TwoFactorAuthDuoComponent } from "./child-components/two-factor-auth-duo/two-factor-auth-duo.component";
 import { TwoFactorAuthEmailComponent } from "./child-components/two-factor-auth-email/two-factor-auth-email.component";
diff --git a/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts b/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts
index 4a5d6dfedf2..7e7e02e5e5a 100644
--- a/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts
+++ b/libs/auth/src/angular/two-factor-auth/two-factor-options.component.ts
@@ -2,6 +2,13 @@ import { CommonModule } from "@angular/common";
 import { Component, OnInit } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import {
+  TwoFactorAuthAuthenticatorIcon,
+  TwoFactorAuthDuoIcon,
+  TwoFactorAuthEmailIcon,
+  TwoFactorAuthWebAuthnIcon,
+  TwoFactorAuthYubicoIcon,
+} from "@bitwarden/assets/svg";
 import {
   TwoFactorProviderDetails,
   TwoFactorService,
@@ -19,14 +26,6 @@ import {
   TypographyModule,
 } from "@bitwarden/components";
 
-import {
-  TwoFactorAuthAuthenticatorIcon,
-  TwoFactorAuthDuoIcon,
-  TwoFactorAuthEmailIcon,
-  TwoFactorAuthWebAuthnIcon,
-  TwoFactorAuthYubicoIcon,
-} from "../icons/two-factor-auth";
-
 export type TwoFactorOptionsDialogResult = {
   type: TwoFactorProviderType;
 };
diff --git a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
index a14b0ef3103..e1b8207d970 100644
--- a/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
+++ b/libs/auth/src/angular/user-verification/user-verification-form-input.component.ts
@@ -13,6 +13,7 @@ import {
 import { BehaviorSubject, Subject, takeUntil } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { UserVerificationBiometricsIcon } from "@bitwarden/assets/svg";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
 import { UserVerificationOptions } from "@bitwarden/common/auth/types/user-verification-options";
@@ -31,8 +32,6 @@ import {
   LinkModule,
 } from "@bitwarden/components";
 
-import { UserVerificationBiometricsIcon } from "../icons";
-
 import { ActiveClientVerificationOption } from "./active-client-verification-option.enum";
 
 /**
diff --git a/libs/components/src/anon-layout/anon-layout-wrapper.component.ts b/libs/components/src/anon-layout/anon-layout-wrapper.component.ts
index 33b90f7eb8a..13c2e727477 100644
--- a/libs/components/src/anon-layout/anon-layout-wrapper.component.ts
+++ b/libs/components/src/anon-layout/anon-layout-wrapper.component.ts
@@ -3,10 +3,10 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ActivatedRoute, Data, NavigationEnd, Router, RouterModule } from "@angular/router";
 import { Subject, filter, of, switchMap, tap } from "rxjs";
 
+import { Icon } from "@bitwarden/assets/svg";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { Translation } from "../dialog";
-import { Icon } from "../icon";
 
 import { AnonLayoutWrapperDataService } from "./anon-layout-wrapper-data.service";
 import { AnonLayoutComponent, AnonLayoutMaxWidth } from "./anon-layout.component";
diff --git a/libs/components/src/anon-layout/anon-layout-wrapper.stories.ts b/libs/components/src/anon-layout/anon-layout-wrapper.stories.ts
index 4de7952344b..08f04eca9ff 100644
--- a/libs/components/src/anon-layout/anon-layout-wrapper.stories.ts
+++ b/libs/components/src/anon-layout/anon-layout-wrapper.stories.ts
@@ -9,6 +9,7 @@ import {
 } from "@storybook/angular";
 import { of } from "rxjs";
 
+import { LockIcon, RegistrationCheckEmailIcon } from "@bitwarden/assets/svg";
 import { ClientType } from "@bitwarden/common/enums";
 import {
   EnvironmentService,
@@ -18,7 +19,6 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
 import { ButtonModule } from "../button";
-import { LockIcon, RegistrationCheckEmailIcon } from "../icon/icons";
 import { I18nMockService } from "../utils";
 
 import { AnonLayoutWrapperDataService } from "./anon-layout-wrapper-data.service";
diff --git a/libs/components/src/anon-layout/anon-layout.component.ts b/libs/components/src/anon-layout/anon-layout.component.ts
index c70ae1a8c90..c0beb5bce56 100644
--- a/libs/components/src/anon-layout/anon-layout.component.ts
+++ b/libs/components/src/anon-layout/anon-layout.component.ts
@@ -11,18 +11,21 @@ import {
 import { RouterModule } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
+import {
+  AnonLayoutBitwardenShield,
+  BackgroundLeftIllustration,
+  BackgroundRightIllustration,
+  BitwardenLogo,
+  Icon,
+} from "@bitwarden/assets/svg";
 import { ClientType } from "@bitwarden/common/enums";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-import { IconModule, Icon } from "../icon";
-import { BitwardenLogo } from "../icon/icons";
-import { AnonLayoutBitwardenShield } from "../icon/logos";
+import { IconModule } from "../icon";
 import { SharedModule } from "../shared";
 import { TypographyModule } from "../typography";
 
-import { LeftIllustration, RightIllustration } from "./illustrations";
-
 export type AnonLayoutMaxWidth = "md" | "lg" | "xl" | "2xl" | "3xl" | "4xl";
 
 @Component({
@@ -37,8 +40,8 @@ export class AnonLayoutComponent implements OnInit, OnChanges {
     return ["tw-h-full"];
   }
 
-  readonly leftIllustration = LeftIllustration;
-  readonly rightIllustration = RightIllustration;
+  readonly leftIllustration = BackgroundLeftIllustration;
+  readonly rightIllustration = BackgroundRightIllustration;
 
   readonly title = input<string>();
   readonly subtitle = input<string>();
diff --git a/libs/components/src/anon-layout/anon-layout.mdx b/libs/components/src/anon-layout/anon-layout.mdx
index 9d40d617b0d..3c6faeccfb0 100644
--- a/libs/components/src/anon-layout/anon-layout.mdx
+++ b/libs/components/src/anon-layout/anon-layout.mdx
@@ -65,7 +65,8 @@ example) to construct the page via routable composition:
 
 ```typescript
 // File: oss-routing.module.ts
-import { AnonLayoutWrapperComponent, AnonLayoutWrapperData, LockIcon } from "@bitwarden/auth/angular";
+import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/auth/angular";
+import { LockIcon } from "@bitwarden/assets/svg";
 
 {
   path: "",
@@ -116,7 +117,8 @@ in the `AnonLayoutWrapperData` interface:
 All of these properties are optional.
 
 ```typescript
-import { AnonLayoutWrapperComponent, AnonLayoutWrapperData, LockIcon } from "@bitwarden/auth/angular";
+import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/auth/angular";
+import { LockIcon } from "@bitwarden/assets/svg";
 
 {
   // ...
@@ -137,7 +139,8 @@ on your client) as a component with `outlet: "environment-selector"`.
 
 ```javascript
 // File: oss-routing.module.ts
-import { AnonLayoutWrapperComponent, AnonLayoutWrapperData, LockIcon } from "@bitwarden/auth/angular";
+import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/auth/angular";
+
 import { EnvironmentSelectorComponent } from "./components/environment-selector/environment-selector.component";
 
 {
diff --git a/libs/components/src/anon-layout/anon-layout.stories.ts b/libs/components/src/anon-layout/anon-layout.stories.ts
index 339f76ec06b..15cce39d8b7 100644
--- a/libs/components/src/anon-layout/anon-layout.stories.ts
+++ b/libs/components/src/anon-layout/anon-layout.stories.ts
@@ -2,14 +2,13 @@ import { ActivatedRoute, RouterModule } from "@angular/router";
 import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
 import { BehaviorSubject, of } from "rxjs";
 
+import { Icon, LockIcon } from "@bitwarden/assets/svg";
 import { ClientType } from "@bitwarden/common/enums";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
 import { ButtonModule } from "../button";
-import { Icon } from "../icon";
-import { LockIcon } from "../icon/icons";
 import { I18nMockService } from "../utils/i18n-mock.service";
 
 import { AnonLayoutComponent } from "./anon-layout.component";
diff --git a/libs/components/src/anon-layout/illustrations/index.ts b/libs/components/src/anon-layout/illustrations/index.ts
deleted file mode 100644
index a107eb7cd15..00000000000
--- a/libs/components/src/anon-layout/illustrations/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./left-illustration";
-export * from "./right-illustration";
diff --git a/libs/components/src/icon/icon.component.ts b/libs/components/src/icon/icon.component.ts
index ec25ad30d56..49f284b947c 100644
--- a/libs/components/src/icon/icon.component.ts
+++ b/libs/components/src/icon/icon.component.ts
@@ -1,7 +1,7 @@
 import { Component, effect, input } from "@angular/core";
 import { DomSanitizer, SafeHtml } from "@angular/platform-browser";
 
-import { Icon, isIcon } from "./icon";
+import { Icon, isIcon } from "@bitwarden/assets/svg";
 
 @Component({
   selector: "bit-icon",
diff --git a/libs/components/src/icon/icon.components.spec.ts b/libs/components/src/icon/icon.components.spec.ts
index 76e86971587..3ae37ff5423 100644
--- a/libs/components/src/icon/icon.components.spec.ts
+++ b/libs/components/src/icon/icon.components.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { Icon, svgIcon } from "./icon";
+import { Icon, svgIcon } from "@bitwarden/assets/svg";
+
 import { BitIconComponent } from "./icon.component";
 
 describe("IconComponent", () => {
diff --git a/libs/components/src/icon/icon.mdx b/libs/components/src/icon/icon.mdx
index e4186b5e4a9..9d48a2f3c45 100644
--- a/libs/components/src/icon/icon.mdx
+++ b/libs/components/src/icon/icon.mdx
@@ -23,9 +23,10 @@ import { IconModule } from "@bitwarden/components";
      [SVG Formatter Beautifier](https://codebeautify.org/svg-formatter-beautifier) to make applying
      classes easier.
 
-2. **Rename the file** as a `<name>.icon.ts` TypeScript file.
+2. **Rename the file** as a `<name>.icon.ts` TypeScript file and place it in the `libs/assets/svg`
+   lib.
 
-3. **Import** `svgIcon` from `@bitwarden/components`.
+3. **Import** `svgIcon` from `./icon-service`.
 
 4. **Define and export** a `const` to represent your `svgIcon`.
 
@@ -74,7 +75,7 @@ import { IconModule } from "@bitwarden/components";
    [viewBox](https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/viewBox) attribute in order
    to allow the SVG to scale to fit its container.
    - **Note:** Scaling is required for any SVG used as an
-     [AnonLayout](?path=/docs/auth-anon-layout--docs) `pageIcon`.
+     [AnonLayout](?path=/docs/component-library-anon-layout--docs) `pageIcon`.
 
 7. **Import your SVG const** anywhere you want to use the SVG.
    - **Angular Component Example:**
@@ -82,8 +83,8 @@ import { IconModule } from "@bitwarden/components";
 
        ```typescript
        import { Component } from "@angular/core";
-       import { ExampleIcon } from "your/path/here";
        import { IconModule } from '@bitwarden/components';
+       import { ExampleIcon, Example2Icon } from "@bitwarden/assets/svg";
 
        @Component({
          selector: "app-example",
diff --git a/libs/components/src/icon/icon.stories.ts b/libs/components/src/icon/icon.stories.ts
index 7892bdd3ec1..e71a7597913 100644
--- a/libs/components/src/icon/icon.stories.ts
+++ b/libs/components/src/icon/icon.stories.ts
@@ -1,7 +1,8 @@
 import { Meta, StoryObj } from "@storybook/angular";
 
+import * as SvgIcons from "@bitwarden/assets/svg";
+
 import { BitIconComponent } from "./icon.component";
-import * as GenericIcons from "./icons";
 
 export default {
   title: "Component Library/Icon",
@@ -16,14 +17,18 @@ export default {
 
 type Story = StoryObj<BitIconComponent>;
 
+// Filtering out the few non-icons in the libs/assets/svg import
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { DynamicContentNotAllowedError, isIcon, svgIcon, ...Icons } = SvgIcons;
+
 export const Default: Story = {
   args: {
-    icon: GenericIcons.NoAccess,
+    icon: Icons.NoAccess,
   },
   argTypes: {
     icon: {
-      options: Object.keys(GenericIcons),
-      mapping: GenericIcons,
+      options: Object.keys(Icons),
+      mapping: Icons,
       control: { type: "select" },
     },
     ariaLabel: {
diff --git a/libs/components/src/icon/icons/index.ts b/libs/components/src/icon/icons/index.ts
deleted file mode 100644
index 69fac7d644e..00000000000
--- a/libs/components/src/icon/icons/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export * from "./bitwarden-logo.icon";
-export * from "./extension-bitwarden-logo.icon";
-export * from "./lock.icon";
-export * from "./generator";
-export * from "./no-access";
-export * from "./no-results";
-export * from "./registration-check-email.icon";
-export * from "./search";
-export * from "./security";
-export * from "./send";
-export * from "./settings";
-export * from "./vault";
diff --git a/libs/components/src/icon/index.ts b/libs/components/src/icon/index.ts
index 01819a3678e..1ee66e59837 100644
--- a/libs/components/src/icon/index.ts
+++ b/libs/components/src/icon/index.ts
@@ -1,10 +1 @@
 export * from "./icon.module";
-export * from "./icon";
-export * as Icons from "./icons";
-export {
-  AdminConsoleLogo,
-  BusinessUnitPortalLogo,
-  PasswordManagerLogo,
-  ProviderPortalLogo,
-  SecretsManagerLogo,
-} from "./logos";
diff --git a/libs/components/src/icon/logos/bitwarden/index.ts b/libs/components/src/icon/logos/bitwarden/index.ts
deleted file mode 100644
index d74c6fe453a..00000000000
--- a/libs/components/src/icon/logos/bitwarden/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { default as AdminConsoleLogo } from "./admin-console";
-export { default as BusinessUnitPortalLogo } from "./business-unit-portal";
-export * from "./shield";
-export { default as PasswordManagerLogo } from "./password-manager";
-export { default as ProviderPortalLogo } from "./provider-portal";
-export { default as SecretsManagerLogo } from "./secrets-manager";
diff --git a/libs/components/src/icon/logos/index.ts b/libs/components/src/icon/logos/index.ts
deleted file mode 100644
index 07a8a739289..00000000000
--- a/libs/components/src/icon/logos/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./bitwarden";
diff --git a/libs/components/src/navigation/nav-logo.component.ts b/libs/components/src/navigation/nav-logo.component.ts
index 52d67446f2f..96258740d74 100644
--- a/libs/components/src/navigation/nav-logo.component.ts
+++ b/libs/components/src/navigation/nav-logo.component.ts
@@ -2,9 +2,9 @@ import { CommonModule } from "@angular/common";
 import { Component, input } from "@angular/core";
 import { RouterLinkActive, RouterLink } from "@angular/router";
 
-import { Icon } from "../icon";
+import { BitwardenShield, Icon } from "@bitwarden/assets/svg";
+
 import { BitIconComponent } from "../icon/icon.component";
-import { BitwardenShield } from "../icon/logos";
 
 import { SideNavService } from "./side-nav.service";
 
diff --git a/libs/components/src/no-items/no-items.component.ts b/libs/components/src/no-items/no-items.component.ts
index 7c00999f59f..3d7394a16ae 100644
--- a/libs/components/src/no-items/no-items.component.ts
+++ b/libs/components/src/no-items/no-items.component.ts
@@ -1,6 +1,7 @@
 import { Component, input } from "@angular/core";
 
-import { Icons } from "..";
+import { Search } from "@bitwarden/assets/svg";
+
 import { BitIconComponent } from "../icon/icon.component";
 
 /**
@@ -12,5 +13,5 @@ import { BitIconComponent } from "../icon/icon.component";
   imports: [BitIconComponent],
 })
 export class NoItemsComponent {
-  readonly icon = input(Icons.Search);
+  readonly icon = input(Search);
 }
diff --git a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
index cb8a72e1b3f..2cacab5af75 100644
--- a/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
+++ b/libs/components/src/stories/kitchen-sink/kitchen-sink.stories.ts
@@ -11,9 +11,9 @@ import {
   getAllByLabelText,
 } from "@storybook/test";
 
+import { PasswordManagerLogo } from "@bitwarden/assets/svg";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
-import { PasswordManagerLogo } from "../../icon";
 import { LayoutComponent } from "../../layout";
 import { I18nMockService } from "../../utils/i18n-mock.service";
 import { positionFixedWrapperDecorator } from "../storybook-decorators";
diff --git a/libs/components/tailwind.config.base.js b/libs/components/tailwind.config.base.js
index fe33e592609..95b239537ff 100644
--- a/libs/components/tailwind.config.base.js
+++ b/libs/components/tailwind.config.base.js
@@ -10,6 +10,7 @@ module.exports = {
   prefix: "tw-",
   content: [
     "./src/**/*.{html,ts}",
+    "../../libs/assets/src/**/*.{html,ts}",
     "../../libs/components/src/**/*.{html,ts}",
     "../../libs/key-management-ui/src/**/*.{html,ts}",
     "../../libs/auth/src/**/*.{html,ts}",
diff --git a/libs/components/tailwind.config.js b/libs/components/tailwind.config.js
index d256214a4ff..d8cef6596dc 100644
--- a/libs/components/tailwind.config.js
+++ b/libs/components/tailwind.config.js
@@ -3,6 +3,7 @@ const config = require("./tailwind.config.base");
 
 config.content = [
   "libs/components/src/**/*.{html,ts,mdx}",
+  "libs/assets/src/**/*.{html,ts,mdx}",
   "libs/auth/src/**/*.{html,ts,mdx}",
   "libs/vault/src/**/*.{html,ts,mdx}",
   "apps/web/src/**/*.{html,ts,mdx}",
diff --git a/libs/tools/generator/components/src/empty-credential-history.component.ts b/libs/tools/generator/components/src/empty-credential-history.component.ts
index 29c9fc277fc..6ae55d33d2c 100644
--- a/libs/tools/generator/components/src/empty-credential-history.component.ts
+++ b/libs/tools/generator/components/src/empty-credential-history.component.ts
@@ -1,10 +1,9 @@
 import { Component } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { NoCredentialsIcon } from "@bitwarden/assets/svg";
 import { IconModule, TypographyModule } from "@bitwarden/components";
 
-import { NoCredentialsIcon } from "./icons/no-credentials.icon";
-
 @Component({
   selector: "bit-empty-credential-history",
   templateUrl: "empty-credential-history.component.html",
diff --git a/libs/tools/send/send-ui/src/icons/index.ts b/libs/tools/send/send-ui/src/icons/index.ts
deleted file mode 100644
index 57636daadcf..00000000000
--- a/libs/tools/send/send-ui/src/icons/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { ExpiredSendIcon } from "./expired-send.icon";
-export { NoSendsIcon } from "./no-send.icon";
-export { ActiveSendIcon } from "./active-send.icon";
diff --git a/libs/tools/send/send-ui/src/index.ts b/libs/tools/send/send-ui/src/index.ts
index db4416a13f0..2803e91c418 100644
--- a/libs/tools/send/send-ui/src/index.ts
+++ b/libs/tools/send/send-ui/src/index.ts
@@ -1,4 +1,3 @@
-export * from "./icons";
 export * from "./send-form";
 export { NewSendDropdownComponent } from "./new-send-dropdown/new-send-dropdown.component";
 export * from "./add-edit/send-add-edit-dialog.component";
diff --git a/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts b/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts
index 7b5f7d3b164..ae2ce12cba8 100644
--- a/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts
+++ b/libs/vault/src/components/carousel/carousel-button/carousel-button.component.ts
@@ -2,9 +2,9 @@ import { FocusableOption } from "@angular/cdk/a11y";
 import { CommonModule } from "@angular/common";
 import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from "@angular/core";
 
+import { CarouselIcon } from "@bitwarden/assets/svg";
 import { IconModule } from "@bitwarden/components";
 
-import { CarouselIcon } from "../carousel-icons/carousel-icon";
 import { VaultCarouselSlideComponent } from "../carousel-slide/carousel-slide.component";
 
 @Component({
diff --git a/libs/vault/src/icons/index.ts b/libs/vault/src/icons/index.ts
deleted file mode 100644
index 904399da4b3..00000000000
--- a/libs/vault/src/icons/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export * from "./deactivated-org";
-export * from "./no-folders";
-export * from "./vault";
-export * from "./empty-trash";
-export * from "./browser-extension";
-export * from "./bitwarden-icon";
-export * from "./security-handshake";
-export * from "./login-cards";
-export * from "./secure-user";
-export * from "./secure-devices";
-export * from "./party";
diff --git a/libs/vault/src/index.ts b/libs/vault/src/index.ts
index 9d037d8fe5e..f3925ac3379 100644
--- a/libs/vault/src/index.ts
+++ b/libs/vault/src/index.ts
@@ -21,8 +21,6 @@ export * from "./components/add-edit-folder-dialog/add-edit-folder-dialog.compon
 export * from "./components/carousel";
 export * from "./components/new-cipher-menu/new-cipher-menu.component";
 
-export * as VaultIcons from "./icons";
-
 export { DefaultSshImportPromptService } from "./services/default-ssh-import-prompt.service";
 export { SshImportPromptService } from "./services/ssh-import-prompt.service";
 
diff --git a/package-lock.json b/package-lock.json
index d2d497d10b0..c0958eab200 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -303,6 +303,11 @@
       "version": "0.0.0",
       "license": "GPL-3.0"
     },
+    "libs/assets": {
+      "name": "@bitwarden/assets",
+      "version": "0.0.1",
+      "license": "GPL-3.0"
+    },
     "libs/auth": {
       "name": "@bitwarden/auth",
       "version": "0.0.0",
@@ -4563,6 +4568,10 @@
       "resolved": "libs/angular",
       "link": true
     },
+    "node_modules/@bitwarden/assets": {
+      "resolved": "libs/assets",
+      "link": true
+    },
     "node_modules/@bitwarden/auth": {
       "resolved": "libs/auth",
       "link": true
diff --git a/tailwind.config.js b/tailwind.config.js
index 637c28a54ea..dff04c897c3 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -6,6 +6,7 @@ config.content = [
   "./libs/admin-console/src/**/*.{html,ts,mdx}",
   "./libs/auth/src/**/*.{html,ts,mdx}",
   "./libs/billing/src/**/*.{html,ts,mdx}",
+  "./libs/assets/src/**/*.{html,ts}",
   "./libs/platform/src/**/*.{html,ts,mdx}",
   "./libs/tools/send/send-ui/src/*.{html,ts,mdx}",
   "./libs/vault/src/**/*.{html,ts,mdx}",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index c1256383915..8053bfe6c63 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -20,6 +20,8 @@
     "paths": {
       "@bitwarden/admin-console/common": ["./libs/admin-console/src/common"],
       "@bitwarden/angular/*": ["./libs/angular/src/*"],
+      "@bitwarden/assets": ["libs/assets/src/index.ts"],
+      "@bitwarden/assets/svg": ["libs/assets/src/svg/index.ts"],
       "@bitwarden/auth/angular": ["./libs/auth/src/angular"],
       "@bitwarden/auth/common": ["./libs/auth/src/common"],
       "@bitwarden/billing": ["./libs/billing/src"],

From a6e7efddeb5a6263053118b5f211e7d2b0c13a91 Mon Sep 17 00:00:00 2001
From: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
Date: Thu, 21 Aug 2025 15:49:19 -0500
Subject: [PATCH 20/34] [PM-23627] Require publicKey for keyService
 getFingerprint (#15933)

* require public key on keyService getFingerprint

* Update consumers and add error handling & logging
---
 .../account-security.component.spec.ts        |  2 -
 .../settings/account-security.component.ts    | 16 ++++--
 apps/cli/src/commands/get.command.ts          |  3 +
 apps/desktop/src/app/app.component.ts         | 18 ++++--
 .../settings/account/profile.component.html   | 13 +++--
 .../settings/account/profile.component.ts     | 24 ++++++--
 .../src/abstractions/key.service.ts           | 10 ++--
 libs/key-management/src/key.service.spec.ts   | 57 +++++++++++++++++++
 libs/key-management/src/key.service.ts        | 12 +---
 9 files changed, 119 insertions(+), 36 deletions(-)

diff --git a/apps/browser/src/auth/popup/settings/account-security.component.spec.ts b/apps/browser/src/auth/popup/settings/account-security.component.spec.ts
index 014f2a7638b..63666440a76 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.spec.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.spec.ts
@@ -24,7 +24,6 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import { MessageSender } from "@bitwarden/common/platform/messaging";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -79,7 +78,6 @@ describe("AccountSecurityComponent", () => {
         { provide: PlatformUtilsService, useValue: platformUtilsService },
         { provide: PolicyService, useValue: policyService },
         { provide: PopupRouterCacheService, useValue: mock<PopupRouterCacheService>() },
-        { provide: StateService, useValue: mock<StateService>() },
         { provide: ToastService, useValue: mock<ToastService>() },
         { provide: UserVerificationService, useValue: mock<UserVerificationService>() },
         { provide: VaultTimeoutService, useValue: mock<VaultTimeoutService>() },
diff --git a/apps/browser/src/auth/popup/settings/account-security.component.ts b/apps/browser/src/auth/popup/settings/account-security.component.ts
index b41cfe14c4f..72a389ecf71 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.ts
@@ -44,9 +44,9 @@ import {
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import {
   DialogRef,
@@ -149,7 +149,6 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
     public messagingService: MessagingService,
     private environmentService: EnvironmentService,
     private keyService: KeyService,
-    private stateService: StateService,
     private userVerificationService: UserVerificationService,
     private dialogService: DialogService,
     private changeDetectorRef: ChangeDetectorRef,
@@ -159,6 +158,7 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
     private vaultNudgesService: NudgesService,
     private validationService: ValidationService,
     private configService: ConfigService,
+    private logService: LogService,
   ) {}
 
   async ngOnInit() {
@@ -683,10 +683,16 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
   }
 
   async openAcctFingerprintDialog() {
-    const activeUserId = await firstValueFrom(
-      this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-    );
+    const activeUserId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
     const publicKey = await firstValueFrom(this.keyService.userPublicKey$(activeUserId));
+    if (publicKey == null) {
+      this.logService.error(
+        "[AccountSecurityComponent] No public key available for the user: " +
+          activeUserId +
+          " fingerprint can't be displayed.",
+      );
+      return;
+    }
     const fingerprint = await this.keyService.getFingerprint(activeUserId, publicKey);
 
     const dialogRef = FingerprintDialogComponent.open(this.dialogService, {
diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts
index 58181cff6ce..a994ad3117c 100644
--- a/apps/cli/src/commands/get.command.ts
+++ b/apps/cli/src/commands/get.command.ts
@@ -606,6 +606,9 @@ export class GetCommand extends DownloadCommand {
     if (id === "me") {
       const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
       const publicKey = await firstValueFrom(this.keyService.userPublicKey$(activeUserId));
+      if (publicKey == null) {
+        return Response.error("No public key available for the active user.");
+      }
       fingerprint = await this.keyService.getFingerprint(activeUserId, publicKey);
     } else if (Utils.isGuid(id)) {
       try {
diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index 197290cf690..c4e60e4ff93 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -299,12 +299,22 @@ export class AppComponent implements OnInit, OnDestroy {
             break;
           case "showFingerprintPhrase": {
             const activeUserId = await firstValueFrom(
-              this.accountService.activeAccount$.pipe(map((a) => a?.id)),
+              getUserId(this.accountService.activeAccount$),
             );
             const publicKey = await firstValueFrom(this.keyService.userPublicKey$(activeUserId));
-            const fingerprint = await this.keyService.getFingerprint(activeUserId, publicKey);
-            const dialogRef = FingerprintDialogComponent.open(this.dialogService, { fingerprint });
-            await firstValueFrom(dialogRef.closed);
+            if (publicKey == null) {
+              this.logService.error(
+                "[AppComponent] No public key available for the user: " +
+                  activeUserId +
+                  " fingerprint can't be displayed.",
+              );
+            } else {
+              const fingerprint = await this.keyService.getFingerprint(activeUserId, publicKey);
+              const dialogRef = FingerprintDialogComponent.open(this.dialogService, {
+                fingerprint,
+              });
+              await firstValueFrom(dialogRef.closed);
+            }
             break;
           }
           case "deleteAccount":
diff --git a/apps/web/src/app/auth/settings/account/profile.component.html b/apps/web/src/app/auth/settings/account/profile.component.html
index 74e9cf08f89..a49e6c31d2e 100644
--- a/apps/web/src/app/auth/settings/account/profile.component.html
+++ b/apps/web/src/app/auth/settings/account/profile.component.html
@@ -46,11 +46,14 @@
           <i class="bwi bwi-question-circle" aria-hidden="true"></i>
         </a>
       </div>
-      <app-account-fingerprint
-        [fingerprintMaterial]="fingerprintMaterial"
-        fingerprintLabel="{{ 'yourAccountsFingerprint' | i18n }}"
-      >
-      </app-account-fingerprint>
+      @if (fingerprintMaterial && userPublicKey) {
+        <app-account-fingerprint
+          [fingerprintMaterial]="fingerprintMaterial"
+          [publicKeyBuffer]="userPublicKey"
+          fingerprintLabel="{{ 'yourAccountsFingerprint' | i18n }}"
+        >
+        </app-account-fingerprint>
+      }
     </div>
   </div>
   <button bitButton bitFormButton type="submit" buttonType="primary">{{ "save" | i18n }}</button>
diff --git a/apps/web/src/app/auth/settings/account/profile.component.ts b/apps/web/src/app/auth/settings/account/profile.component.ts
index a0572b846db..54f9ac58291 100644
--- a/apps/web/src/app/auth/settings/account/profile.component.ts
+++ b/apps/web/src/app/auth/settings/account/profile.component.ts
@@ -12,7 +12,10 @@ import { UpdateProfileRequest } from "@bitwarden/common/auth/models/request/upda
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { ProfileResponse } from "@bitwarden/common/models/response/profile.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { UserPublicKey } from "@bitwarden/common/types/key";
 import { DialogService, ToastService } from "@bitwarden/components";
+import { KeyService } from "@bitwarden/key-management";
 
 import { DynamicAvatarComponent } from "../../../components/dynamic-avatar.component";
 import { SharedModule } from "../../../shared";
@@ -29,6 +32,7 @@ export class ProfileComponent implements OnInit, OnDestroy {
   loading = true;
   profile: ProfileResponse;
   fingerprintMaterial: string;
+  userPublicKey: UserPublicKey;
   managingOrganization$: Observable<Organization>;
   private destroy$ = new Subject<void>();
 
@@ -44,16 +48,24 @@ export class ProfileComponent implements OnInit, OnDestroy {
     private dialogService: DialogService,
     private toastService: ToastService,
     private organizationService: OrganizationService,
+    private keyService: KeyService,
+    private logService: LogService,
   ) {}
 
   async ngOnInit() {
     this.profile = await this.apiService.getProfile();
-    this.loading = false;
-    this.fingerprintMaterial = await firstValueFrom(
-      this.accountService.activeAccount$.pipe(map((a) => a?.id)),
-    );
-
     const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+    this.fingerprintMaterial = userId;
+    const publicKey = await firstValueFrom(this.keyService.userPublicKey$(userId));
+    if (publicKey == null) {
+      this.logService.error(
+        "[ProfileComponent] No public key available for the user: " +
+          userId +
+          " fingerprint can't be displayed.",
+      );
+    } else {
+      this.userPublicKey = publicKey;
+    }
 
     this.managingOrganization$ = this.organizationService
       .organizations$(userId)
@@ -70,6 +82,8 @@ export class ProfileComponent implements OnInit, OnDestroy {
       .subscribe((name) => {
         this.profile.name = name;
       });
+
+    this.loading = false;
   }
 
   openChangeAvatar = async () => {
diff --git a/libs/key-management/src/abstractions/key.service.ts b/libs/key-management/src/abstractions/key.service.ts
index 4f14f5523b9..1685938de3d 100644
--- a/libs/key-management/src/abstractions/key.service.ts
+++ b/libs/key-management/src/abstractions/key.service.ts
@@ -318,14 +318,14 @@ export abstract class KeyService {
   ): Observable<{ privateKey: UserPrivateKey; publicKey: UserPublicKey } | null>;
 
   /**
-   * Generates a fingerprint phrase for the user based on their public key
+   * Generates a fingerprint phrase for the public key provided.
    *
-   * @throws Error when publicKey is null and there is no active user, or the active user does not have a public key
+   * @throws Error when publicKey is null or undefined.
    * @param fingerprintMaterial Fingerprint material
-   * @param publicKey The user's public key
-   * @returns The user's fingerprint phrase
+   * @param publicKey The public key to generate the fingerprint phrase for.
+   * @returns The fingerprint phrase
    */
-  abstract getFingerprint(fingerprintMaterial: string, publicKey?: Uint8Array): Promise<string[]>;
+  abstract getFingerprint(fingerprintMaterial: string, publicKey: Uint8Array): Promise<string[]>;
   /**
    * Generates a new keypair
    * @param key A key to encrypt the private key with. If not provided,
diff --git a/libs/key-management/src/key.service.spec.ts b/libs/key-management/src/key.service.spec.ts
index 4d872e2cd5c..6e1ee5d6506 100644
--- a/libs/key-management/src/key.service.spec.ts
+++ b/libs/key-management/src/key.service.spec.ts
@@ -1227,6 +1227,63 @@ describe("keyService", () => {
     });
   });
 
+  describe("getFingerprint", () => {
+    const mockFingerprintMaterial = "test@example.com";
+    const mockPublicKey = new Uint8Array(256);
+    const mockKeyFingerprint = Utils.fromB64ToArray("nfG2jTrJilBEsSrg7ffe9exE9PlClem4P2bxlQ6rNbs=");
+    const mockUserFingerprint = Utils.fromB64ToArray(
+      "V5AQSk83YXd6kZqCncC6d9J72R7UZ60Xl1eIoDoWgTc=",
+    );
+    const expectedFingerprint = ["predefine", "hunting", "pastime", "enrich", "unhearing"];
+
+    beforeEach(() => {
+      cryptoFunctionService.hash.mockResolvedValue(mockKeyFingerprint);
+      cryptoFunctionService.hkdfExpand.mockResolvedValue(mockUserFingerprint);
+    });
+
+    test.each([null as unknown as Uint8Array, undefined as unknown as Uint8Array])(
+      "throws when publicKey is %s",
+      async (publicKey) => {
+        await expect(keyService.getFingerprint(mockFingerprintMaterial, publicKey)).rejects.toThrow(
+          "Public key is required to generate a fingerprint.",
+        );
+        expect(cryptoFunctionService.hash).not.toHaveBeenCalled();
+        expect(cryptoFunctionService.hkdfExpand).not.toHaveBeenCalled();
+      },
+    );
+
+    it("generates fingerprint successfully", async () => {
+      const result = await keyService.getFingerprint(mockFingerprintMaterial, mockPublicKey);
+
+      expect(result).toEqual(expectedFingerprint);
+      expect(cryptoFunctionService.hash).toHaveBeenCalledWith(mockPublicKey, "sha256");
+      expect(cryptoFunctionService.hkdfExpand).toHaveBeenCalledWith(
+        mockKeyFingerprint,
+        mockFingerprintMaterial,
+        32,
+        "sha256",
+      );
+    });
+
+    it("throws when entropy of hash function is too small", async () => {
+      const keyFingerprint = new Uint8Array(3);
+      cryptoFunctionService.hash.mockResolvedValue(keyFingerprint);
+      cryptoFunctionService.hkdfExpand.mockResolvedValue(new Uint8Array(3));
+
+      await expect(
+        keyService.getFingerprint(mockFingerprintMaterial, mockPublicKey),
+      ).rejects.toThrow("Output entropy of hash function is too small");
+
+      expect(cryptoFunctionService.hash).toHaveBeenCalledWith(mockPublicKey, "sha256");
+      expect(cryptoFunctionService.hkdfExpand).toHaveBeenCalledWith(
+        keyFingerprint,
+        mockFingerprintMaterial,
+        32,
+        "sha256",
+      );
+    });
+  });
+
   describe("makeKeyPair", () => {
     test.each([null as unknown as SymmetricCryptoKey, undefined as unknown as SymmetricCryptoKey])(
       "throws when the provided key is %s",
diff --git a/libs/key-management/src/key.service.ts b/libs/key-management/src/key.service.ts
index 92bee383a0b..ed0b844a2a4 100644
--- a/libs/key-management/src/key.service.ts
+++ b/libs/key-management/src/key.service.ts
@@ -473,19 +473,11 @@ export class DefaultKeyService implements KeyServiceAbstraction {
       .update(() => encPrivateKey);
   }
 
-  // TODO: Make public key required
-  async getFingerprint(fingerprintMaterial: string, publicKey?: Uint8Array): Promise<string[]> {
+  async getFingerprint(fingerprintMaterial: string, publicKey: Uint8Array): Promise<string[]> {
     if (publicKey == null) {
-      const activeUserId = await firstValueFrom(this.stateProvider.activeUserId$);
-      if (activeUserId == null) {
-        throw new Error("No active user found.");
-      }
-      publicKey = (await firstValueFrom(this.userPublicKey$(activeUserId))) as Uint8Array;
+      throw new Error("Public key is required to generate a fingerprint.");
     }
 
-    if (publicKey === null) {
-      throw new Error("No public key available.");
-    }
     const keyFingerprint = await this.cryptoFunctionService.hash(publicKey, "sha256");
     const userFingerprint = await this.cryptoFunctionService.hkdfExpand(
       keyFingerprint,

From 7aca0cdbd7345a0e10bbd24cb86daf0f4c75938b Mon Sep 17 00:00:00 2001
From: Justin Baur <19896123+justindbaur@users.noreply.github.com>
Date: Thu, 21 Aug 2025 17:28:03 -0400
Subject: [PATCH 21/34] Fix `AppComponent.ngOnInit` throwing an error (#16115)

---
 apps/browser/src/popup/app.component.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index fa1e6c237c9..bd7b41b6e5f 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -321,6 +321,9 @@ export class AppComponent implements OnInit, OnDestroy {
   }
 
   private async clearComponentStates() {
+    if (this.activeUserId == null) {
+      return;
+    }
     if (!(await firstValueFrom(this.tokenService.hasAccessToken$(this.activeUserId)))) {
       return;
     }

From 12df7def61cc5b90af972edb5638e94b5cd53744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
 <dani-garcia@users.noreply.github.com>
Date: Fri, 22 Aug 2025 14:21:52 +0200
Subject: [PATCH 22/34] [PM-19479] Client-Managed SDK state definition (#14839)

* [PM-19479] Client-Managed SDK state definition

* Remove test code

* Update based on latest sdk

* Add DB config

* Remove uuid conversion step

* Move mapper into separate file

* Revert to client managed state

* Move mapper to Cipher

* Typo

---------

Co-authored-by: Andreas Coroiu <andreas.coroiu@gmail.com>
---
 .../browser/src/background/main.background.ts |  1 +
 .../service-container/service-container.ts    |  1 +
 .../src/services/jslib-services.module.ts     |  1 +
 .../services/sdk/client-managed-state.ts      | 64 +++++++++++++++++++
 .../services/sdk/default-sdk.service.ts       | 10 +++
 .../vault/models/domain/cipher-sdk-mapper.ts  | 22 +++++++
 6 files changed, 99 insertions(+)
 create mode 100644 libs/common/src/platform/services/sdk/client-managed-state.ts
 create mode 100644 libs/common/src/vault/models/domain/cipher-sdk-mapper.ts

diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index a5fb9397125..cd045c9874e 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -779,6 +779,7 @@ export default class MainBackground {
       this.accountService,
       this.kdfConfigService,
       this.keyService,
+      this.stateProvider,
     );
 
     this.passwordStrengthService = new PasswordStrengthService();
diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts
index e82ceb5a6e9..0268eed06ae 100644
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -599,6 +599,7 @@ export class ServiceContainer {
       this.accountService,
       this.kdfConfigService,
       this.keyService,
+      this.stateProvider,
       customUserAgent,
     );
 
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 50d1c477c96..ab7c12ceffa 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -1467,6 +1467,7 @@ const safeProviders: SafeProvider[] = [
       AccountServiceAbstraction,
       KdfConfigService,
       KeyService,
+      StateProvider,
     ],
   }),
   safeProvider({
diff --git a/libs/common/src/platform/services/sdk/client-managed-state.ts b/libs/common/src/platform/services/sdk/client-managed-state.ts
new file mode 100644
index 00000000000..1e3273d0801
--- /dev/null
+++ b/libs/common/src/platform/services/sdk/client-managed-state.ts
@@ -0,0 +1,64 @@
+import { firstValueFrom, map } from "rxjs";
+
+import { UserId } from "@bitwarden/common/types/guid";
+import { CipherRecordMapper } from "@bitwarden/common/vault/models/domain/cipher-sdk-mapper";
+import { StateClient, Repository } from "@bitwarden/sdk-internal";
+
+import { StateProvider, UserKeyDefinition } from "../../state";
+
+export async function initializeState(
+  userId: UserId,
+  stateClient: StateClient,
+  stateProvider: StateProvider,
+): Promise<void> {
+  await stateClient.register_cipher_repository(
+    new RepositoryRecord(userId, stateProvider, new CipherRecordMapper()),
+  );
+}
+
+export interface SdkRecordMapper<ClientType, SdkType> {
+  userKeyDefinition(): UserKeyDefinition<Record<string, ClientType>>;
+  toSdk(value: ClientType): SdkType;
+  fromSdk(value: SdkType): ClientType;
+}
+
+class RepositoryRecord<ClientType, SdkType> implements Repository<SdkType> {
+  constructor(
+    private userId: UserId,
+    private stateProvider: StateProvider,
+    private mapper: SdkRecordMapper<ClientType, SdkType>,
+  ) {}
+
+  async get(id: string): Promise<SdkType | null> {
+    const prov = this.stateProvider.getUser(this.userId, this.mapper.userKeyDefinition());
+    const data = await firstValueFrom(prov.state$.pipe(map((data) => data ?? {})));
+    const element = data[id];
+    if (!element) {
+      return null;
+    }
+    return this.mapper.toSdk(element);
+  }
+
+  async list(): Promise<SdkType[]> {
+    const prov = this.stateProvider.getUser(this.userId, this.mapper.userKeyDefinition());
+    const elements = await firstValueFrom(prov.state$.pipe(map((data) => data ?? {})));
+    return Object.values(elements).map((element) => this.mapper.toSdk(element));
+  }
+
+  async set(id: string, value: SdkType): Promise<void> {
+    const prov = this.stateProvider.getUser(this.userId, this.mapper.userKeyDefinition());
+    const elements = await firstValueFrom(prov.state$.pipe(map((data) => data ?? {})));
+    elements[id] = this.mapper.fromSdk(value);
+    await prov.update(() => elements);
+  }
+
+  async remove(id: string): Promise<void> {
+    const prov = this.stateProvider.getUser(this.userId, this.mapper.userKeyDefinition());
+    const elements = await firstValueFrom(prov.state$.pipe(map((data) => data ?? {})));
+    if (!elements[id]) {
+      return;
+    }
+    delete elements[id];
+    await prov.update(() => elements);
+  }
+}
diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.ts b/libs/common/src/platform/services/sdk/default-sdk.service.ts
index d8780b0f1f4..4359f03a17f 100644
--- a/libs/common/src/platform/services/sdk/default-sdk.service.ts
+++ b/libs/common/src/platform/services/sdk/default-sdk.service.ts
@@ -38,6 +38,9 @@ import { SdkLoadService } from "../../abstractions/sdk/sdk-load.service";
 import { SdkService, UserNotLoggedInError } from "../../abstractions/sdk/sdk.service";
 import { compareValues } from "../../misc/compare-values";
 import { Rc } from "../../misc/reference-counting/rc";
+import { StateProvider } from "../../state";
+
+import { initializeState } from "./client-managed-state";
 
 // A symbol that represents an overriden client that is explicitly set to undefined,
 // blocking the creation of an internal client for that user.
@@ -81,6 +84,7 @@ export class DefaultSdkService implements SdkService {
     private accountService: AccountService,
     private kdfConfigService: KdfConfigService,
     private keyService: KeyService,
+    private stateProvider?: StateProvider,
     private userAgent: string | null = null,
   ) {}
 
@@ -241,6 +245,12 @@ export class DefaultSdkService implements SdkService {
           .map(([k, v]) => [k, v.key as UnsignedSharedKey]),
       ),
     });
+
+    // This is optional to avoid having to mock it on the tests
+    if (this.stateProvider) {
+      // Initialize the SDK managed database and the client managed repositories.
+      await initializeState(userId, client.platform().state(), this.stateProvider);
+    }
   }
 
   private toSettings(env: Environment): ClientSettings {
diff --git a/libs/common/src/vault/models/domain/cipher-sdk-mapper.ts b/libs/common/src/vault/models/domain/cipher-sdk-mapper.ts
new file mode 100644
index 00000000000..644a9ff7645
--- /dev/null
+++ b/libs/common/src/vault/models/domain/cipher-sdk-mapper.ts
@@ -0,0 +1,22 @@
+import { SdkRecordMapper } from "@bitwarden/common/platform/services/sdk/client-managed-state";
+import { UserKeyDefinition } from "@bitwarden/common/platform/state";
+import { Cipher as SdkCipher } from "@bitwarden/sdk-internal";
+
+import { ENCRYPTED_CIPHERS } from "../../services/key-state/ciphers.state";
+import { CipherData } from "../data/cipher.data";
+
+import { Cipher } from "./cipher";
+
+export class CipherRecordMapper implements SdkRecordMapper<CipherData, SdkCipher> {
+  userKeyDefinition(): UserKeyDefinition<Record<string, CipherData>> {
+    return ENCRYPTED_CIPHERS;
+  }
+
+  toSdk(value: CipherData): SdkCipher {
+    return new Cipher(value).toSdkCipher();
+  }
+
+  fromSdk(value: SdkCipher): CipherData {
+    throw new Error("Cipher.fromSdk is not implemented yet");
+  }
+}

From 92c9aa7b3e37a7dcdcf48fca927a868abc7e44a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa?=
 <dani-garcia@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:19:18 +0200
Subject: [PATCH 23/34] Use FakeStateProvider in SdkService tests (#16126)

---
 .../services/sdk/default-sdk.service.spec.ts  | 22 +++++++++++++++----
 .../services/sdk/default-sdk.service.ts       |  9 +++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts b/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts
index 17d98159c41..30b43bfe00a 100644
--- a/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts
+++ b/libs/common/src/platform/services/sdk/default-sdk.service.spec.ts
@@ -6,8 +6,13 @@ import { BehaviorSubject, firstValueFrom, of } from "rxjs";
 import { KdfConfigService, KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management";
 import { BitwardenClient } from "@bitwarden/sdk-internal";
 
-import { ObservableTracker } from "../../../../spec";
-import { AccountInfo, AccountService } from "../../../auth/abstractions/account.service";
+import {
+  FakeAccountService,
+  FakeStateProvider,
+  mockAccountServiceWith,
+  ObservableTracker,
+} from "../../../../spec";
+import { AccountInfo } from "../../../auth/abstractions/account.service";
 import { EncryptedString } from "../../../key-management/crypto/models/enc-string";
 import { UserId } from "../../../types/guid";
 import { UserKey } from "../../../types/key";
@@ -17,6 +22,7 @@ import { SdkClientFactory } from "../../abstractions/sdk/sdk-client-factory";
 import { SdkLoadService } from "../../abstractions/sdk/sdk-load.service";
 import { UserNotLoggedInError } from "../../abstractions/sdk/sdk.service";
 import { Rc } from "../../misc/reference-counting/rc";
+import { Utils } from "../../misc/utils";
 import { SymmetricCryptoKey } from "../../models/domain/symmetric-crypto-key";
 
 import { DefaultSdkService } from "./default-sdk.service";
@@ -33,10 +39,11 @@ describe("DefaultSdkService", () => {
     let sdkClientFactory!: MockProxy<SdkClientFactory>;
     let environmentService!: MockProxy<EnvironmentService>;
     let platformUtilsService!: MockProxy<PlatformUtilsService>;
-    let accountService!: MockProxy<AccountService>;
     let kdfConfigService!: MockProxy<KdfConfigService>;
     let keyService!: MockProxy<KeyService>;
     let service!: DefaultSdkService;
+    let accountService!: FakeAccountService;
+    let fakeStateProvider!: FakeStateProvider;
 
     beforeEach(async () => {
       await new TestSdkLoadService().loadAndInit();
@@ -44,9 +51,11 @@ describe("DefaultSdkService", () => {
       sdkClientFactory = mock<SdkClientFactory>();
       environmentService = mock<EnvironmentService>();
       platformUtilsService = mock<PlatformUtilsService>();
-      accountService = mock<AccountService>();
       kdfConfigService = mock<KdfConfigService>();
       keyService = mock<KeyService>();
+      const mockUserId = Utils.newGuid() as UserId;
+      accountService = mockAccountServiceWith(mockUserId);
+      fakeStateProvider = new FakeStateProvider(accountService);
 
       // Can't use `of(mock<Environment>())` for some reason
       environmentService.environment$ = new BehaviorSubject(mock<Environment>());
@@ -58,6 +67,7 @@ describe("DefaultSdkService", () => {
         accountService,
         kdfConfigService,
         keyService,
+        fakeStateProvider,
       );
     });
 
@@ -219,5 +229,9 @@ describe("DefaultSdkService", () => {
 function createMockClient(): MockProxy<BitwardenClient> {
   const client = mock<BitwardenClient>();
   client.crypto.mockReturnValue(mock());
+  client.platform.mockReturnValue({
+    state: jest.fn().mockReturnValue(mock()),
+    free: mock(),
+  });
   return client;
 }
diff --git a/libs/common/src/platform/services/sdk/default-sdk.service.ts b/libs/common/src/platform/services/sdk/default-sdk.service.ts
index 4359f03a17f..629d7dafed5 100644
--- a/libs/common/src/platform/services/sdk/default-sdk.service.ts
+++ b/libs/common/src/platform/services/sdk/default-sdk.service.ts
@@ -84,7 +84,7 @@ export class DefaultSdkService implements SdkService {
     private accountService: AccountService,
     private kdfConfigService: KdfConfigService,
     private keyService: KeyService,
-    private stateProvider?: StateProvider,
+    private stateProvider: StateProvider,
     private userAgent: string | null = null,
   ) {}
 
@@ -246,11 +246,8 @@ export class DefaultSdkService implements SdkService {
       ),
     });
 
-    // This is optional to avoid having to mock it on the tests
-    if (this.stateProvider) {
-      // Initialize the SDK managed database and the client managed repositories.
-      await initializeState(userId, client.platform().state(), this.stateProvider);
-    }
+    // Initialize the SDK managed database and the client managed repositories.
+    await initializeState(userId, client.platform().state(), this.stateProvider);
   }
 
   private toSettings(env: Environment): ClientSettings {

From eb84faaf9907e67e3ff23f6968ffcbcba542952b Mon Sep 17 00:00:00 2001
From: Bryan Cunningham <bcunningham@bitwarden.com>
Date: Fri, 22 Aug 2025 10:01:23 -0400
Subject: [PATCH 24/34] [CL-825] Provide dimensions to checkbox to fix ios
 rendering bug (#16109)

* absolutely position checkbox to fix ios rendering bug

* remove absolute positioning. Dimensions fix it
---
 libs/components/src/checkbox/checkbox.component.ts           | 3 +++
 libs/components/src/form-control/form-control.component.html | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/components/src/checkbox/checkbox.component.ts b/libs/components/src/checkbox/checkbox.component.ts
index f93861c877a..b5d53c41fd6 100644
--- a/libs/components/src/checkbox/checkbox.component.ts
+++ b/libs/components/src/checkbox/checkbox.component.ts
@@ -21,6 +21,9 @@ export class CheckboxComponent implements BitFormControlAbstraction {
     "tw-align-sub",
     "tw-flex-none", // Flexbox fix for bit-form-control
     "!tw-p-1",
+    // Give checkbox explicit height and width to fix iOS rendering bug
+    "tw-h-[calc(1.12rem_+_theme(spacing.2))]",
+    "tw-w-[calc(1.12rem_+_theme(spacing.2))]",
     "after:tw-inset-1",
     // negative margin to negate the positioning added by the padding
     "!-tw-mt-1",
diff --git a/libs/components/src/form-control/form-control.component.html b/libs/components/src/form-control/form-control.component.html
index 3dc3f90c9b0..4fbb8e6342e 100644
--- a/libs/components/src/form-control/form-control.component.html
+++ b/libs/components/src/form-control/form-control.component.html
@@ -1,5 +1,5 @@
 <label
-  class="tw-transition tw-items-start [&:has(input[type='checkbox'])]:tw-gap-[.25rem] [&:has(input[type='radio'])]:tw-gap-1.5 tw-select-none tw-mb-0 tw-inline-flex tw-rounded has-[:focus-visible]:tw-ring has-[:focus-visible]:tw-ring-primary-600"
+  class="tw-transition tw-items-start [&:has(input[type='checkbox'])]:tw-gap-1 [&:has(input[type='radio'])]:tw-gap-1.5 tw-select-none tw-mb-0 tw-inline-flex tw-rounded has-[:focus-visible]:tw-ring has-[:focus-visible]:tw-ring-primary-600"
   [ngClass]="[formControl().disabled ? 'tw-cursor-auto' : 'tw-cursor-pointer']"
 >
   <ng-content></ng-content>

From 6c173c456505b429dedb56fdbbfb76c46c30756a Mon Sep 17 00:00:00 2001
From: Dave <3836813+enmande@users.noreply.github.com>
Date: Fri, 22 Aug 2025 10:19:58 -0400
Subject: [PATCH 25/34] feat(two-factor-setup-webauthn): [Auth/PM-4093] Remove
 warning callout from WebAuthn 2FA modal (#16011)

* feat(two-factor-setup-webauthn): [PM-4093] WebAuthn Support Warning - Remove platform limitation warning from web.

* feat(two-factor-setup-authn):  [PM-4093] WebAuthn Support Warning - Remove translations for support warning.
---
 .../two-factor/two-factor-setup-webauthn.component.html        | 3 ---
 apps/web/src/locales/af/messages.json                          | 3 ---
 apps/web/src/locales/ar/messages.json                          | 3 ---
 apps/web/src/locales/az/messages.json                          | 3 ---
 apps/web/src/locales/be/messages.json                          | 3 ---
 apps/web/src/locales/bg/messages.json                          | 3 ---
 apps/web/src/locales/bn/messages.json                          | 3 ---
 apps/web/src/locales/bs/messages.json                          | 3 ---
 apps/web/src/locales/ca/messages.json                          | 3 ---
 apps/web/src/locales/cs/messages.json                          | 3 ---
 apps/web/src/locales/cy/messages.json                          | 3 ---
 apps/web/src/locales/da/messages.json                          | 3 ---
 apps/web/src/locales/de/messages.json                          | 3 ---
 apps/web/src/locales/el/messages.json                          | 3 ---
 apps/web/src/locales/en/messages.json                          | 3 ---
 apps/web/src/locales/en_GB/messages.json                       | 3 ---
 apps/web/src/locales/en_IN/messages.json                       | 3 ---
 apps/web/src/locales/eo/messages.json                          | 3 ---
 apps/web/src/locales/es/messages.json                          | 3 ---
 apps/web/src/locales/et/messages.json                          | 3 ---
 apps/web/src/locales/eu/messages.json                          | 3 ---
 apps/web/src/locales/fa/messages.json                          | 3 ---
 apps/web/src/locales/fi/messages.json                          | 3 ---
 apps/web/src/locales/fil/messages.json                         | 3 ---
 apps/web/src/locales/fr/messages.json                          | 3 ---
 apps/web/src/locales/gl/messages.json                          | 3 ---
 apps/web/src/locales/he/messages.json                          | 3 ---
 apps/web/src/locales/hi/messages.json                          | 3 ---
 apps/web/src/locales/hr/messages.json                          | 3 ---
 apps/web/src/locales/hu/messages.json                          | 3 ---
 apps/web/src/locales/id/messages.json                          | 3 ---
 apps/web/src/locales/it/messages.json                          | 3 ---
 apps/web/src/locales/ja/messages.json                          | 3 ---
 apps/web/src/locales/ka/messages.json                          | 3 ---
 apps/web/src/locales/km/messages.json                          | 3 ---
 apps/web/src/locales/kn/messages.json                          | 3 ---
 apps/web/src/locales/ko/messages.json                          | 3 ---
 apps/web/src/locales/lv/messages.json                          | 3 ---
 apps/web/src/locales/ml/messages.json                          | 3 ---
 apps/web/src/locales/mr/messages.json                          | 3 ---
 apps/web/src/locales/my/messages.json                          | 3 ---
 apps/web/src/locales/nb/messages.json                          | 3 ---
 apps/web/src/locales/ne/messages.json                          | 3 ---
 apps/web/src/locales/nl/messages.json                          | 3 ---
 apps/web/src/locales/nn/messages.json                          | 3 ---
 apps/web/src/locales/or/messages.json                          | 3 ---
 apps/web/src/locales/pl/messages.json                          | 3 ---
 apps/web/src/locales/pt_BR/messages.json                       | 3 ---
 apps/web/src/locales/pt_PT/messages.json                       | 3 ---
 apps/web/src/locales/ro/messages.json                          | 3 ---
 apps/web/src/locales/ru/messages.json                          | 3 ---
 apps/web/src/locales/si/messages.json                          | 3 ---
 apps/web/src/locales/sk/messages.json                          | 3 ---
 apps/web/src/locales/sl/messages.json                          | 3 ---
 apps/web/src/locales/sr/messages.json                          | 3 ---
 apps/web/src/locales/sr_CS/messages.json                       | 3 ---
 apps/web/src/locales/sr_CY/messages.json                       | 3 ---
 apps/web/src/locales/sv/messages.json                          | 3 ---
 apps/web/src/locales/te/messages.json                          | 3 ---
 apps/web/src/locales/th/messages.json                          | 3 ---
 apps/web/src/locales/tr/messages.json                          | 3 ---
 apps/web/src/locales/uk/messages.json                          | 3 ---
 apps/web/src/locales/vi/messages.json                          | 3 ---
 apps/web/src/locales/zh_CN/messages.json                       | 3 ---
 apps/web/src/locales/zh_TW/messages.json                       | 3 ---
 65 files changed, 195 deletions(-)

diff --git a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html
index 767934cf3da..eec9f74dd60 100644
--- a/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html
+++ b/apps/web/src/app/auth/settings/two-factor/two-factor-setup-webauthn.component.html
@@ -13,9 +13,6 @@
       >
         {{ "twoStepLoginProviderEnabled" | i18n }}
       </bit-callout>
-      <bit-callout type="warning">
-        <p bitTypography="body1">{{ "twoFactorWebAuthnWarning1" | i18n }}</p>
-      </bit-callout>
       <img class="tw-float-right tw-ml-5 mfaType7" alt="FIDO2 WebAuthn logo" />
       <ul class="bwi-ul">
         <li *ngFor="let k of keys; let i = index" #removeKeyBtn [appApiAction]="k.removePromise">
diff --git a/apps/web/src/locales/af/messages.json b/apps/web/src/locales/af/messages.json
index b1fd0b3a76a..00c20238e92 100644
--- a/apps/web/src/locales/af/messages.json
+++ b/apps/web/src/locales/af/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "U herstelkode vir Bitwarden-tweestapaantekening"
   },
diff --git a/apps/web/src/locales/ar/messages.json b/apps/web/src/locales/ar/messages.json
index 02664448260..5a291482056 100644
--- a/apps/web/src/locales/ar/messages.json
+++ b/apps/web/src/locales/ar/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/az/messages.json b/apps/web/src/locales/az/messages.json
index 82ce6b37f5f..482db9201dd 100644
--- a/apps/web/src/locales/az/messages.json
+++ b/apps/web/src/locales/az/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Güvənlik açarı oxunarkən problem yarandı. Yenidən sınayın."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Platforma məhdudiyyətlərinə görə, WebAuthn bütün Bitwarden tətbiqlərində istifadə edilə bilmir. WebAuthn istifadə edilə bilmədiyi zaman, hesabınıza erişə bilməyiniz üçün başqa bir iki addımlı giriş provayderini qurmalısınız."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Bitwarden iki addımlı giriş üçün geri qaytarma kodunuz"
   },
diff --git a/apps/web/src/locales/be/messages.json b/apps/web/src/locales/be/messages.json
index 042ce8d151b..08dabc8ba03 100644
--- a/apps/web/src/locales/be/messages.json
+++ b/apps/web/src/locales/be/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Праблема чытання ключа бяспекі. Паспрабуйце яшчэ раз."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Ваш код аднаўлення двухэтапнага ўваходу Bitwarden"
   },
diff --git a/apps/web/src/locales/bg/messages.json b/apps/web/src/locales/bg/messages.json
index 608716b5ec4..73b854ef08b 100644
--- a/apps/web/src/locales/bg/messages.json
+++ b/apps/web/src/locales/bg/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Проблем при изчитането на ключа за сигурност. Пробвайте отново."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Поради платформени ограничения устройствата на WebAuthn не могат да се използват с всички приложения на Битуорден. Ще трябва да настроите друг доставчик на двустепенно удостоверяване, за да имате достъп до акаунта си, когато WebAuthn не може да се ползва."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Код за възстановяване на достъпа до Битуорден при двустепенна идентификация"
   },
diff --git a/apps/web/src/locales/bn/messages.json b/apps/web/src/locales/bn/messages.json
index 5eb933ce1b8..f91cce66382 100644
--- a/apps/web/src/locales/bn/messages.json
+++ b/apps/web/src/locales/bn/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/bs/messages.json b/apps/web/src/locales/bs/messages.json
index c619456748c..49827f99470 100644
--- a/apps/web/src/locales/bs/messages.json
+++ b/apps/web/src/locales/bs/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/ca/messages.json b/apps/web/src/locales/ca/messages.json
index bb06717e62c..c87cc040ef1 100644
--- a/apps/web/src/locales/ca/messages.json
+++ b/apps/web/src/locales/ca/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Hi ha hagut un problema en llegir la clau de seguretat. Torneu-ho a provar."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "El codi de recuperació d'inici de sessió en dues passes de Bitwarden"
   },
diff --git a/apps/web/src/locales/cs/messages.json b/apps/web/src/locales/cs/messages.json
index 52b98f02ef2..5936caa601f 100644
--- a/apps/web/src/locales/cs/messages.json
+++ b/apps/web/src/locales/cs/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Při čtení bezpečnostního klíče došlo k potížím. Zkuste to znovu."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Z důvodu omezení platformy nelze WebAuthn použít ve všech aplikacích Bitwarden. Měli byste využít i jiného poskytovatele dvoufaktorového přihlášení, abyste měli přístup ke svému účtu, když nelze použít WebAuthn."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Váš kód pro obnovení dvoufázového přihlášení"
   },
diff --git a/apps/web/src/locales/cy/messages.json b/apps/web/src/locales/cy/messages.json
index 17895712cc6..162152a0046 100644
--- a/apps/web/src/locales/cy/messages.json
+++ b/apps/web/src/locales/cy/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/da/messages.json b/apps/web/src/locales/da/messages.json
index 0c85d305095..cd6b96ff5fd 100644
--- a/apps/web/src/locales/da/messages.json
+++ b/apps/web/src/locales/da/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Problem med at læse sikkerhedsnøglen. Forsøg igen."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Gendannelseskoden til Bitwarden totrins-login"
   },
diff --git a/apps/web/src/locales/de/messages.json b/apps/web/src/locales/de/messages.json
index da82d796f4a..da2babf80dc 100644
--- a/apps/web/src/locales/de/messages.json
+++ b/apps/web/src/locales/de/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Es gab ein Problem beim Lesen des Sicherheitsschlüssels, bitte versuche es erneut."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Aufgrund von Plattformbeschränkungen kann WebAuthn nicht in allen Bitwarden-Anwendungen verwendet werden. Du solltest einen anderen Zwei-Faktor-Authentifizierungsanbieter einrichten, damit du auf dein Konto zugreifen kannst, wenn WebAuthn nicht verwendet werden kann."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Ihr Wiederherstellungsschlüssel für die Zwei-Faktor-Anmeldung in Bitwarden"
   },
diff --git a/apps/web/src/locales/el/messages.json b/apps/web/src/locales/el/messages.json
index b046950eeee..a5db5245d80 100644
--- a/apps/web/src/locales/el/messages.json
+++ b/apps/web/src/locales/el/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Παρουσιάστηκε πρόβλημα κατά την ανάγνωση του κλειδιού ασφαλείας. Προσπάθησε ξανά."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Ο Bitwarden κωδικός ανάκτησης, εισόδου δύο βημάτων"
   },
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index e60d81d1982..af80433fce7 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -2448,9 +2448,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/en_GB/messages.json b/apps/web/src/locales/en_GB/messages.json
index b915d32c958..d7a2783acd3 100644
--- a/apps/web/src/locales/en_GB/messages.json
+++ b/apps/web/src/locales/en_GB/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/en_IN/messages.json b/apps/web/src/locales/en_IN/messages.json
index 9d8872ddcb7..dec3387ca7c 100644
--- a/apps/web/src/locales/en_IN/messages.json
+++ b/apps/web/src/locales/en_IN/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/eo/messages.json b/apps/web/src/locales/eo/messages.json
index a1229a746b9..abfc97f163c 100644
--- a/apps/web/src/locales/eo/messages.json
+++ b/apps/web/src/locales/eo/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Via kodo de senpaneigo de du-ŝtupa saluto de Bitwarden"
   },
diff --git a/apps/web/src/locales/es/messages.json b/apps/web/src/locales/es/messages.json
index 0384a834d37..3b0ae219cc6 100644
--- a/apps/web/src/locales/es/messages.json
+++ b/apps/web/src/locales/es/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Hubo un problema al leer la llave de seguridad. Inténtalo de nuevo."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Tu código de recuperación de inicio de sesión de dos pasos de Bitwarden"
   },
diff --git a/apps/web/src/locales/et/messages.json b/apps/web/src/locales/et/messages.json
index 4958878590f..5e863163ffc 100644
--- a/apps/web/src/locales/et/messages.json
+++ b/apps/web/src/locales/et/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Turvavõtme lugemisel tekkis tõrge. Proovi uuesti."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Platvormide piirangute tõttu ei saa WebAuthn'i kõikide Bitwardeni rakendustega kasutada. Võiksid seada sisse teise kahe-astmelise kinnitamise meetodi juhuks, kui WebAuthn'i ei saa kasutada."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Bitwardeni kaheastmelise logimise varukood"
   },
diff --git a/apps/web/src/locales/eu/messages.json b/apps/web/src/locales/eu/messages.json
index d362a9fd939..4e490572690 100644
--- a/apps/web/src/locales/eu/messages.json
+++ b/apps/web/src/locales/eu/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Arazo bat egon da segurtasun-gakoa irakurtzean. Saiatu berriro mesedez."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Zure Bitwardeneko bi urratseko saio hasierako berreskuratze-kodea"
   },
diff --git a/apps/web/src/locales/fa/messages.json b/apps/web/src/locales/fa/messages.json
index ed12d5310dd..137767261ea 100644
--- a/apps/web/src/locales/fa/messages.json
+++ b/apps/web/src/locales/fa/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "مشکلی در خواندن کلید امنیتی وجود داشت. دوباره امتحان کنید."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "به‌دلیل محدودیت‌های پلتفرم، WebAuthn در تمام برنامه‌های Bitwarden قابل استفاده نیست. بهتر است یک روش ورود دو مرحله‌ای دیگر نیز تنظیم کنید تا در مواقعی که WebAuthn قابل استفاده نیست، بتوانید به حساب کاربرب خود دسترسی داشته باشید."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "کد بازیابی ورود دو مرحله ای Bitwarden شما"
   },
diff --git a/apps/web/src/locales/fi/messages.json b/apps/web/src/locales/fi/messages.json
index f84e6150bc0..990619f63ac 100644
--- a/apps/web/src/locales/fi/messages.json
+++ b/apps/web/src/locales/fi/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Suojausavainta luettaessa havaittiin ongelma. Yritä uudelleen."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Alustakohtaisten rajoitusten vuoksi WebAuthn-avaimet eivät ole käytettävissä kaikissa Bitwarden-sovelluksissa ja sinun tulisi määrittää vaihtoehtoinen kaksivaiheisen tunnistautumisen vahvistustapa, jotta pääset tilillesi myös silloin kun WebAuthn-laitteesi ei ole käytettävissä."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Bitwardenin kaksivaiheisen kirjautumisen palautuskoodisi"
   },
diff --git a/apps/web/src/locales/fil/messages.json b/apps/web/src/locales/fil/messages.json
index 42890f1214b..ee6fab860af 100644
--- a/apps/web/src/locales/fil/messages.json
+++ b/apps/web/src/locales/fil/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Nagkaproblema sa pagbabasa ng security key. Pakisubukan ulit."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Code pang-recover mo sa dalawang-hakbang na pag-log in sa Bitwarden"
   },
diff --git a/apps/web/src/locales/fr/messages.json b/apps/web/src/locales/fr/messages.json
index 6808da54bbe..c2232ce0971 100644
--- a/apps/web/src/locales/fr/messages.json
+++ b/apps/web/src/locales/fr/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Un problème est survenu lors de la lecture de la clé de sécurité. Veuillez réessayer."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "En raison des limitations de plate-forme, WebAuthn ne peut pas être utilisé sur toutes les applications Bitwarden. Vous devriez mettre en place un autre fournisseur d'authentification à deux facteurs afin de pouvoir accéder à votre compte lorsque WebAuthn ne peut pas être utilisé."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Votre code de récupération de d'authentification à deux facteurs Bitwarden"
   },
diff --git a/apps/web/src/locales/gl/messages.json b/apps/web/src/locales/gl/messages.json
index 80398fba6c9..28de0043888 100644
--- a/apps/web/src/locales/gl/messages.json
+++ b/apps/web/src/locales/gl/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/he/messages.json b/apps/web/src/locales/he/messages.json
index a1f8455ff36..2958e0d133d 100644
--- a/apps/web/src/locales/he/messages.json
+++ b/apps/web/src/locales/he/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "היתה בעיה בקריאת מפתח האבטחה. נסה בשנית."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "עקב מגבלות פלטפורמה, לא ניתן להשתמש ב־WebAuthn בכל היישומים של Bitwarden. עליך להגדיר ספק כניסה דו־שלבית אחר כך שתוכל לגשת לחשבון שלך כאשר לא ניתן להשתמש ב־WebAuthn."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "קוד השחזור שלך עבור כניסה דו שלבית לBitwarden"
   },
diff --git a/apps/web/src/locales/hi/messages.json b/apps/web/src/locales/hi/messages.json
index 40b2abf6809..bed267c7d0a 100644
--- a/apps/web/src/locales/hi/messages.json
+++ b/apps/web/src/locales/hi/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/hr/messages.json b/apps/web/src/locales/hr/messages.json
index 85ed54950b3..9c8580d8da1 100644
--- a/apps/web/src/locales/hr/messages.json
+++ b/apps/web/src/locales/hr/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Došlo je do pogreške kod očitavanja sigurnosnog ključa. Pokušaj ponovno."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Zbog platformskih ograničenja, WebAuthn nije moguće koristiti sa svim Bitwarden aplikacijama. Uključi drugi način dvostruke autentifikacije za pristup računu kada se ne može koristiti WebAuthn."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Tvoj kôd za oporavak Bitwarden prijave dvostrukom autentifikacijom"
   },
diff --git a/apps/web/src/locales/hu/messages.json b/apps/web/src/locales/hu/messages.json
index 8cb773e6f79..e829c27a2ee 100644
--- a/apps/web/src/locales/hu/messages.json
+++ b/apps/web/src/locales/hu/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Probléma lépett fel a biztonsági kulcs olvasásakor. Próbáljuk újra."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "A platform korlátozások miatt nem lehetséges minden Bitwarden alkalmazásban a WebAuthn használata. Be kell üzemelni egy másik kétlépcsős bejelentkezés szolgáltatót, hogy hozzáférhessünk a fiókhoz akkor is, ha a WebAuthn nem használható."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Bitwarden kétlépcsős bejelentkezés helyreállító kód"
   },
diff --git a/apps/web/src/locales/id/messages.json b/apps/web/src/locales/id/messages.json
index 96b48d504b6..1fa1a4336f5 100644
--- a/apps/web/src/locales/id/messages.json
+++ b/apps/web/src/locales/id/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Ada masalah saat membaca kunci keamanan. Coba lagi."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Kode pemulihan masuk dua langkah Bitwarden Anda"
   },
diff --git a/apps/web/src/locales/it/messages.json b/apps/web/src/locales/it/messages.json
index 0efe3f6ce06..d972b577dba 100644
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Si è verificato un problema durante la lettura della chiave di sicurezza. Riprova."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "A causa delle limitazioni della piattaforma, WebAuthn non può essere usato in tutte le applicazioni Bitwarden. È necessario impostare un altro fornitore d'accesso in due passaggi in modo da poter accedere al tuo account quando WebAuthn non può essere usato."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Il tuo codice di recupero Bitwarden per la verifica in due passaggi"
   },
diff --git a/apps/web/src/locales/ja/messages.json b/apps/web/src/locales/ja/messages.json
index 41c5fd64290..c0420cf47b9 100644
--- a/apps/web/src/locales/ja/messages.json
+++ b/apps/web/src/locales/ja/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "セキュリティキーの読み取り中に問題が発生しました。もう一度やり直して下さい。"
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "プラットフォームの制限により、 WebAuthn は全ての Bitwarden アプリケーションで使用できるわけではありません。 WebAuthn が使用できない場合に備えて、他の2段階認証プロバイダーを設定しておくことをおすすめします。"
-  },
   "twoFactorRecoveryYourCode": {
     "message": "二段階認証のリカバリーコード"
   },
diff --git a/apps/web/src/locales/ka/messages.json b/apps/web/src/locales/ka/messages.json
index d02151bc9df..ebe13e807c1 100644
--- a/apps/web/src/locales/ka/messages.json
+++ b/apps/web/src/locales/ka/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/km/messages.json b/apps/web/src/locales/km/messages.json
index 1721ac49eec..42148397f33 100644
--- a/apps/web/src/locales/km/messages.json
+++ b/apps/web/src/locales/km/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/kn/messages.json b/apps/web/src/locales/kn/messages.json
index c89862d84dd..446f5cdc6c4 100644
--- a/apps/web/src/locales/kn/messages.json
+++ b/apps/web/src/locales/kn/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "ಭದ್ರತಾ ಕೀಲಿಯನ್ನು ಓದುವಲ್ಲಿ ಸಮಸ್ಯೆ ಇದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸು."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "ನಿಮ್ಮ ಬಿಟ್‌ವಾರ್ಡೆನ್ ಎರಡು-ಹಂತದ ಲಾಗಿನ್ ಮರುಪಡೆಯುವಿಕೆ ಕೋಡ್"
   },
diff --git a/apps/web/src/locales/ko/messages.json b/apps/web/src/locales/ko/messages.json
index 703ed858954..365dac41865 100644
--- a/apps/web/src/locales/ko/messages.json
+++ b/apps/web/src/locales/ko/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "보안 키를 읽어오는데 문제가 발생했습니다. 다시 시도해보십시오."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Bitwarden 2단계 로그인 복구 코드"
   },
diff --git a/apps/web/src/locales/lv/messages.json b/apps/web/src/locales/lv/messages.json
index 9b57d12466f..bcfc63a63d5 100644
--- a/apps/web/src/locales/lv/messages.json
+++ b/apps/web/src/locales/lv/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Radās sarežģījumi, nolasot drošības atslēgu. Jāmēģina vēlreiz."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Platformas ierobežojumu dēļ WebAuth nevar izmantot visās Bitwarden lietotnēs. Ir ieteicams iespējot vēl kādu divpakāpju pieteikšanās nodrošinātāju, lai varētu piekļūt kontam, kad nav iespējams izmantot WebAuth."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Bitwarden divpakāpju pieteikšanās atkopes kods"
   },
diff --git a/apps/web/src/locales/ml/messages.json b/apps/web/src/locales/ml/messages.json
index 9103d2ce224..92f054f165a 100644
--- a/apps/web/src/locales/ml/messages.json
+++ b/apps/web/src/locales/ml/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/mr/messages.json b/apps/web/src/locales/mr/messages.json
index 759ef27fb20..d5a250988f3 100644
--- a/apps/web/src/locales/mr/messages.json
+++ b/apps/web/src/locales/mr/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/my/messages.json b/apps/web/src/locales/my/messages.json
index 1721ac49eec..42148397f33 100644
--- a/apps/web/src/locales/my/messages.json
+++ b/apps/web/src/locales/my/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/nb/messages.json b/apps/web/src/locales/nb/messages.json
index 01c6d0f5018..89c19d6f2c1 100644
--- a/apps/web/src/locales/nb/messages.json
+++ b/apps/web/src/locales/nb/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Det oppsto et problem med å lese sikkerhetsnøkkelen. Prøv igjen."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Din 2-trinnsinnloggingsgjenopprettingskode for Bitwarden"
   },
diff --git a/apps/web/src/locales/ne/messages.json b/apps/web/src/locales/ne/messages.json
index 01550ef8653..2e2a8eb697d 100644
--- a/apps/web/src/locales/ne/messages.json
+++ b/apps/web/src/locales/ne/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/nl/messages.json b/apps/web/src/locales/nl/messages.json
index a8b078fc78a..74f71009b7e 100644
--- a/apps/web/src/locales/nl/messages.json
+++ b/apps/web/src/locales/nl/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Er was een probleem met het lezen van de beveiligingssleutel. Probeer het nogmaals."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Vanwege platformbeperkingen kan WebAuthn niet in alle Bitwarden-applicaties gebruikt worden. Stel een andere tweestapsaanmeldingsaanbieder in zodat je je account kunt benaderen wanneer WebAuthn niet beschikbaar is."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Je herstelcode voor Bitwarden-tweestapsaanmelding"
   },
diff --git a/apps/web/src/locales/nn/messages.json b/apps/web/src/locales/nn/messages.json
index 2501b0c70a6..05ff9c62561 100644
--- a/apps/web/src/locales/nn/messages.json
+++ b/apps/web/src/locales/nn/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/or/messages.json b/apps/web/src/locales/or/messages.json
index 1721ac49eec..42148397f33 100644
--- a/apps/web/src/locales/or/messages.json
+++ b/apps/web/src/locales/or/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/pl/messages.json b/apps/web/src/locales/pl/messages.json
index d8a3f71550f..0421a1dbb1c 100644
--- a/apps/web/src/locales/pl/messages.json
+++ b/apps/web/src/locales/pl/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Wystąpił problem z odczytem klucza bezpieczeństwa. Spróbuj ponownie."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Z powodu ograniczeń platformy, klucze WebAuthn nie mogą być używane we wszystkich aplikacjach Bitwarden. Musisz włączyć inną metodę logowania dwustopniowego, aby zachować dostęp do konta w pozostałych sytuacjach."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Kod odzyskiwania konta Bitwarden"
   },
diff --git a/apps/web/src/locales/pt_BR/messages.json b/apps/web/src/locales/pt_BR/messages.json
index 5f62a8f4d12..fc77261296b 100644
--- a/apps/web/src/locales/pt_BR/messages.json
+++ b/apps/web/src/locales/pt_BR/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Houve um problema ao ler a chave de segurança. Tente novamente."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Devido as limitações da plataforma, o WebAuthn não pode ser usado em todos os aplicativos do Bitwarden. Configure outro provedor de login em duas etapas para poder acessar sua conta quando a WebAuthn não puder ser usada."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Seu código de recuperação de login em duas etapas do Bitwarden"
   },
diff --git a/apps/web/src/locales/pt_PT/messages.json b/apps/web/src/locales/pt_PT/messages.json
index f9aedc1f750..58cac178a0c 100644
--- a/apps/web/src/locales/pt_PT/messages.json
+++ b/apps/web/src/locales/pt_PT/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Ocorreu um problema ao ler a chave de segurança. Tente novamente."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Devido a limitações da plataforma, o WebAuthn não pode ser utilizado em todas as aplicações Bitwarden. Deve configurar outro fornecedor de verificação de dois passos para poder aceder à sua conta quando o WebAuthn não puder ser utilizado."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "O seu código Bitwarden de recuperação da verificação de dois passos"
   },
diff --git a/apps/web/src/locales/ro/messages.json b/apps/web/src/locales/ro/messages.json
index 3b36b131078..7a97124efff 100644
--- a/apps/web/src/locales/ro/messages.json
+++ b/apps/web/src/locales/ro/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "A apărut o problemă la citirea cheii de securitate. Încercați din nou."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Codul dvs. Bitwarden de recuperare a autentificării în două etape"
   },
diff --git a/apps/web/src/locales/ru/messages.json b/apps/web/src/locales/ru/messages.json
index 4422fdb7ca8..5cdd746d6c7 100644
--- a/apps/web/src/locales/ru/messages.json
+++ b/apps/web/src/locales/ru/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Не удалось прочитать ключ безопасности. Попробуйте снова."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Из-за ограничений платформы WebAuthn нельзя использовать во всех приложениях Bitwarden. Вы должны настроить другого провайдера двухэтапной аутентификации, чтобы иметь возможность получить доступ к своей учетной записи, когда WebAuthn не может быть использован."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Ваш код восстановления двухэтапной аутентификации Bitwarden"
   },
diff --git a/apps/web/src/locales/si/messages.json b/apps/web/src/locales/si/messages.json
index a6a477018e0..ad39f61f4f8 100644
--- a/apps/web/src/locales/si/messages.json
+++ b/apps/web/src/locales/si/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/sk/messages.json b/apps/web/src/locales/sk/messages.json
index b0c97a4b611..8eecc64856f 100644
--- a/apps/web/src/locales/sk/messages.json
+++ b/apps/web/src/locales/sk/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Problém pri čítaní bezpečnostného kľúča. Skúste to znova."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Vzhľadom na obmedzenia platforiem, WebAuthn nemôže byť použitý vo všetkých Bitwarden aplikáciách. Mali by ste nastaviť inú formu dvojitého overenia, aby ste sa mohli prihlásiť k svojmu účtu ak nie je možné použiť WebAuthn."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Váš Bitwarden záchranný kód pre dvojstupňové overovanie"
   },
diff --git a/apps/web/src/locales/sl/messages.json b/apps/web/src/locales/sl/messages.json
index 7ea6fdea6ce..503a4d47320 100644
--- a/apps/web/src/locales/sl/messages.json
+++ b/apps/web/src/locales/sl/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/sr/messages.json b/apps/web/src/locales/sr/messages.json
index 1499ab4a526..8852dcf3b4c 100644
--- a/apps/web/src/locales/sr/messages.json
+++ b/apps/web/src/locales/sr/messages.json
@@ -2413,9 +2413,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Догодила се грешка приликом читања безбедносног кључа. Покушајте поново."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Због ограничења платформе, WebAuthn се не могу користити на свим Bitwarden апликацијама. Требали бисте подесити другог добављача услуге пријављивања у два корака како бисте могли да приступите свом налогу када WebAuthn не могу да се користе."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Ваш Bitwarden код за опоравак пријаве у два корака"
   },
diff --git a/apps/web/src/locales/sr_CS/messages.json b/apps/web/src/locales/sr_CS/messages.json
index 3b9149d03c0..93a10704236 100644
--- a/apps/web/src/locales/sr_CS/messages.json
+++ b/apps/web/src/locales/sr_CS/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/sr_CY/messages.json b/apps/web/src/locales/sr_CY/messages.json
index 7afa197b560..573e93a51dd 100644
--- a/apps/web/src/locales/sr_CY/messages.json
+++ b/apps/web/src/locales/sr_CY/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Догодила се грешка приликом читања безбедносног кључа. Покушајте поново."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Због ограничења платформе, WebAuthn се не могу користити на свим Bitwarden апликацијама. Требали бисте подесити другог добављача услуге пријављивања у два корака како бисте могли да приступите свом налогу када WebAuthn не могу да се користе."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Ваш Bitwarden код за опоравак пријаве у два корака"
   },
diff --git a/apps/web/src/locales/sv/messages.json b/apps/web/src/locales/sv/messages.json
index df2638c090a..02cb7f82927 100644
--- a/apps/web/src/locales/sv/messages.json
+++ b/apps/web/src/locales/sv/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Det gick inte att läsa säkerhetsnyckeln. Försök igen."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "På grund av plattformsbegränsningar kan WebAuthn inte användas på alla Bitwarden-applikationer. Du bör konfigurera en annan leverantör av tvåstegsinloggning så att du kan komma åt ditt konto när WebAuthn inte kan användas."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Din återställningskod för tvåstegsverifiering"
   },
diff --git a/apps/web/src/locales/te/messages.json b/apps/web/src/locales/te/messages.json
index 1721ac49eec..42148397f33 100644
--- a/apps/web/src/locales/te/messages.json
+++ b/apps/web/src/locales/te/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/th/messages.json b/apps/web/src/locales/th/messages.json
index 4b947cc72a1..5c70db799a3 100644
--- a/apps/web/src/locales/th/messages.json
+++ b/apps/web/src/locales/th/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
diff --git a/apps/web/src/locales/tr/messages.json b/apps/web/src/locales/tr/messages.json
index c9e3fb51f28..388c4421917 100644
--- a/apps/web/src/locales/tr/messages.json
+++ b/apps/web/src/locales/tr/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Güvenlik anahtarını okurken bir sorun oluştu. Tekrar deneyin."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Platform sınırlamaları nedeniyle WebAuthn tüm Bitwarden uygulamalarında kullanılamaz. WebAuthn kullanılamadığında hesabınıza erişebilmek için başka bir iki aşamalı doğrulama yöntemi ayarlamanız gerekir."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Bitwarden iki aşamalı giriş kurtarma kodunuz"
   },
diff --git a/apps/web/src/locales/uk/messages.json b/apps/web/src/locales/uk/messages.json
index 397e1be794a..b12d0addc3c 100644
--- a/apps/web/src/locales/uk/messages.json
+++ b/apps/web/src/locales/uk/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Сталася проблема при читанні ключа безпеки. Спробуйте знову."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "У зв'язку з обмеженнями платформи, WebAuthn не можна використовувати в усіх програмах Bitwarden. Вам слід активувати іншого провайдера двоетапної перевірки, щоб мати змогу отримати доступ до свого облікового запису, коли неможливо скористатися WebAuthn."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Ваш код відновлення двоетапної перевірки Bitwarden"
   },
diff --git a/apps/web/src/locales/vi/messages.json b/apps/web/src/locales/vi/messages.json
index e78bb9414cd..69c30f57e08 100644
--- a/apps/web/src/locales/vi/messages.json
+++ b/apps/web/src/locales/vi/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "Có vấn đề khi đọc khóa bảo mật. Vui lòng thử lại."
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Do hạn chế của nền tảng, WebAuthn không thể sử dụng trên tất cả các ứng dụng Bitwarden. Bạn nên thiết lập một nhà cung cấp đăng nhập hai bước khác để có thể truy cập tài khoản của mình khi WebAuthn không thể sử dụng."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "Mã khôi phục đăng nhập hai bước của Bitwarden"
   },
diff --git a/apps/web/src/locales/zh_CN/messages.json b/apps/web/src/locales/zh_CN/messages.json
index 0f904cb85e8..cdd5ed2405d 100644
--- a/apps/web/src/locales/zh_CN/messages.json
+++ b/apps/web/src/locales/zh_CN/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "读取安全密钥时出现问题。请重试。"
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "由于平台限制，WebAuthn 不能在所有 Bitwarden 应用程序上使用。您应该启用另一个两步登录提供程序，以便在无法使用 WebAuthn 时可以访问您的账户。"
-  },
   "twoFactorRecoveryYourCode": {
     "message": "您的 Bitwarden 两步登录恢复代码"
   },
diff --git a/apps/web/src/locales/zh_TW/messages.json b/apps/web/src/locales/zh_TW/messages.json
index f7d7b16ec8a..31e4cc0b5ac 100644
--- a/apps/web/src/locales/zh_TW/messages.json
+++ b/apps/web/src/locales/zh_TW/messages.json
@@ -2451,9 +2451,6 @@
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "讀取安全鑰匙時發生問題。請再試一次。"
   },
-  "twoFactorWebAuthnWarning1": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used."
-  },
   "twoFactorRecoveryYourCode": {
     "message": "您的 Bitwarden 兩步驟登入復原碼"
   },

From b87cb2ba245ad35098a4095adb175edd4b02e63b Mon Sep 17 00:00:00 2001
From: Jonathan Prusik <jprusik@users.noreply.github.com>
Date: Fri, 22 Aug 2025 11:09:00 -0400
Subject: [PATCH 26/34] [PM-25025] Additional defense against top-layer content
 (#16101)

* additional defense against top-layer content

* fix error and update tests
---
 ...tofill-inline-menu-content.service.spec.ts | 31 ++++++++++---
 .../autofill-inline-menu-content.service.ts   | 46 ++++++++++++-------
 2 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.spec.ts b/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.spec.ts
index 62f9dbec824..2c9484c3a8b 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.spec.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.spec.ts
@@ -41,6 +41,10 @@ describe("AutofillInlineMenuContentService", () => {
       autofillInlineMenuContentService as any,
       "sendExtensionMessage",
     );
+    jest.spyOn(autofillInlineMenuContentService as any, "getPageIsOpaque");
+    jest
+      .spyOn(autofillInlineMenuContentService as any, "getPageTopLayerInUse")
+      .mockResolvedValue(false);
   });
 
   afterEach(() => {
@@ -386,30 +390,45 @@ describe("AutofillInlineMenuContentService", () => {
       expect(globalThis.document.body.insertBefore).not.toHaveBeenCalled();
     });
 
+    it("closes the inline menu if the page has content in the top layer", async () => {
+      document.querySelector("html").style.opacity = "1";
+      document.body.style.opacity = "1";
+
+      jest
+        .spyOn(autofillInlineMenuContentService as any, "getPageTopLayerInUse")
+        .mockResolvedValue(true);
+
+      await autofillInlineMenuContentService["handlePageMutations"]([mockBodyMutationRecord]);
+
+      expect(autofillInlineMenuContentService["getPageIsOpaque"]).toHaveReturnedWith(true);
+      expect(autofillInlineMenuContentService["closeInlineMenu"]).toHaveBeenCalled();
+    });
+
     it("closes the inline menu if the page body is not sufficiently opaque", async () => {
       document.querySelector("html").style.opacity = "0.9";
       document.body.style.opacity = "0";
-      autofillInlineMenuContentService["handlePageMutations"]([mockBodyMutationRecord]);
+      await autofillInlineMenuContentService["handlePageMutations"]([mockBodyMutationRecord]);
 
-      expect(autofillInlineMenuContentService["pageIsOpaque"]).toBe(false);
+      expect(autofillInlineMenuContentService["getPageIsOpaque"]).toHaveReturnedWith(false);
       expect(autofillInlineMenuContentService["closeInlineMenu"]).toHaveBeenCalled();
     });
 
     it("closes the inline menu if the page html is not sufficiently opaque", async () => {
       document.querySelector("html").style.opacity = "0.3";
       document.body.style.opacity = "0.7";
-      autofillInlineMenuContentService["handlePageMutations"]([mockHTMLMutationRecord]);
+      await autofillInlineMenuContentService["handlePageMutations"]([mockHTMLMutationRecord]);
 
-      expect(autofillInlineMenuContentService["pageIsOpaque"]).toBe(false);
+      expect(autofillInlineMenuContentService["getPageIsOpaque"]).toHaveReturnedWith(false);
       expect(autofillInlineMenuContentService["closeInlineMenu"]).toHaveBeenCalled();
     });
 
     it("does not close the inline menu if the page html and body is sufficiently opaque", async () => {
       document.querySelector("html").style.opacity = "0.9";
       document.body.style.opacity = "1";
-      autofillInlineMenuContentService["handlePageMutations"]([mockBodyMutationRecord]);
+      await autofillInlineMenuContentService["handlePageMutations"]([mockBodyMutationRecord]);
+      await waitForIdleCallback();
 
-      expect(autofillInlineMenuContentService["pageIsOpaque"]).toBe(true);
+      expect(autofillInlineMenuContentService["getPageIsOpaque"]).toHaveReturnedWith(true);
       expect(autofillInlineMenuContentService["closeInlineMenu"]).not.toHaveBeenCalled();
     });
 
diff --git a/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.ts b/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.ts
index de401bf7e28..c531215af88 100644
--- a/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.ts
+++ b/apps/browser/src/autofill/overlay/inline-menu/content/autofill-inline-menu-content.service.ts
@@ -33,7 +33,6 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
   private listElement?: HTMLElement;
   private htmlMutationObserver: MutationObserver;
   private bodyMutationObserver: MutationObserver;
-  private pageIsOpaque = true;
   private inlineMenuElementsMutationObserver: MutationObserver;
   private containerElementMutationObserver: MutationObserver;
   private mutationObserverIterations = 0;
@@ -52,7 +51,6 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
   };
 
   constructor() {
-    this.checkPageOpacity();
     this.setupMutationObserver();
   }
 
@@ -405,20 +403,35 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
     });
   };
 
-  private checkPageOpacity = () => {
-    this.pageIsOpaque = this.getPageIsOpaque();
+  private checkPageRisks = async () => {
+    const pageIsOpaque = await this.getPageIsOpaque();
+    const pageTopLayerInUse = await this.getPageTopLayerInUse();
 
-    if (!this.pageIsOpaque) {
+    const risksFound = !pageIsOpaque || pageTopLayerInUse;
+
+    if (risksFound) {
       this.closeInlineMenu();
     }
+
+    return risksFound;
+  };
+
+  /*
+   * Checks for known risks at the page level
+   */
+  private handlePageMutations = async (mutations: MutationRecord[]) => {
+    if (mutations.some(({ type }) => type === "attributes")) {
+      await this.checkPageRisks();
+    }
   };
 
-  private handlePageMutations = (mutations: MutationRecord[]) => {
-    for (const mutation of mutations) {
-      if (mutation.type === "attributes") {
-        this.checkPageOpacity();
-      }
-    }
+  /**
+   * Checks if the page top layer has content (will obscure/overlap the inline menu)
+   */
+  private getPageTopLayerInUse = () => {
+    const pageHasOpenPopover = !!globalThis.document.querySelector(":popover-open");
+
+    return pageHasOpenPopover;
   };
 
   /**
@@ -427,7 +440,7 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
    * of parents below the body. Assumes the target element will be a direct child of the page
    * `body` (enforced elsewhere).
    */
-  private getPageIsOpaque() {
+  private getPageIsOpaque = () => {
     // These are computed style values, so we don't need to worry about non-float values
     // for `opacity`, here
     const htmlOpacity = globalThis.window.getComputedStyle(
@@ -441,17 +454,16 @@ export class AutofillInlineMenuContentService implements AutofillInlineMenuConte
     const opacityThreshold = 0.6;
 
     return parseFloat(htmlOpacity) > opacityThreshold && parseFloat(bodyOpacity) > opacityThreshold;
-  }
+  };
 
   /**
    * Processes the mutation of the element that contains the inline menu. Will trigger when an
    * idle moment in the execution of the main thread is detected.
    */
   private processContainerElementMutation = async (containerElement: HTMLElement) => {
-    // If the computed opacity of the body and parent is not sufficiently opaque, tear
-    // down and prevent building the inline menu experience.
-    this.checkPageOpacity();
-    if (!this.pageIsOpaque) {
+    // If the page contains risks, tear down and prevent building the inline menu experience.
+    const pageRisksFound = await this.checkPageRisks();
+    if (pageRisksFound) {
       return;
     }
 

From ba7e5fdcdea59ca64491ee6bfb494f6589e4e863 Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github.com>
Date: Fri, 22 Aug 2025 16:21:49 +0000
Subject: [PATCH 27/34] Bumped client version(s)

---
 apps/browser/package.json         | 2 +-
 apps/browser/src/manifest.json    | 2 +-
 apps/browser/src/manifest.v3.json | 2 +-
 package-lock.json                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/browser/package.json b/apps/browser/package.json
index e75d2b235db..0f47e5d93d3 100644
--- a/apps/browser/package.json
+++ b/apps/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/browser",
-  "version": "2025.8.0",
+  "version": "2025.8.1",
   "scripts": {
     "build": "npm run build:chrome",
     "build:chrome": "cross-env BROWSER=chrome MANIFEST_VERSION=3 NODE_OPTIONS=\"--max-old-space-size=8192\" webpack",
diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json
index 2820be6dfe6..8eb970de6d2 100644
--- a/apps/browser/src/manifest.json
+++ b/apps/browser/src/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extName__",
   "short_name": "Bitwarden",
-  "version": "2025.8.0",
+  "version": "2025.8.1",
   "description": "__MSG_extDesc__",
   "default_locale": "en",
   "author": "Bitwarden Inc.",
diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json
index 5af56a1ad96..c4c47f7aacf 100644
--- a/apps/browser/src/manifest.v3.json
+++ b/apps/browser/src/manifest.v3.json
@@ -3,7 +3,7 @@
   "minimum_chrome_version": "102.0",
   "name": "__MSG_extName__",
   "short_name": "Bitwarden",
-  "version": "2025.8.0",
+  "version": "2025.8.1",
   "description": "__MSG_extDesc__",
   "default_locale": "en",
   "author": "Bitwarden Inc.",
diff --git a/package-lock.json b/package-lock.json
index c0958eab200..956bb34f873 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -191,7 +191,7 @@
     },
     "apps/browser": {
       "name": "@bitwarden/browser",
-      "version": "2025.8.0"
+      "version": "2025.8.1"
     },
     "apps/cli": {
       "name": "@bitwarden/cli",

From 4676a122da7bebd99d9e1fd79be3ede8d92fcd09 Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Fri, 22 Aug 2025 09:32:36 -0700
Subject: [PATCH 28/34] [PM-24143] Search performance improvements (#16070)

* [PM-24143] Add perUserCache$ to SearchService index$

* [PM-24143] Cleanup and optimize isSearchable

* [PM-24143] Remove unused search flags and subscription from the vault-items component

* [PM-24143] Add search text for desktop vault items. Consolidate SearchTextDebounceInterval constant to SearchService

* [PM-24143] Ensure cipher search indexing is non-blocking

* [PM-24143] Remove redundant index ciphers operation

* [PM-24143] Add search performance measurements

* [PM-24143] Remove artificial delay

* [PM-24143] Remove startWith from index$ to avoid basic search with lunr queries

* [PM-24143] Re-organize isSearchable to check long lunr queries for index existence
---
 .../vault-search/vault-v2-search.component.ts |  3 +-
 .../app/vault/vault-items-v2.component.ts     |  5 +-
 .../vault/individual-vault/vault.component.ts |  2 +-
 .../vault/components/vault-items.component.ts | 26 +----
 .../src/vault/abstractions/search.service.ts  |  7 +-
 .../src/vault/services/cipher.service.ts      |  5 +-
 .../src/vault/services/search.service.spec.ts | 97 +++++++++++++++++++
 .../src/vault/services/search.service.ts      | 48 ++++++---
 8 files changed, 147 insertions(+), 46 deletions(-)
 create mode 100644 libs/common/src/vault/services/search.service.spec.ts

diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts
index fe2baf463cf..72df3cba41a 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/vault-search/vault-v2-search.component.ts
@@ -5,12 +5,11 @@ import { FormsModule } from "@angular/forms";
 import { Subject, Subscription, debounceTime, distinctUntilChanged, filter } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { SearchTextDebounceInterval } from "@bitwarden/common/vault/services/search.service";
 import { SearchModule } from "@bitwarden/components";
 
 import { VaultPopupItemsService } from "../../../services/vault-popup-items.service";
 
-const SearchTextDebounceInterval = 200;
-
 @Component({
   imports: [CommonModule, SearchModule, JslibModule, FormsModule],
   selector: "app-vault-v2-search",
diff --git a/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts b/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts
index 000281c5807..e99e05e385a 100644
--- a/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-items-v2.component.ts
@@ -2,7 +2,7 @@ import { ScrollingModule } from "@angular/cdk/scrolling";
 import { CommonModule } from "@angular/common";
 import { Component } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { distinctUntilChanged } from "rxjs";
+import { distinctUntilChanged, debounceTime } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/vault/components/vault-items.component";
@@ -10,6 +10,7 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { SearchService } from "@bitwarden/common/vault/abstractions/search.service";
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { SearchTextDebounceInterval } from "@bitwarden/common/vault/services/search.service";
 import {
   CipherViewLike,
   CipherViewLikeUtils,
@@ -35,7 +36,7 @@ export class VaultItemsV2Component<C extends CipherViewLike> extends BaseVaultIt
     super(searchService, cipherService, accountService, restrictedItemTypesService);
 
     this.searchBarService.searchText$
-      .pipe(distinctUntilChanged(), takeUntilDestroyed())
+      .pipe(debounceTime(SearchTextDebounceInterval), distinctUntilChanged(), takeUntilDestroyed())
       .subscribe((searchText) => {
         this.searchText = searchText!;
       });
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 7593e9c59bf..35520a812a8 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -68,6 +68,7 @@ import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { ServiceUtils } from "@bitwarden/common/vault/service-utils";
 import { RestrictedItemTypesService } from "@bitwarden/common/vault/services/restricted-item-types.service";
+import { SearchTextDebounceInterval } from "@bitwarden/common/vault/services/search.service";
 import {
   CipherViewLike,
   CipherViewLikeUtils,
@@ -137,7 +138,6 @@ import { VaultHeaderComponent } from "./vault-header/vault-header.component";
 import { VaultOnboardingComponent } from "./vault-onboarding/vault-onboarding.component";
 
 const BroadcasterSubscriptionId = "VaultComponent";
-const SearchTextDebounceInterval = 200;
 
 @Component({
   selector: "app-vault",
diff --git a/libs/angular/src/vault/components/vault-items.component.ts b/libs/angular/src/vault/components/vault-items.component.ts
index 75ca5608208..8ae4acfb687 100644
--- a/libs/angular/src/vault/components/vault-items.component.ts
+++ b/libs/angular/src/vault/components/vault-items.component.ts
@@ -1,18 +1,16 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
+import { Directive, EventEmitter, Input, OnDestroy, Output } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import {
   BehaviorSubject,
   Subject,
   combineLatest,
   filter,
-  from,
   map,
   of,
   shareReplay,
   switchMap,
-  takeUntil,
 } from "rxjs";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@@ -29,7 +27,7 @@ import {
 } from "@bitwarden/common/vault/utils/cipher-view-like-utils";
 
 @Directive()
-export class VaultItemsComponent<C extends CipherViewLike> implements OnInit, OnDestroy {
+export class VaultItemsComponent<C extends CipherViewLike> implements OnDestroy {
   @Input() activeCipherId: string = null;
   @Output() onCipherClicked = new EventEmitter<C>();
   @Output() onCipherRightClicked = new EventEmitter<C>();
@@ -55,12 +53,9 @@ export class VaultItemsComponent<C extends CipherViewLike> implements OnInit, On
     shareReplay({ bufferSize: 1, refCount: true }),
   );
 
-  protected searchPending = false;
-
   /** Construct filters as an observable so it can be appended to the cipher stream. */
   private _filter$ = new BehaviorSubject<(cipher: C) => boolean | null>(null);
   private destroy$ = new Subject<void>();
-  private isSearchable: boolean = false;
   private _searchText$ = new BehaviorSubject<string>("");
 
   get searchText() {
@@ -87,19 +82,6 @@ export class VaultItemsComponent<C extends CipherViewLike> implements OnInit, On
     this.subscribeToCiphers();
   }
 
-  async ngOnInit() {
-    combineLatest([getUserId(this.accountService.activeAccount$), this._searchText$])
-      .pipe(
-        switchMap(([userId, searchText]) =>
-          from(this.searchService.isSearchable(userId, searchText)),
-        ),
-        takeUntil(this.destroy$),
-      )
-      .subscribe((isSearchable) => {
-        this.isSearchable = isSearchable;
-      });
-  }
-
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
@@ -140,10 +122,6 @@ export class VaultItemsComponent<C extends CipherViewLike> implements OnInit, On
     this.onAddCipherOptions.emit();
   }
 
-  isSearching() {
-    return !this.searchPending && this.isSearchable;
-  }
-
   protected deletedFilter: (cipher: C) => boolean = (c) =>
     CipherViewLikeUtils.isDeleted(c) === this.deleted;
 
diff --git a/libs/common/src/vault/abstractions/search.service.ts b/libs/common/src/vault/abstractions/search.service.ts
index 57f301261c2..6b01302613c 100644
--- a/libs/common/src/vault/abstractions/search.service.ts
+++ b/libs/common/src/vault/abstractions/search.service.ts
@@ -9,7 +9,12 @@ export abstract class SearchService {
   abstract indexedEntityId$(userId: UserId): Observable<IndexedEntityId | null>;
 
   abstract clearIndex(userId: UserId): Promise<void>;
-  abstract isSearchable(userId: UserId, query: string): Promise<boolean>;
+
+  /**
+   * Checks if the query is long enough to be searchable.
+   * For short Lunr.js queries (starts with '>'), a valid search index must exist for the user.
+   */
+  abstract isSearchable(userId: UserId, query: string | null): Promise<boolean>;
   abstract indexCiphers(
     userId: UserId,
     ciphersToIndex: CipherView[],
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index 2f225d4dfc5..60e5bfe04e4 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -183,8 +183,7 @@ export class CipherService implements CipherServiceAbstraction {
     ]).pipe(
       filter(([ciphers, _, keys]) => ciphers != null && keys != null), // Skip if ciphers haven't been loaded yor synced yet
       switchMap(() => this.getAllDecrypted(userId)),
-      tap(async (decrypted) => {
-        await this.searchService.indexCiphers(userId, decrypted);
+      tap(() => {
         this.messageSender.send("updateOverlayCiphers");
       }),
     );
@@ -216,7 +215,7 @@ export class CipherService implements CipherServiceAbstraction {
       if (value == null) {
         await this.searchService.clearIndex(userId);
       } else {
-        await this.searchService.indexCiphers(userId, value);
+        void this.searchService.indexCiphers(userId, value);
       }
     }
   }
diff --git a/libs/common/src/vault/services/search.service.spec.ts b/libs/common/src/vault/services/search.service.spec.ts
new file mode 100644
index 00000000000..9df6ec5ce8d
--- /dev/null
+++ b/libs/common/src/vault/services/search.service.spec.ts
@@ -0,0 +1,97 @@
+import { BehaviorSubject } from "rxjs";
+
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { UserId } from "@bitwarden/common/types/guid";
+
+import { FakeStateProvider, mockAccountServiceWith } from "../../../spec";
+
+import { SearchService } from "./search.service";
+
+describe("SearchService", () => {
+  let fakeStateProvider: FakeStateProvider;
+  let service: SearchService;
+
+  const userId = "user-id" as UserId;
+  const mockLogService = {
+    error: jest.fn(),
+    measure: jest.fn(),
+  };
+  const mockLocale$ = new BehaviorSubject<string>("en");
+  const mockI18nService = {
+    locale$: mockLocale$.asObservable(),
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    fakeStateProvider = new FakeStateProvider(mockAccountServiceWith(userId));
+    service = new SearchService(
+      mockLogService as unknown as LogService,
+      mockI18nService as unknown as I18nService,
+      fakeStateProvider,
+    );
+  });
+
+  describe("isSearchable", () => {
+    let mockIndex$: jest.Mock;
+    beforeEach(() => {
+      mockIndex$ = jest.fn();
+      service["index$"] = mockIndex$;
+    });
+
+    it("returns false if the query is empty", async () => {
+      const result = await service.isSearchable(userId, "");
+      expect(result).toBe(false);
+      // Ensure we do not call the expensive index$ method
+      expect(mockIndex$).not.toHaveBeenCalled();
+    });
+
+    it("returns false if the query is null", async () => {
+      const result = await service.isSearchable(userId, null as any);
+      expect(result).toBe(false);
+      // Ensure we do not call the expensive index$ method
+      expect(mockIndex$).not.toHaveBeenCalled();
+    });
+
+    it("return true if the query is longer than searchableMinLength", async () => {
+      service["searchableMinLength"] = 3;
+      const result = await service.isSearchable(userId, "test");
+      expect(result).toBe(true);
+      // Ensure we do not call the expensive index$ method
+      expect(mockIndex$).not.toHaveBeenCalled();
+    });
+
+    it("returns false if the query is shorter than searchableMinLength", async () => {
+      service["searchableMinLength"] = 5;
+      const result = await service.isSearchable(userId, "test");
+      expect(result).toBe(false);
+      // Ensure we do not call the expensive index$ method
+      expect(mockIndex$).not.toHaveBeenCalled();
+    });
+
+    it("returns false for short Lunr query with missing index", async () => {
+      mockIndex$.mockReturnValue(new BehaviorSubject(null));
+      service["searchableMinLength"] = 3;
+      const result = await service.isSearchable(userId, ">l");
+      expect(result).toBe(false);
+      expect(mockIndex$).toHaveBeenCalledWith(userId);
+    });
+
+    it("returns false for long Lunr query with missing index", async () => {
+      mockIndex$.mockReturnValue(new BehaviorSubject(null));
+      service["searchableMinLength"] = 3;
+      const result = await service.isSearchable(userId, ">longer");
+      expect(result).toBe(false);
+      expect(mockIndex$).toHaveBeenCalledWith(userId);
+    });
+
+    it("returns true for short Lunr query with index", async () => {
+      mockIndex$.mockReturnValue(new BehaviorSubject(true));
+      service["searchableMinLength"] = 3;
+      const result = await service.isSearchable(userId, ">l");
+      expect(result).toBe(true);
+      expect(mockIndex$).toHaveBeenCalledWith(userId);
+    });
+  });
+});
diff --git a/libs/common/src/vault/services/search.service.ts b/libs/common/src/vault/services/search.service.ts
index 614fba4a7ca..cb6ac4a0ed4 100644
--- a/libs/common/src/vault/services/search.service.ts
+++ b/libs/common/src/vault/services/search.service.ts
@@ -4,6 +4,8 @@ import * as lunr from "lunr";
 import { Observable, firstValueFrom, map } from "rxjs";
 import { Jsonify } from "type-fest";
 
+import { perUserCache$ } from "@bitwarden/common/vault/utils/observable-utilities";
+
 import { UriMatchStrategy } from "../../models/domain/domain-service";
 import { I18nService } from "../../platform/abstractions/i18n.service";
 import { LogService } from "../../platform/abstractions/log.service";
@@ -21,6 +23,9 @@ import { CipherType } from "../enums/cipher-type";
 import { CipherView } from "../models/view/cipher.view";
 import { CipherViewLike, CipherViewLikeUtils } from "../utils/cipher-view-like-utils";
 
+// Time to wait before performing a search after the user stops typing.
+export const SearchTextDebounceInterval = 200; // milliseconds
+
 export type SerializedLunrIndex = {
   version: string;
   fields: string[];
@@ -101,11 +106,19 @@ export class SearchService implements SearchServiceAbstraction {
     return this.stateProvider.getUser(userId, LUNR_SEARCH_INDEX);
   }
 
-  private index$(userId: UserId): Observable<lunr.Index | null> {
+  private index$ = perUserCache$((userId: UserId) => {
     return this.searchIndexState(userId).state$.pipe(
-      map((searchIndex) => (searchIndex ? lunr.Index.load(searchIndex) : null)),
+      map((searchIndex) => {
+        let index: lunr.Index | null = null;
+        if (searchIndex) {
+          const loadTime = performance.now();
+          index = lunr.Index.load(searchIndex);
+          this.logService.measure(loadTime, "Vault", "SearchService", "index load");
+        }
+        return index;
+      }),
     );
-  }
+  });
 
   private searchIndexEntityIdState(userId: UserId): SingleUserState<IndexedEntityId | null> {
     return this.stateProvider.getUser(userId, LUNR_SEARCH_INDEXED_ENTITY_ID);
@@ -129,17 +142,22 @@ export class SearchService implements SearchServiceAbstraction {
     await this.searchIsIndexingState(userId).update(() => null);
   }
 
-  async isSearchable(userId: UserId, query: string): Promise<boolean> {
-    const time = performance.now();
+  async isSearchable(userId: UserId, query: string | null): Promise<boolean> {
     query = SearchService.normalizeSearchQuery(query);
-    const index = await this.getIndexForSearch(userId);
-    const notSearchable =
-      query == null ||
-      (index == null && query.length < this.searchableMinLength) ||
-      (index != null && query.length < this.searchableMinLength && query.indexOf(">") !== 0);
 
-    this.logService.measure(time, "Vault", "SearchService", "isSearchable");
-    return !notSearchable;
+    // Nothing to search if the query is null
+    if (query == null || query === "") {
+      return false;
+    }
+
+    const isLunrQuery = query.indexOf(">") === 0;
+    if (isLunrQuery) {
+      // Lunr queries always require an index
+      return (await this.getIndexForSearch(userId)) != null;
+    }
+
+    // Regular queries only require a minimum length
+    return query.length >= this.searchableMinLength;
   }
 
   async indexCiphers(
@@ -205,6 +223,7 @@ export class SearchService implements SearchServiceAbstraction {
     ciphers: C[],
   ): Promise<C[]> {
     const results: C[] = [];
+    const searchStartTime = performance.now();
     if (query != null) {
       query = SearchService.normalizeSearchQuery(query.trim().toLowerCase());
     }
@@ -236,7 +255,9 @@ export class SearchService implements SearchServiceAbstraction {
     const index = await this.getIndexForSearch(userId);
     if (index == null) {
       // Fall back to basic search if index is not available
-      return this.searchCiphersBasic(ciphers, query);
+      const basicResults = this.searchCiphersBasic(ciphers, query);
+      this.logService.measure(searchStartTime, "Vault", "SearchService", "basic search complete");
+      return basicResults;
     }
 
     const ciphersMap = new Map<string, C>();
@@ -270,6 +291,7 @@ export class SearchService implements SearchServiceAbstraction {
         }
       });
     }
+    this.logService.measure(searchStartTime, "Vault", "SearchService", "search complete");
     return results;
   }
 

From 6e9da95230b4ae9ad535205265c1ba462dd21a51 Mon Sep 17 00:00:00 2001
From: Jason Ng <jng@bitwarden.com>
Date: Fri, 22 Aug 2025 12:56:16 -0400
Subject: [PATCH 29/34] [PM-22371] remove end user activation flag (#16067)

---
 .../setup-extension.component.spec.ts          | 18 ------------------
 .../setup-extension.component.ts               |  8 +-------
 .../setup-extension-redirect.guard.spec.ts     | 17 -----------------
 .../guards/setup-extension-redirect.guard.ts   |  9 +--------
 .../registration-finish.component.ts           | 16 ----------------
 libs/common/src/enums/feature-flag.enum.ts     |  2 --
 6 files changed, 2 insertions(+), 68 deletions(-)

diff --git a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.spec.ts b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.spec.ts
index cd4d421a7b9..43ffe8fe71c 100644
--- a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.spec.ts
+++ b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.spec.ts
@@ -6,8 +6,6 @@ import { BehaviorSubject } from "rxjs";
 import { BrowserExtensionIcon } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { DeviceType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -22,7 +20,6 @@ describe("SetupExtensionComponent", () => {
   let fixture: ComponentFixture<SetupExtensionComponent>;
   let component: SetupExtensionComponent;
 
-  const getFeatureFlag = jest.fn().mockResolvedValue(false);
   const navigate = jest.fn().mockResolvedValue(true);
   const openExtension = jest.fn().mockResolvedValue(true);
   const update = jest.fn().mockResolvedValue(true);
@@ -34,14 +31,12 @@ describe("SetupExtensionComponent", () => {
     openExtension.mockClear();
     update.mockClear();
     setAnonLayoutWrapperData.mockClear();
-    getFeatureFlag.mockClear().mockResolvedValue(true);
     window.matchMedia = jest.fn().mockReturnValue(false);
 
     await TestBed.configureTestingModule({
       imports: [SetupExtensionComponent, RouterModule.forRoot([])],
       providers: [
         { provide: I18nService, useValue: { t: (key: string) => key } },
-        { provide: ConfigService, useValue: { getFeatureFlag } },
         { provide: WebBrowserInteractionService, useValue: { extensionInstalled$, openExtension } },
         { provide: PlatformUtilsService, useValue: { getDevice: () => DeviceType.UnknownBrowser } },
         { provide: AnonLayoutWrapperDataService, useValue: { setAnonLayoutWrapperData } },
@@ -74,19 +69,8 @@ describe("SetupExtensionComponent", () => {
   });
 
   describe("initialization", () => {
-    it("redirects to the vault if the feature flag is disabled", async () => {
-      Utils.isMobileBrowser = false;
-      getFeatureFlag.mockResolvedValue(false);
-      navigate.mockClear();
-
-      await component.ngOnInit();
-
-      expect(navigate).toHaveBeenCalledWith(["/vault"]);
-    });
-
     it("redirects to the vault if the user is on a mobile browser", async () => {
       Utils.isMobileBrowser = true;
-      getFeatureFlag.mockResolvedValue(true);
       navigate.mockClear();
 
       await component.ngOnInit();
@@ -96,12 +80,10 @@ describe("SetupExtensionComponent", () => {
 
     it("does not redirect the user", async () => {
       Utils.isMobileBrowser = false;
-      getFeatureFlag.mockResolvedValue(true);
       navigate.mockClear();
 
       await component.ngOnInit();
 
-      expect(getFeatureFlag).toHaveBeenCalledWith(FeatureFlag.PM19315EndUserActivationMvp);
       expect(navigate).not.toHaveBeenCalled();
     });
   });
diff --git a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts
index a36627081f2..558f0eb06c9 100644
--- a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts
+++ b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.ts
@@ -8,8 +8,6 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { BrowserExtensionIcon, Party } from "@bitwarden/assets/svg";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { StateProvider } from "@bitwarden/common/platform/state";
@@ -59,7 +57,6 @@ type SetupExtensionState = UnionOfValues<typeof SetupExtensionState>;
 })
 export class SetupExtensionComponent implements OnInit, OnDestroy {
   private webBrowserExtensionInteractionService = inject(WebBrowserInteractionService);
-  private configService = inject(ConfigService);
   private router = inject(Router);
   private destroyRef = inject(DestroyRef);
   private platformUtilsService = inject(PlatformUtilsService);
@@ -134,12 +131,9 @@ export class SetupExtensionComponent implements OnInit, OnDestroy {
 
   /** Conditionally redirects the user to the vault upon landing on the page. */
   async conditionallyRedirectUser() {
-    const isFeatureEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.PM19315EndUserActivationMvp,
-    );
     const isMobile = Utils.isMobileBrowser;
 
-    if (!isFeatureEnabled || isMobile) {
+    if (isMobile) {
       await this.dismissExtensionPage();
       await this.router.navigate(["/vault"]);
     }
diff --git a/apps/web/src/app/vault/guards/setup-extension-redirect.guard.spec.ts b/apps/web/src/app/vault/guards/setup-extension-redirect.guard.spec.ts
index e6fc03fd844..14f6763dbf9 100644
--- a/apps/web/src/app/vault/guards/setup-extension-redirect.guard.spec.ts
+++ b/apps/web/src/app/vault/guards/setup-extension-redirect.guard.spec.ts
@@ -4,8 +4,6 @@ import { BehaviorSubject } from "rxjs";
 
 import { VaultProfileService } from "@bitwarden/angular/vault/services/vault-profile.service";
 import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { StateProvider } from "@bitwarden/common/platform/state";
 
@@ -27,26 +25,17 @@ describe("setupExtensionRedirectGuard", () => {
   const extensionInstalled$ = new BehaviorSubject<boolean>(false);
   const state$ = new BehaviorSubject<boolean>(false);
   const createUrlTree = jest.fn();
-  const getFeatureFlag = jest.fn().mockImplementation((key) => {
-    if (key === FeatureFlag.PM19315EndUserActivationMvp) {
-      return Promise.resolve(true);
-    }
-
-    return Promise.resolve(false);
-  });
   const getProfileCreationDate = jest.fn().mockResolvedValue(seventeenDaysAgo);
 
   beforeEach(() => {
     Utils.isMobileBrowser = false;
 
-    getFeatureFlag.mockClear();
     getProfileCreationDate.mockClear();
     createUrlTree.mockClear();
 
     TestBed.configureTestingModule({
       providers: [
         { provide: Router, useValue: { createUrlTree } },
-        { provide: ConfigService, useValue: { getFeatureFlag } },
         { provide: AccountService, useValue: { activeAccount$ } },
         { provide: StateProvider, useValue: { getUser: () => ({ state$ }) } },
         { provide: WebBrowserInteractionService, useValue: { extensionInstalled$ } },
@@ -81,12 +70,6 @@ describe("setupExtensionRedirectGuard", () => {
     expect(await setupExtensionGuard()).toBe(true);
   });
 
-  it("returns `true` when the feature flag is disabled", async () => {
-    getFeatureFlag.mockResolvedValueOnce(false);
-
-    expect(await setupExtensionGuard()).toBe(true);
-  });
-
   it("returns `true` when the user is on a mobile device", async () => {
     Utils.isMobileBrowser = true;
 
diff --git a/apps/web/src/app/vault/guards/setup-extension-redirect.guard.ts b/apps/web/src/app/vault/guards/setup-extension-redirect.guard.ts
index 983fd8ed0aa..5355ebf7232 100644
--- a/apps/web/src/app/vault/guards/setup-extension-redirect.guard.ts
+++ b/apps/web/src/app/vault/guards/setup-extension-redirect.guard.ts
@@ -4,8 +4,6 @@ import { firstValueFrom, map } from "rxjs";
 
 import { VaultProfileService } from "@bitwarden/angular/vault/services/vault-profile.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import {
   SETUP_EXTENSION_DISMISSED_DISK,
@@ -26,7 +24,6 @@ export const SETUP_EXTENSION_DISMISSED = new UserKeyDefinition<boolean>(
 
 export const setupExtensionRedirectGuard: CanActivateFn = async () => {
   const router = inject(Router);
-  const configService = inject(ConfigService);
   const accountService = inject(AccountService);
   const vaultProfileService = inject(VaultProfileService);
   const stateProvider = inject(StateProvider);
@@ -34,13 +31,9 @@ export const setupExtensionRedirectGuard: CanActivateFn = async () => {
 
   const isMobile = Utils.isMobileBrowser;
 
-  const endUserFeatureEnabled = await configService.getFeatureFlag(
-    FeatureFlag.PM19315EndUserActivationMvp,
-  );
-
   // The extension page isn't applicable for mobile users, do not redirect them.
   // Include before any other checks to avoid unnecessary processing.
-  if (!endUserFeatureEnabled || isMobile) {
+  if (isMobile) {
     return true;
   }
 
diff --git a/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts b/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts
index dac62f039ee..952b9e9ce75 100644
--- a/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts
+++ b/libs/auth/src/angular/registration/registration-finish/registration-finish.component.ts
@@ -10,9 +10,7 @@ import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/mod
 import { AccountApiService } from "@bitwarden/common/auth/abstractions/account-api.service";
 import { RegisterVerificationEmailClickedRequest } from "@bitwarden/common/auth/models/request/registration/register-verification-email-clicked.request";
 import { HttpStatusCode } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
@@ -79,7 +77,6 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
     private logService: LogService,
     private anonLayoutWrapperDataService: AnonLayoutWrapperDataService,
     private loginSuccessHandlerService: LoginSuccessHandlerService,
-    private configService: ConfigService,
   ) {}
 
   async ngOnInit() {
@@ -189,19 +186,6 @@ export class RegistrationFinishComponent implements OnInit, OnDestroy {
         return;
       }
 
-      const endUserActivationFlagEnabled = await this.configService.getFeatureFlag(
-        FeatureFlag.PM19315EndUserActivationMvp,
-      );
-
-      if (!endUserActivationFlagEnabled) {
-        // Only show the toast when the end user activation feature flag is _not_ enabled
-        this.toastService.showToast({
-          variant: "success",
-          title: null,
-          message: this.i18nService.t("youHaveBeenLoggedIn"),
-        });
-      }
-
       await this.loginSuccessHandlerService.run(authenticationResult.userId);
 
       await this.router.navigate(["/vault"]);
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index a36eb68dc71..7ab85139f4c 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -50,7 +50,6 @@ export enum FeatureFlag {
   PM22136_SdkCipherEncryption = "pm-22136-sdk-cipher-encryption",
   CipherKeyEncryption = "cipher-key-encryption",
   RemoveCardItemTypePolicy = "pm-16442-remove-card-item-type-policy",
-  PM19315EndUserActivationMvp = "pm-19315-end-user-activation-mvp",
 
   /* Platform */
   IpcChannelFramework = "ipc-channel-framework",
@@ -92,7 +91,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.PM19941MigrateCipherDomainToSdk]: FALSE,
   [FeatureFlag.RemoveCardItemTypePolicy]: FALSE,
   [FeatureFlag.PM22134SdkCipherListView]: FALSE,
-  [FeatureFlag.PM19315EndUserActivationMvp]: FALSE,
   [FeatureFlag.PM22136_SdkCipherEncryption]: FALSE,
 
   /* Auth */

From a3f729ef8de045bc09f5984181e6a81d0ceefc3b Mon Sep 17 00:00:00 2001
From: Github Actions <actions@github.com>
Date: Fri, 22 Aug 2025 17:21:03 +0000
Subject: [PATCH 30/34] Bumped client version(s)

---
 apps/desktop/package.json          | 2 +-
 apps/desktop/src/package-lock.json | 4 ++--
 apps/desktop/src/package.json      | 2 +-
 package-lock.json                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 42eb7017e03..ff958c0d8e6 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.8.1",
+  "version": "2025.8.2",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index 6daff35e115..4be839e28c2 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2025.8.1",
+  "version": "2025.8.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.8.1",
+      "version": "2025.8.2",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-napi": "file:../desktop_native/napi"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index ea2e8affda2..77b1f186171 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.8.1",
+  "version": "2025.8.2",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/package-lock.json b/package-lock.json
index 956bb34f873..790a6debede 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -277,7 +277,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2025.8.1",
+      "version": "2025.8.2",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },

From 9ecf2686e5702a5b88db872637a01e7404cf97d3 Mon Sep 17 00:00:00 2001
From: Nick Krantz <125900171+nick-livefront@users.noreply.github.com>
Date: Fri, 22 Aug 2025 12:38:35 -0500
Subject: [PATCH 31/34] [PM-22987] Hide download for corrupt attachments
 (#16023)

* spelling fix

* hide download button for corrupt attachments

* add missing translations for desktop
---
 apps/desktop/src/locales/en/messages.json                 | 6 ++++++
 .../delete-attachment/delete-attachment.component.ts      | 2 +-
 .../download-attachment.component.html                    | 1 +
 .../download-attachment.component.spec.ts                 | 8 ++++++++
 .../download-attachment/download-attachment.component.ts  | 5 +++++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 83c021341b8..300cf779cc3 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -702,6 +702,12 @@
   "attachmentSaved": {
     "message": "Attachment saved"
   },
+  "addAttachment": {
+    "message": "Add attachment"
+  },
+  "maxFileSizeSansPunctuation": {
+    "message": "Maximum file size is 500 MB"
+  },
   "file": {
     "message": "File"
   },
diff --git a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
index be6f10c01de..1552ef9f30e 100644
--- a/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
+++ b/libs/vault/src/cipher-form/components/attachments/delete-attachment/delete-attachment.component.ts
@@ -29,7 +29,7 @@ export class DeleteAttachmentComponent {
   /** The attachment that is can be deleted */
   @Input({ required: true }) attachment!: AttachmentView;
 
-  /** Whether the attachemnt is being accessed from the admin console */
+  /** Whether the attachment is being accessed from the admin console */
   @Input() admin: boolean = false;
 
   /** Emits when the attachment is successfully deleted */
diff --git a/libs/vault/src/components/download-attachment/download-attachment.component.html b/libs/vault/src/components/download-attachment/download-attachment.component.html
index 47ee3c4761c..c2c2f1d4ebd 100644
--- a/libs/vault/src/components/download-attachment/download-attachment.component.html
+++ b/libs/vault/src/components/download-attachment/download-attachment.component.html
@@ -1,4 +1,5 @@
 <button
+  *ngIf="!isDecryptionFailure"
   [bitAction]="download"
   bitIconButton="bwi-download"
   buttonType="main"
diff --git a/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts b/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts
index 8a4e962707d..8ba7b29a526 100644
--- a/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts
+++ b/libs/vault/src/components/download-attachment/download-attachment.component.spec.ts
@@ -5,6 +5,7 @@ import { BehaviorSubject } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { DECRYPT_ERROR } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
@@ -121,6 +122,13 @@ describe("DownloadAttachmentComponent", () => {
       Request = MockRequest as any;
     });
 
+    it("hides download button when the attachment has decryption failure", () => {
+      component.attachment.fileName = DECRYPT_ERROR;
+      fixture.detectChanges();
+
+      expect(fixture.debugElement.query(By.css("button"))).toBeNull();
+    });
+
     it("uses the attachment url when available when getAttachmentData returns a 404", async () => {
       getAttachmentData.mockRejectedValue(new ErrorResponse({}, 404));
 
diff --git a/libs/vault/src/components/download-attachment/download-attachment.component.ts b/libs/vault/src/components/download-attachment/download-attachment.component.ts
index e4c0c253f4f..627ffafc6b2 100644
--- a/libs/vault/src/components/download-attachment/download-attachment.component.ts
+++ b/libs/vault/src/components/download-attachment/download-attachment.component.ts
@@ -6,6 +6,7 @@ import { firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { DECRYPT_ERROR } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -46,6 +47,10 @@ export class DownloadAttachmentComponent {
     private cipherService: CipherService,
   ) {}
 
+  protected get isDecryptionFailure(): boolean {
+    return this.attachment.fileName === DECRYPT_ERROR;
+  }
+
   /** Download the attachment */
   download = async () => {
     let url: string;

From 7bcd85314eeba07d5056bbb5ddcf8a138729a685 Mon Sep 17 00:00:00 2001
From: Robyn MacCallum <robyntmaccallum@gmail.com>
Date: Fri, 22 Aug 2025 14:57:31 -0400
Subject: [PATCH 32/34] Revert "Bumped client version(s)" (#16128)

This reverts commit a3f729ef8de045bc09f5984181e6a81d0ceefc3b.
---
 apps/desktop/package.json          | 2 +-
 apps/desktop/src/package-lock.json | 4 ++--
 apps/desktop/src/package.json      | 2 +-
 package-lock.json                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index ff958c0d8e6..42eb7017e03 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.8.2",
+  "version": "2025.8.1",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index 4be839e28c2..6daff35e115 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2025.8.2",
+  "version": "2025.8.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.8.2",
+      "version": "2025.8.1",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-napi": "file:../desktop_native/napi"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index 77b1f186171..ea2e8affda2 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.8.2",
+  "version": "2025.8.1",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/package-lock.json b/package-lock.json
index 790a6debede..956bb34f873 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -277,7 +277,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2025.8.2",
+      "version": "2025.8.1",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },

From dd4ec9c5d9a8bf51e52bf7c1a950f3e33323256f Mon Sep 17 00:00:00 2001
From: Vicki League <vleague@bitwarden.com>
Date: Fri, 22 Aug 2025 15:17:14 -0400
Subject: [PATCH 33/34] [CL-735][CL-743] Finish migrating form control
 components to signals (#15927)

---
 .../src/checkbox/checkbox.component.ts        | 34 ++++++-----------
 .../src/radio-button/radio-button.stories.ts  | 37 ++++++++++++++++++-
 .../src/radio-button/radio-input.component.ts | 32 +++++-----------
 3 files changed, 58 insertions(+), 45 deletions(-)

diff --git a/libs/components/src/checkbox/checkbox.component.ts b/libs/components/src/checkbox/checkbox.component.ts
index b5d53c41fd6..d8df53943f3 100644
--- a/libs/components/src/checkbox/checkbox.component.ts
+++ b/libs/components/src/checkbox/checkbox.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostBinding, Input, Optional, Self } from "@angular/core";
+import { booleanAttribute, Component, HostBinding, input, Optional, Self } from "@angular/core";
 import { NgControl, Validators } from "@angular/forms";
 
 import { BitFormControlAbstraction } from "../form-control";
@@ -7,6 +7,9 @@ import { BitFormControlAbstraction } from "../form-control";
   selector: "input[type=checkbox][bitCheckbox]",
   template: "",
   providers: [{ provide: BitFormControlAbstraction, useExisting: CheckboxComponent }],
+  host: {
+    "[disabled]": "disabled",
+  },
 })
 export class CheckboxComponent implements BitFormControlAbstraction {
   @HostBinding("class")
@@ -105,30 +108,17 @@ export class CheckboxComponent implements BitFormControlAbstraction {
   protected indeterminateImage =
     `url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="none" viewBox="0 0 13 13"%3E%3Cpath stroke="%23fff" stroke-width="2" d="M2.5 6.5h8"/%3E%3C/svg%3E%0A')`;
 
-  // TODO: Skipped for signal migration because:
-  //  Accessor inputs cannot be migrated as they are too complex.
-  @HostBinding()
-  @Input()
-  get disabled() {
-    return this._disabled ?? this.ngControl?.disabled ?? false;
-  }
-  set disabled(value: any) {
-    this._disabled = value != null && value !== false;
-  }
-  private _disabled?: boolean;
+  readonly disabledInput = input(false, { transform: booleanAttribute, alias: "disabled" });
+
+  // TODO migrate to computed signal when Angular adds signal support to reactive forms
+  // https://bitwarden.atlassian.net/browse/CL-819
+  get disabled() {
+    return this.disabledInput() || this.ngControl?.disabled || false;
+  }
 
-  // TODO: Skipped for signal migration because:
-  //  Accessor inputs cannot be migrated as they are too complex.
-  @Input()
   get required() {
-    return (
-      this._required ?? this.ngControl?.control?.hasValidator(Validators.requiredTrue) ?? false
-    );
+    return this.ngControl?.control?.hasValidator(Validators.requiredTrue) ?? false;
   }
-  set required(value: any) {
-    this._required = value != null && value !== false;
-  }
-  private _required?: boolean;
 
   get hasError() {
     return !!(this.ngControl?.status === "INVALID" && this.ngControl?.touched);
diff --git a/libs/components/src/radio-button/radio-button.stories.ts b/libs/components/src/radio-button/radio-button.stories.ts
index b364115ae74..eb08f04a364 100644
--- a/libs/components/src/radio-button/radio-button.stories.ts
+++ b/libs/components/src/radio-button/radio-button.stories.ts
@@ -1,4 +1,10 @@
-import { FormsModule, ReactiveFormsModule, FormControl, FormGroup } from "@angular/forms";
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  FormControl,
+  FormGroup,
+  Validators,
+} from "@angular/forms";
 import { Meta, moduleMetadata, StoryObj } from "@storybook/angular";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -165,6 +171,35 @@ export const BlockHint: Story = {
   }),
 };
 
+export const Required: Story = {
+  render: () => ({
+    props: {
+      formObj: new FormGroup({
+        radio: new FormControl(0, Validators.required),
+      }),
+    },
+    template: /* HTML */ `
+      <form [formGroup]="formObj">
+        <bit-radio-group formControlName="radio" aria-label="Example radio group">
+          <bit-label>Group of radio buttons</bit-label>
+
+          <bit-radio-button [value]="0">
+            <bit-label>First</bit-label>
+          </bit-radio-button>
+
+          <bit-radio-button [value]="1">
+            <bit-label>Second</bit-label>
+          </bit-radio-button>
+
+          <bit-radio-button [value]="2">
+            <bit-label>Third</bit-label>
+          </bit-radio-button>
+        </bit-radio-group>
+      </form>
+    `,
+  }),
+};
+
 export const Disabled: Story = {
   render: () => ({
     props: {
diff --git a/libs/components/src/radio-button/radio-input.component.ts b/libs/components/src/radio-button/radio-input.component.ts
index 0149ffdd284..e32dc5c572d 100644
--- a/libs/components/src/radio-button/radio-input.component.ts
+++ b/libs/components/src/radio-button/radio-input.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostBinding, input, Input, Optional, Self } from "@angular/core";
+import { booleanAttribute, Component, HostBinding, input, Optional, Self } from "@angular/core";
 import { NgControl, Validators } from "@angular/forms";
 
 import { BitFormControlAbstraction } from "../form-control";
@@ -11,6 +11,7 @@ let nextId = 0;
   providers: [{ provide: BitFormControlAbstraction, useExisting: RadioInputComponent }],
   host: {
     "[id]": "this.id()",
+    "[disabled]": "disabled",
   },
 })
 export class RadioInputComponent implements BitFormControlAbstraction {
@@ -74,30 +75,17 @@ export class RadioInputComponent implements BitFormControlAbstraction {
 
   constructor(@Optional() @Self() private ngControl?: NgControl) {}
 
-  // TODO: Skipped for signal migration because:
-  //  Accessor inputs cannot be migrated as they are too complex.
-  @HostBinding()
-  @Input()
-  get disabled() {
-    return this._disabled ?? this.ngControl?.disabled ?? false;
-  }
-  set disabled(value: any) {
-    this._disabled = value != null && value !== false;
-  }
-  private _disabled?: boolean;
+  readonly disabledInput = input(false, { transform: booleanAttribute, alias: "disabled" });
+
+  // TODO migrate to computed signal when Angular adds signal support to reactive forms
+  // https://bitwarden.atlassian.net/browse/CL-819
+  get disabled() {
+    return this.disabledInput() || this.ngControl?.disabled || false;
+  }
 
-  // TODO: Skipped for signal migration because:
-  //  Accessor inputs cannot be migrated as they are too complex.
-  @Input()
   get required() {
-    return (
-      this._required ?? this.ngControl?.control?.hasValidator(Validators.requiredTrue) ?? false
-    );
+    return this.ngControl?.control?.hasValidator(Validators.requiredTrue) ?? false;
   }
-  set required(value: any) {
-    this._required = value != null && value !== false;
-  }
-  private _required?: boolean;
 
   get hasError() {
     return !!(this.ngControl?.status === "INVALID" && this.ngControl?.touched);

From 65230a9c3e7c03cdaecb166df20073d5c7dcc64f Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Fri, 22 Aug 2025 12:21:23 -0700
Subject: [PATCH 34/34] [PM-24229] Preserve existing cipher date fields when
 using CipherExport.toView (#15993)

* [PM-24229] Ensure existing dates are persisted when using CipherExport.toView

* [PM-24229] Test both null and undefined

* [PM-24229] Add test for copied date values
---
 .../src/models/export/cipher.export.spec.ts   | 44 +++++++++++++++++++
 .../common/src/models/export/cipher.export.ts |  6 +--
 2 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 libs/common/src/models/export/cipher.export.spec.ts

diff --git a/libs/common/src/models/export/cipher.export.spec.ts b/libs/common/src/models/export/cipher.export.spec.ts
new file mode 100644
index 00000000000..42c01ccef15
--- /dev/null
+++ b/libs/common/src/models/export/cipher.export.spec.ts
@@ -0,0 +1,44 @@
+import { CipherExport } from "@bitwarden/common/models/export/cipher.export";
+import { SecureNoteExport } from "@bitwarden/common/models/export/secure-note.export";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+
+describe("Cipher Export", () => {
+  describe("toView", () => {
+    it.each([[null], [undefined]])(
+      "should preserve existing date values when request dates are nullish (=%p)",
+      (nullishDate) => {
+        const existingView = new CipherView();
+        existingView.creationDate = new Date("2023-01-01T00:00:00Z");
+        existingView.revisionDate = new Date("2023-01-02T00:00:00Z");
+        existingView.deletedDate = new Date("2023-01-03T00:00:00Z");
+
+        const request = CipherExport.template();
+        request.type = CipherType.SecureNote;
+        request.secureNote = SecureNoteExport.template();
+        request.creationDate = nullishDate as any;
+        request.revisionDate = nullishDate as any;
+        request.deletedDate = nullishDate as any;
+
+        const resultView = CipherExport.toView(request, existingView);
+        expect(resultView.creationDate).toEqual(existingView.creationDate);
+        expect(resultView.revisionDate).toEqual(existingView.revisionDate);
+        expect(resultView.deletedDate).toEqual(existingView.deletedDate);
+      },
+    );
+
+    it("should set date values when request dates are provided", () => {
+      const request = CipherExport.template();
+      request.type = CipherType.SecureNote;
+      request.secureNote = SecureNoteExport.template();
+      request.creationDate = new Date("2023-01-01T00:00:00Z");
+      request.revisionDate = new Date("2023-01-02T00:00:00Z");
+      request.deletedDate = new Date("2023-01-03T00:00:00Z");
+
+      const resultView = CipherExport.toView(request);
+      expect(resultView.creationDate).toEqual(request.creationDate);
+      expect(resultView.revisionDate).toEqual(request.revisionDate);
+      expect(resultView.deletedDate).toEqual(request.deletedDate);
+    });
+  });
+});
diff --git a/libs/common/src/models/export/cipher.export.ts b/libs/common/src/models/export/cipher.export.ts
index d343621328c..846a56dac85 100644
--- a/libs/common/src/models/export/cipher.export.ts
+++ b/libs/common/src/models/export/cipher.export.ts
@@ -81,9 +81,9 @@ export class CipherExport {
       view.passwordHistory = req.passwordHistory.map((ph) => PasswordHistoryExport.toView(ph));
     }
 
-    view.creationDate = req.creationDate ? new Date(req.creationDate) : null;
-    view.revisionDate = req.revisionDate ? new Date(req.revisionDate) : null;
-    view.deletedDate = req.deletedDate ? new Date(req.deletedDate) : null;
+    view.creationDate = req.creationDate ? new Date(req.creationDate) : view.creationDate;
+    view.revisionDate = req.revisionDate ? new Date(req.revisionDate) : view.revisionDate;
+    view.deletedDate = req.deletedDate ? new Date(req.deletedDate) : view.deletedDate;
     return view;
   }