diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index a1b41b44bfd..ad933c24875 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -3657,25 +3657,6 @@
   "thisRequestIsNoLongerValid": {
     "message": "This request is no longer valid."
   },
-  "areYouTryingToAccessYourAccount": {
-    "message": "Are you trying to access your account?"
-  },
-  "logInConfirmedForEmailOnDevice": {
-    "message": "Login confirmed for $EMAIL$ on $DEVICE$",
-    "placeholders": {
-      "email": {
-        "content": "$1",
-        "example": "name@example.com"
-      },
-      "device": {
-        "content": "$2",
-        "example": "iOS"
-      }
-    }
-  },
-  "youDeniedALogInAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this really was you, try to log in with the device again."
-  },
   "loginRequestHasAlreadyExpired": {
     "message": "Login request has already expired."
   },
diff --git a/apps/browser/src/auth/popup/account-switching/current-account.component.html b/apps/browser/src/auth/popup/account-switching/current-account.component.html
index f59a2b08fdd..09342c58756 100644
--- a/apps/browser/src/auth/popup/account-switching/current-account.component.html
+++ b/apps/browser/src/auth/popup/account-switching/current-account.component.html
@@ -1,4 +1,4 @@
-<div class="tw-mr-[5px] tw-mt-1">
+<div class="tw-me-2 tw-mt-1">
   <button
     *ngIf="currentAccount$ | async as currentAccount; else defaultButton"
     type="button"
diff --git a/apps/browser/src/autofill/background/abstractions/overlay.background.ts b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
index 5e2b755ad4a..75f2659c9df 100644
--- a/apps/browser/src/autofill/background/abstractions/overlay.background.ts
+++ b/apps/browser/src/autofill/background/abstractions/overlay.background.ts
@@ -245,6 +245,7 @@ export type OverlayBackgroundExtensionMessageHandlers = {
   editedCipher: () => void;
   deletedCipher: () => void;
   bgSaveCipher: () => void;
+  updateOverlayCiphers: () => void;
   fido2AbortRequest: ({ message, sender }: BackgroundOnMessageHandlerParams) => void;
 };
 
diff --git a/apps/browser/src/autofill/background/overlay.background.ts b/apps/browser/src/autofill/background/overlay.background.ts
index 1f249454393..f55b5c8cc3d 100644
--- a/apps/browser/src/autofill/background/overlay.background.ts
+++ b/apps/browser/src/autofill/background/overlay.background.ts
@@ -191,6 +191,7 @@ export class OverlayBackground implements OverlayBackgroundInterface {
     editedCipher: () => this.updateOverlayCiphers(),
     deletedCipher: () => this.updateOverlayCiphers(),
     bgSaveCipher: () => this.updateOverlayCiphers(),
+    updateOverlayCiphers: () => this.updateOverlayCiphers(),
     fido2AbortRequest: ({ sender }) => this.abortFido2ActiveRequest(sender.tab.id),
   };
   private readonly inlineMenuButtonPortMessageHandlers: InlineMenuButtonPortMessageHandlers = {
diff --git a/apps/browser/src/autofill/background/tabs.background.ts b/apps/browser/src/autofill/background/tabs.background.ts
index 4d520680980..cd2c1595d69 100644
--- a/apps/browser/src/autofill/background/tabs.background.ts
+++ b/apps/browser/src/autofill/background/tabs.background.ts
@@ -20,10 +20,8 @@ export default class TabsBackground {
       return;
     }
 
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.updateCurrentTabData();
-    this.setupTabEventListeners();
+    void this.updateCurrentTabData();
+    void this.setupTabEventListeners();
   }
 
   /**
diff --git a/apps/browser/src/autofill/content/autofill-init.ts b/apps/browser/src/autofill/content/autofill-init.ts
index 8f69937ac60..b6fc6c3392e 100644
--- a/apps/browser/src/autofill/content/autofill-init.ts
+++ b/apps/browser/src/autofill/content/autofill-init.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { EVENTS } from "@bitwarden/common/autofill/constants";
 
 import AutofillPageDetails from "../models/autofill-page-details";
@@ -122,7 +120,7 @@ class AutofillInit implements AutofillInitInterface {
    * @param {AutofillExtensionMessage} message
    */
   private async fillForm({ fillScript, pageDetailsUrl }: AutofillExtensionMessage) {
-    if ((document.defaultView || window).location.href !== pageDetailsUrl) {
+    if ((document.defaultView || window).location.href !== pageDetailsUrl || !fillScript) {
       return;
     }
 
@@ -177,7 +175,7 @@ class AutofillInit implements AutofillInitInterface {
     message: AutofillExtensionMessage,
     sender: chrome.runtime.MessageSender,
     sendResponse: (response?: any) => void,
-  ): boolean => {
+  ): boolean | null => {
     const command: string = message.command;
     const handler: CallableFunction | undefined = this.getExtensionMessageHandler(command);
     if (!handler) {
diff --git a/apps/browser/src/autofill/content/autofiller.ts b/apps/browser/src/autofill/content/autofiller.ts
index c7a742f1fe1..bc9fd0bb05f 100644
--- a/apps/browser/src/autofill/content/autofiller.ts
+++ b/apps/browser/src/autofill/content/autofiller.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { setupExtensionDisconnectAction } from "../utils";
 
 if (document.readyState === "loading") {
@@ -9,7 +7,7 @@ if (document.readyState === "loading") {
 }
 
 function loadAutofiller() {
-  let pageHref: string = null;
+  let pageHref: null | string = null;
   let filledThisHref = false;
   let delayFillTimeout: number;
   let doFillInterval: number | NodeJS.Timeout;
@@ -51,9 +49,7 @@ function loadAutofiller() {
         sender: "autofiller",
       };
 
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      chrome.runtime.sendMessage(msg);
+      void chrome.runtime.sendMessage(msg);
     }
   }
 
diff --git a/apps/browser/src/autofill/content/bootstrap-autofill-overlay-menu.ts b/apps/browser/src/autofill/content/bootstrap-autofill-overlay-menu.ts
index 605ffff0fec..40e32843fd4 100644
--- a/apps/browser/src/autofill/content/bootstrap-autofill-overlay-menu.ts
+++ b/apps/browser/src/autofill/content/bootstrap-autofill-overlay-menu.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { AutofillInlineMenuContentService } from "../overlay/inline-menu/content/autofill-inline-menu-content.service";
 import { AutofillOverlayContentService } from "../services/autofill-overlay-content.service";
 import DomElementVisibilityService from "../services/dom-element-visibility.service";
@@ -11,7 +9,7 @@ import AutofillInit from "./autofill-init";
 
 (function (windowContext) {
   if (!windowContext.bitwardenAutofillInit) {
-    let inlineMenuContentService: AutofillInlineMenuContentService;
+    let inlineMenuContentService: undefined | AutofillInlineMenuContentService;
     if (globalThis.self === globalThis.top) {
       inlineMenuContentService = new AutofillInlineMenuContentService();
     }
diff --git a/apps/browser/src/autofill/content/bootstrap-autofill-overlay-notifications.ts b/apps/browser/src/autofill/content/bootstrap-autofill-overlay-notifications.ts
index 495ae0e22db..8a079fa26c8 100644
--- a/apps/browser/src/autofill/content/bootstrap-autofill-overlay-notifications.ts
+++ b/apps/browser/src/autofill/content/bootstrap-autofill-overlay-notifications.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { OverlayNotificationsContentService } from "../overlay/notifications/content/overlay-notifications-content.service";
 import { AutofillOverlayContentService } from "../services/autofill-overlay-content.service";
 import DomElementVisibilityService from "../services/dom-element-visibility.service";
@@ -20,7 +18,7 @@ import AutofillInit from "./autofill-init";
       inlineMenuFieldQualificationService,
     );
 
-    let overlayNotificationsContentService: OverlayNotificationsContentService;
+    let overlayNotificationsContentService: undefined | OverlayNotificationsContentService;
     if (globalThis.self === globalThis.top) {
       overlayNotificationsContentService = new OverlayNotificationsContentService();
     }
@@ -29,7 +27,7 @@ import AutofillInit from "./autofill-init";
       domQueryService,
       domElementVisibilityService,
       autofillOverlayContentService,
-      null,
+      undefined,
       overlayNotificationsContentService,
     );
     setupAutofillInitDisconnectAction(windowContext);
diff --git a/apps/browser/src/autofill/content/bootstrap-autofill-overlay.ts b/apps/browser/src/autofill/content/bootstrap-autofill-overlay.ts
index 1777b135fe9..d204362ee25 100644
--- a/apps/browser/src/autofill/content/bootstrap-autofill-overlay.ts
+++ b/apps/browser/src/autofill/content/bootstrap-autofill-overlay.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { AutofillInlineMenuContentService } from "../overlay/inline-menu/content/autofill-inline-menu-content.service";
 import { OverlayNotificationsContentService } from "../overlay/notifications/content/overlay-notifications-content.service";
 import { AutofillOverlayContentService } from "../services/autofill-overlay-content.service";
@@ -12,8 +10,8 @@ import AutofillInit from "./autofill-init";
 
 (function (windowContext) {
   if (!windowContext.bitwardenAutofillInit) {
-    let inlineMenuContentService: AutofillInlineMenuContentService;
-    let overlayNotificationsContentService: OverlayNotificationsContentService;
+    let inlineMenuContentService: undefined | AutofillInlineMenuContentService;
+    let overlayNotificationsContentService: undefined | OverlayNotificationsContentService;
     if (globalThis.self === globalThis.top) {
       inlineMenuContentService = new AutofillInlineMenuContentService();
       overlayNotificationsContentService = new OverlayNotificationsContentService();
diff --git a/apps/browser/src/autofill/content/components/.lit-storybook/main.ts b/apps/browser/src/autofill/content/components/.lit-storybook/main.ts
index a316d8f5baa..53c06264672 100644
--- a/apps/browser/src/autofill/content/components/.lit-storybook/main.ts
+++ b/apps/browser/src/autofill/content/components/.lit-storybook/main.ts
@@ -1,9 +1,16 @@
-import path, { dirname, join } from "path";
+import { createRequire } from "module";
+import { dirname, join, resolve } from "path";
+import { fileURLToPath } from "url";
 
 import type { StorybookConfig } from "@storybook/web-components-webpack5";
 import remarkGfm from "remark-gfm";
 import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
 
+const currentFile = fileURLToPath(import.meta.url);
+const currentDirectory = dirname(currentFile);
+
+const require = createRequire(import.meta.url);
+
 const getAbsolutePath = (value: string): string =>
   dirname(require.resolve(join(value, "package.json")));
 
@@ -43,7 +50,7 @@ const config: StorybookConfig = {
     if (config.resolve) {
       config.resolve.plugins = [
         new TsconfigPathsPlugin({
-          configFile: path.resolve(__dirname, "../../../../../tsconfig.json"),
+          configFile: resolve(currentDirectory, "../../../../../tsconfig.json"),
         }),
       ] as any;
     }
diff --git a/apps/browser/src/autofill/content/components/buttons/action-button.ts b/apps/browser/src/autofill/content/components/buttons/action-button.ts
index 339b628875c..b43bed7f96b 100644
--- a/apps/browser/src/autofill/content/components/buttons/action-button.ts
+++ b/apps/browser/src/autofill/content/components/buttons/action-button.ts
@@ -8,6 +8,7 @@ import { Spinner } from "../icons";
 
 export type ActionButtonProps = {
   buttonText: string | TemplateResult;
+  dataTestId?: string;
   disabled?: boolean;
   isLoading?: boolean;
   theme: Theme;
@@ -17,6 +18,7 @@ export type ActionButtonProps = {
 
 export function ActionButton({
   buttonText,
+  dataTestId,
   disabled = false,
   isLoading = false,
   theme,
@@ -32,6 +34,7 @@ export function ActionButton({
   return html`
     <button
       class=${actionButtonStyles({ disabled, fullWidth, isLoading, theme })}
+      data-testid="${dataTestId}"
       title=${buttonText}
       type="button"
       @click=${handleButtonClick}
diff --git a/apps/browser/src/autofill/content/components/lit-stories/notification/at-risk-notification/container.lit-stories.ts b/apps/browser/src/autofill/content/components/lit-stories/notification/at-risk-notification/container.lit-stories.ts
index 3d1fcf339e8..55d35869db4 100644
--- a/apps/browser/src/autofill/content/components/lit-stories/notification/at-risk-notification/container.lit-stories.ts
+++ b/apps/browser/src/autofill/content/components/lit-stories/notification/at-risk-notification/container.lit-stories.ts
@@ -2,6 +2,8 @@ import { Meta, StoryObj } from "@storybook/web-components";
 
 import { ThemeTypes } from "@bitwarden/common/platform/enums";
 
+import { NotificationTypes } from "../../../../../notification/abstractions/notification-bar";
+import { getNotificationTestId } from "../../../../../notification/bar";
 import {
   AtRiskNotification,
   AtRiskNotificationProps,
@@ -30,8 +32,10 @@ export default {
   },
 } as Meta<AtRiskNotificationProps>;
 
-const Template = (args: AtRiskNotificationProps) => AtRiskNotification({ ...args });
-
+const Template = (args: AtRiskNotificationProps) => {
+  const notificationTestId = getNotificationTestId(NotificationTypes.AtRiskPassword);
+  return AtRiskNotification({ ...args, notificationTestId });
+};
 export const Default: StoryObj<AtRiskNotificationProps> = {
   render: Template,
 };
diff --git a/apps/browser/src/autofill/content/components/notification/at-risk-password/container.ts b/apps/browser/src/autofill/content/components/notification/at-risk-password/container.ts
index 90da0833fd9..001e9f24001 100644
--- a/apps/browser/src/autofill/content/components/notification/at-risk-password/container.ts
+++ b/apps/browser/src/autofill/content/components/notification/at-risk-password/container.ts
@@ -18,11 +18,13 @@ export type AtRiskNotificationProps = NotificationBarIframeInitData & {
   handleCloseNotification: (e: Event) => void;
 } & {
   i18n: I18n;
+  notificationTestId: string;
 };
 
 export function AtRiskNotification({
   handleCloseNotification,
   i18n,
+  notificationTestId,
   theme = ThemeTypes.Light,
   params,
 }: AtRiskNotificationProps) {
@@ -33,7 +35,7 @@ export function AtRiskNotification({
   );
 
   return html`
-    <div class=${atRiskNotificationContainerStyles(theme)}>
+    <div data-testid="${notificationTestId}" class=${atRiskNotificationContainerStyles(theme)}>
       ${NotificationHeader({
         handleCloseNotification,
         i18n,
diff --git a/apps/browser/src/autofill/content/components/notification/at-risk-password/footer.ts b/apps/browser/src/autofill/content/components/notification/at-risk-password/footer.ts
index d7805492fa6..e89edaf8b69 100644
--- a/apps/browser/src/autofill/content/components/notification/at-risk-password/footer.ts
+++ b/apps/browser/src/autofill/content/components/notification/at-risk-password/footer.ts
@@ -26,6 +26,7 @@ export function AtRiskNotificationFooter({
         open(passwordChangeUri, "_blank");
       },
       buttonText: AdditionalTasksButtonContent({ buttonText: i18n.changePassword, theme }),
+      dataTestId: "change-password-button",
       theme,
       fullWidth: false,
     })}
diff --git a/apps/browser/src/autofill/content/trigger-autofill-script-injection.ts b/apps/browser/src/autofill/content/trigger-autofill-script-injection.ts
index 95a2391991b..9db691c1359 100644
--- a/apps/browser/src/autofill/content/trigger-autofill-script-injection.ts
+++ b/apps/browser/src/autofill/content/trigger-autofill-script-injection.ts
@@ -1,5 +1,3 @@
 (function () {
-  // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-  // eslint-disable-next-line @typescript-eslint/no-floating-promises
-  chrome.runtime.sendMessage({ command: "triggerAutofillScriptInjection" });
+  void chrome.runtime.sendMessage({ command: "triggerAutofillScriptInjection" });
 })();
diff --git a/apps/browser/src/autofill/notification/bar.ts b/apps/browser/src/autofill/notification/bar.ts
index 285ae4aa257..6e20a07f81f 100644
--- a/apps/browser/src/autofill/notification/bar.ts
+++ b/apps/browser/src/autofill/notification/bar.ts
@@ -200,7 +200,7 @@ export function getNotificationTestId(
     [NotificationTypes.Unlock]: "unlock-notification-bar",
     [NotificationTypes.Add]: "save-notification-bar",
     [NotificationTypes.Change]: "update-notification-bar",
-    [NotificationTypes.AtRiskPassword]: "at-risk-password-notification-bar",
+    [NotificationTypes.AtRiskPassword]: "at-risk-notification-bar",
   }[notificationType];
 }
 
@@ -287,6 +287,7 @@ async function initNotificationBar(message: NotificationBarWindowMessage) {
           type: notificationBarIframeInitData.type as NotificationType,
           theme: resolvedTheme,
           i18n,
+          notificationTestId,
           params: initData.params,
           handleCloseNotification,
         }),
diff --git a/apps/browser/src/autofill/services/autofill-constants.ts b/apps/browser/src/autofill/services/autofill-constants.ts
index 55c3cced726..7467d5d4ba7 100644
--- a/apps/browser/src/autofill/services/autofill-constants.ts
+++ b/apps/browser/src/autofill/services/autofill-constants.ts
@@ -50,6 +50,15 @@ export class AutoFillConstants {
 
   static readonly SearchFieldNames: string[] = ["search", "query", "find", "go"];
 
+  static readonly NewEmailFieldKeywords: string[] = [
+    "new-email",
+    "newemail",
+    "new email",
+    "neue e-mail",
+  ];
+
+  static readonly NewsletterFormNames: string[] = ["newsletter"];
+
   static readonly FieldIgnoreList: string[] = ["captcha", "findanything", "forgot"];
 
   static readonly PasswordFieldExcludeList: string[] = [
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index 6aa99bbda41..099f345cb75 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -213,9 +213,7 @@ export default class AutofillService implements AutofillServiceInterface {
       this.autofillScriptPortsSet.delete(port);
     });
 
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.injectAutofillScriptsInAllTabs();
+    void this.injectAutofillScriptsInAllTabs();
   }
 
   /**
@@ -470,9 +468,7 @@ export default class AutofillService implements AutofillServiceInterface {
           await this.cipherService.updateLastUsedDate(options.cipher.id, activeAccount.id);
         }
 
-        // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        BrowserApi.tabSendMessage(
+        void BrowserApi.tabSendMessage(
           tab,
           {
             command: options.autoSubmitLogin ? "triggerAutoSubmitLogin" : "fillForm",
@@ -502,9 +498,10 @@ export default class AutofillService implements AutofillServiceInterface {
     );
 
     if (didAutofill) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.eventCollectionService.collect(EventType.Cipher_ClientAutofilled, options.cipher.id);
+      await this.eventCollectionService.collect(
+        EventType.Cipher_ClientAutofilled,
+        options.cipher.id,
+      );
       if (totp !== null) {
         return totp;
       } else {
diff --git a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts
index 9b16a0cfbdd..b12017484eb 100644
--- a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts
+++ b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts
@@ -58,6 +58,8 @@ export class InlineMenuFieldQualificationService
     "neue e-mail",
     "pwdcheck",
   ];
+  private newEmailFieldKeywords = new Set(AutoFillConstants.NewEmailFieldKeywords);
+  private newsletterFormKeywords = new Set(AutoFillConstants.NewsletterFormNames);
   private updatePasswordFieldKeywords = [
     "update password",
     "change password",
@@ -152,6 +154,61 @@ export class InlineMenuFieldQualificationService
   private totpFieldAutocompleteValue = "one-time-code";
   private premiumEnabled = false;
 
+  /**
+   * Validates the provided field to indicate if the field is a new email field used for account creation/registration.
+   *
+   * @param field - The field to validate
+   */
+  private isExplicitIdentityEmailField(field: AutofillField): boolean {
+    const matchFieldAttributeValues = [field.type, field.htmlName, field.htmlID, field.placeholder];
+    for (let attrIndex = 0; attrIndex < matchFieldAttributeValues.length; attrIndex++) {
+      if (!matchFieldAttributeValues[attrIndex]) {
+        continue;
+      }
+
+      for (let keywordIndex = 0; keywordIndex < matchFieldAttributeValues.length; keywordIndex++) {
+        if (this.newEmailFieldKeywords.has(matchFieldAttributeValues[attrIndex])) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Validates the provided form to indicate if the form is related to newsletter registration.
+   *
+   * @param parentForm - The form to validate
+   */
+  private isNewsletterForm(parentForm: any): boolean {
+    if (!parentForm) {
+      return false;
+    }
+
+    const matchFieldAttributeValues = [
+      parentForm.type,
+      parentForm.htmlName,
+      parentForm.htmlID,
+      parentForm.placeholder,
+    ];
+
+    for (let attrIndex = 0; attrIndex < matchFieldAttributeValues.length; attrIndex++) {
+      const attrValue = matchFieldAttributeValues[attrIndex];
+      if (!attrValue || typeof attrValue !== "string") {
+        continue;
+      }
+      const attrValueLower = attrValue.toLowerCase();
+      for (const keyword of this.newsletterFormKeywords) {
+        if (attrValueLower.includes(keyword.toLowerCase())) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+
   constructor() {
     void Promise.all([
       sendExtensionMessage("getInlineMenuFieldQualificationFeatureFlag"),
@@ -300,7 +357,11 @@ export class InlineMenuFieldQualificationService
       return false;
     }
 
-    return this.fieldContainsAutocompleteValues(field, this.identityAutocompleteValues);
+    return (
+      // Recognize explicit identity email fields (like id="new-email")
+      this.isFieldForIdentityEmail(field) ||
+      this.fieldContainsAutocompleteValues(field, this.identityAutocompleteValues)
+    );
   }
 
   /**
@@ -397,6 +458,12 @@ export class InlineMenuFieldQualificationService
   ): boolean {
     // If the provided field is set with an autocomplete of "username", we should assume that
     // the page developer intends for this field to be interpreted as a username field.
+
+    // Exclude non-login email field from being treated as a login username field
+    if (this.isExplicitIdentityEmailField(field)) {
+      return false;
+    }
+
     if (this.fieldContainsAutocompleteValues(field, this.loginUsernameAutocompleteValues)) {
       const newPasswordFieldsInPageDetails = pageDetails.fields.filter(
         (field) => field.viewable && this.isNewPasswordField(field),
@@ -415,6 +482,10 @@ export class InlineMenuFieldQualificationService
     const parentForm = pageDetails.forms[field.form];
     const passwordFieldsInPageDetails = pageDetails.fields.filter(this.isCurrentPasswordField);
 
+    if (this.isNewsletterForm(parentForm)) {
+      return false;
+    }
+
     // If the field is not structured within a form, we need to identify if the field is used in conjunction
     // with a password field. If that's the case, then we should assume that it is a form field element.
     if (!parentForm) {
@@ -822,9 +893,14 @@ export class InlineMenuFieldQualificationService
    * @param field - The field to validate
    */
   isFieldForIdentityEmail = (field: AutofillField): boolean => {
+    if (this.isExplicitIdentityEmailField(field)) {
+      return true;
+    }
+
     if (
       this.fieldContainsAutocompleteValues(field, this.emailAutocompleteValue) ||
-      field.type === "email"
+      field.type === "email" ||
+      field.htmlName === "email"
     ) {
       return true;
     }
diff --git a/apps/browser/src/background/idle.background.ts b/apps/browser/src/background/idle.background.ts
index 6fd555f4287..aaa23a140db 100644
--- a/apps/browser/src/background/idle.background.ts
+++ b/apps/browser/src/background/idle.background.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { firstValueFrom } from "rxjs";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -15,7 +13,7 @@ const IdleInterval = 60 * 5; // 5 minutes
 
 export default class IdleBackground {
   private idle: typeof chrome.idle | typeof browser.idle | null;
-  private idleTimer: number | NodeJS.Timeout = null;
+  private idleTimer: null | number | NodeJS.Timeout = null;
   private idleState = "active";
 
   constructor(
@@ -80,9 +78,8 @@ export default class IdleBackground {
       globalThis.clearTimeout(this.idleTimer);
       this.idleTimer = null;
     }
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.idle.queryState(IdleInterval, (state: string) => {
+
+    void this.idle?.queryState(IdleInterval, (state: string) => {
       if (state !== this.idleState) {
         this.idleState = state;
         handler(state);
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index f88852069ea..4d3e3b25165 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -904,6 +904,7 @@ export default class MainBackground {
       this.accountService,
       this.logService,
       this.cipherEncryptionService,
+      this.messagingService,
     );
     this.folderService = new FolderService(
       this.keyService,
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 c58bc258bf6..014ebc86411 100644
--- a/apps/browser/src/platform/popup/layout/popup-header.component.html
+++ b/apps/browser/src/platform/popup/layout/popup-header.component.html
@@ -1,16 +1,21 @@
+<!-- 
+  end padding is less than start padding to prioritize visual alignment when icon buttons are used at the end of the end slot.
+  other elements used at the end of the end slot may need to add their own margin/padding to achieve visual alignment.
+-->
 <header
-  class="tw-p-3 bit-compact:tw-p-2 tw-pl-4 bit-compact:tw-pl-3 tw-transition-colors tw-duration-200 tw-border-0 tw-border-b tw-border-solid"
+  class="tw-py-3 bit-compact:tw-py-2 tw-pe-1 bit-compact:tw-pe-0.5 tw-transition-colors tw-duration-200 tw-border-0 tw-border-b tw-border-solid"
   [ngClass]="{
     'tw-bg-background-alt tw-border-transparent':
       this.background === 'alt' && !pageContentScrolled(),
     'tw-bg-background tw-border-secondary-300':
       (this.background === 'alt' && pageContentScrolled()) || this.background === 'default',
+    'tw-ps-4 bit-compact:tw-ps-3': !showBackButton,
+    'tw-ps-1 bit-compact:tw-ps-0': showBackButton,
   }"
 >
   <div class="tw-max-w-screen-sm tw-mx-auto tw-flex tw-justify-between tw-w-full">
     <div class="tw-inline-flex tw-items-center tw-gap-2 tw-h-9">
       <button
-        class="-tw-ml-1"
         bitIconButton="bwi-angle-left"
         type="button"
         *ngIf="showBackButton"
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 c4f90db2f42..b63d357cab9 100644
--- a/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
+++ b/apps/browser/src/platform/popup/layout/popup-layout.stories.ts
@@ -117,7 +117,7 @@ class MockPopoutButtonComponent {}
 @Component({
   selector: "mock-current-account",
   template: `
-    <button class="tw-bg-transparent tw-border-none" type="button">
+    <button class="tw-bg-transparent tw-border-none tw-p-0 tw-me-1" type="button">
       <bit-avatar text="Ash Ketchum" size="small"></bit-avatar>
     </button>
   `,
@@ -654,7 +654,7 @@ export const WithVirtualScrollChild: Story = {
           <bit-section>
             @defer (on immediate) {
             <bit-item-group aria-label="Mock Vault Items">
-              <cdk-virtual-scroll-viewport itemSize="61" bitScrollLayout>
+              <cdk-virtual-scroll-viewport itemSize="59" bitScrollLayout>
                 <bit-item *cdkVirtualFor="let item of data; index as i">
                   <button type="button" bit-item-content>
                     <i
diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts
index 19779d73a11..c669ba167df 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts
@@ -10,7 +10,7 @@ import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abs
 import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
-import { CipherId, UserId } from "@bitwarden/common/types/guid";
+import { CipherId, OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -163,7 +163,7 @@ describe("OpenAttachmentsComponent", () => {
     it("sets `cipherIsAPartOfFreeOrg` to true when the cipher is a part of a free organization", async () => {
       cipherView.organizationId = "888-333-333";
       org.productTierType = ProductTierType.Free;
-      org.id = cipherView.organizationId;
+      org.id = cipherView.organizationId as OrganizationId;
 
       await component.ngOnInit();
 
@@ -173,7 +173,7 @@ describe("OpenAttachmentsComponent", () => {
     it("sets `cipherIsAPartOfFreeOrg` to false when the organization is not free", async () => {
       cipherView.organizationId = "888-333-333";
       org.productTierType = ProductTierType.Families;
-      org.id = cipherView.organizationId;
+      org.id = cipherView.organizationId as OrganizationId;
 
       await component.ngOnInit();
 
diff --git a/apps/cli/src/admin-console/models/request/organization-collection.request.ts b/apps/cli/src/admin-console/models/request/organization-collection.request.ts
index b5f796afe2d..14714e4758b 100644
--- a/apps/cli/src/admin-console/models/request/organization-collection.request.ts
+++ b/apps/cli/src/admin-console/models/request/organization-collection.request.ts
@@ -1,13 +1,14 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 import { CollectionExport } from "@bitwarden/common/models/export/collection.export";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 
 import { SelectionReadOnly } from "../selection-read-only";
 
 export class OrganizationCollectionRequest extends CollectionExport {
   static template(): OrganizationCollectionRequest {
     const req = new OrganizationCollectionRequest();
-    req.organizationId = "00000000-0000-0000-0000-000000000000";
+    req.organizationId = "00000000-0000-0000-0000-000000000000" as OrganizationId;
     req.name = "Collection name";
     req.externalId = null;
     req.groups = [SelectionReadOnly.template(), SelectionReadOnly.template()];
diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts
index d4dfada05bf..0ec24768b79 100644
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -723,6 +723,7 @@ export class ServiceContainer {
       this.accountService,
       this.logService,
       this.cipherEncryptionService,
+      this.messagingService,
     );
 
     this.folderService = new FolderService(
diff --git a/apps/cli/src/tools/send/send.program.ts b/apps/cli/src/tools/send/send.program.ts
index 650f448e558..82699e273c3 100644
--- a/apps/cli/src/tools/send/send.program.ts
+++ b/apps/cli/src/tools/send/send.program.ts
@@ -149,11 +149,11 @@ export class SendProgram extends BaseProgram {
 
   private templateCommand(): Command {
     return new Command("template")
-      .argument("<object>", "Valid objects are: send.text, send.file")
+      .argument("<object>", "Valid objects are: send.text, text, send.file, file")
       .description("Get json templates for send objects")
-      .action((options: OptionValues) =>
-        this.processResponse(new SendTemplateCommand().run(options.object)),
-      );
+      .action((object: string) => {
+        this.processResponse(new SendTemplateCommand().run(object));
+      });
   }
 
   private getCommand(): Command {
diff --git a/apps/desktop/desktop_native/autotype/src/windows.rs b/apps/desktop/desktop_native/autotype/src/windows.rs
index 931c111e2f5..dba0251ed82 100644
--- a/apps/desktop/desktop_native/autotype/src/windows.rs
+++ b/apps/desktop/desktop_native/autotype/src/windows.rs
@@ -3,8 +3,8 @@ use std::os::windows::ffi::OsStringExt;
 
 use windows::Win32::Foundation::{GetLastError, HWND};
 use windows::Win32::UI::Input::KeyboardAndMouse::{
-    BlockInput, SendInput, INPUT, INPUT_0, INPUT_KEYBOARD, KEYBDINPUT, KEYEVENTF_KEYUP,
-    KEYEVENTF_UNICODE,
+    SendInput, INPUT, INPUT_0, INPUT_KEYBOARD, KEYBDINPUT, KEYEVENTF_KEYUP, KEYEVENTF_UNICODE,
+    VIRTUAL_KEY,
 };
 use windows::Win32::UI::WindowsAndMessaging::{
     GetForegroundWindow, GetWindowTextLengthW, GetWindowTextW,
@@ -28,21 +28,31 @@ pub fn get_foreground_window_title() -> std::result::Result<String, ()> {
 ///
 /// https://learn.microsoft.com/en-in/windows/win32/api/winuser/nf-winuser-sendinput
 pub fn type_input(input: Vec<u16>) -> Result<(), ()> {
+    const TAB_KEY: u16 = 9;
     let mut keyboard_inputs: Vec<INPUT> = Vec::new();
 
+    // Release hotkeys
+    keyboard_inputs.push(build_virtual_key_input(InputKeyPress::Up, 0x12)); // alt
+    keyboard_inputs.push(build_virtual_key_input(InputKeyPress::Up, 0x11)); // ctrl
+    keyboard_inputs.push(build_unicode_input(InputKeyPress::Up, 105)); // i
+
     for i in input {
-        let next_down_input = build_input(InputKeyPress::Down, i);
-        let next_up_input = build_input(InputKeyPress::Up, i);
+        let next_down_input = if i == TAB_KEY {
+            build_virtual_key_input(InputKeyPress::Down, i as u8)
+        } else {
+            build_unicode_input(InputKeyPress::Down, i)
+        };
+        let next_up_input = if i == TAB_KEY {
+            build_virtual_key_input(InputKeyPress::Up, i as u8)
+        } else {
+            build_unicode_input(InputKeyPress::Up, i)
+        };
 
         keyboard_inputs.push(next_down_input);
         keyboard_inputs.push(next_up_input);
     }
 
-    let _ = block_input(true);
-    let result = send_input(keyboard_inputs);
-    let _ = block_input(false);
-
-    result
+    send_input(keyboard_inputs)
 }
 
 /// Gets the foreground window handle.
@@ -103,11 +113,11 @@ enum InputKeyPress {
     Up,
 }
 
-/// A function for easily building keyboard INPUT structs used in SendInput().
+/// A function for easily building keyboard unicode INPUT structs used in SendInput().
 ///
 /// Before modifying this function, make sure you read the SendInput() documentation:
 /// https://learn.microsoft.com/en-in/windows/win32/api/winuser/nf-winuser-sendinput
-fn build_input(key_press: InputKeyPress, character: u16) -> INPUT {
+fn build_unicode_input(key_press: InputKeyPress, character: u16) -> INPUT {
     match key_press {
         InputKeyPress::Down => INPUT {
             r#type: INPUT_KEYBOARD,
@@ -136,14 +146,37 @@ fn build_input(key_press: InputKeyPress, character: u16) -> INPUT {
     }
 }
 
-/// Block keyboard and mouse input events. This prevents the hotkey
-/// key presses from interfering with the input sent via SendInput().
+/// A function for easily building keyboard virtual-key INPUT structs used in SendInput().
 ///
-/// https://learn.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-blockinput
-fn block_input(block: bool) -> Result<(), ()> {
-    match unsafe { BlockInput(block) } {
-        Ok(()) => Ok(()),
-        Err(_) => Err(()),
+/// Before modifying this function, make sure you read the SendInput() documentation:
+/// https://learn.microsoft.com/en-in/windows/win32/api/winuser/nf-winuser-sendinput
+/// https://learn.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
+fn build_virtual_key_input(key_press: InputKeyPress, virtual_key: u8) -> INPUT {
+    match key_press {
+        InputKeyPress::Down => INPUT {
+            r#type: INPUT_KEYBOARD,
+            Anonymous: INPUT_0 {
+                ki: KEYBDINPUT {
+                    wVk: VIRTUAL_KEY(virtual_key as u16),
+                    wScan: Default::default(),
+                    dwFlags: Default::default(),
+                    time: 0,
+                    dwExtraInfo: 0,
+                },
+            },
+        },
+        InputKeyPress::Up => INPUT {
+            r#type: INPUT_KEYBOARD,
+            Anonymous: INPUT_0 {
+                ki: KEYBDINPUT {
+                    wVk: VIRTUAL_KEY(virtual_key as u16),
+                    wScan: Default::default(),
+                    dwFlags: KEYEVENTF_KEYUP,
+                    time: 0,
+                    dwExtraInfo: 0,
+                },
+            },
+        },
     }
 }
 
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 2ab88fed621..37650c08b95 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.7.0",
+  "version": "2025.8.0",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index ea85bd9a8dc..6afda4e9ddf 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -24,11 +24,12 @@ import {
 } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
+import { LoginApprovalDialogComponent } from "@bitwarden/angular/auth/login-approval";
 import { DeviceTrustToastService } from "@bitwarden/angular/auth/services/device-trust-toast.service.abstraction";
 import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
 import { DocumentLangSetter } from "@bitwarden/angular/platform/i18n";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
-import { FingerprintDialogComponent, LoginApprovalComponent } from "@bitwarden/auth/angular";
+import { FingerprintDialogComponent } from "@bitwarden/auth/angular";
 import {
   DESKTOP_SSO_CALLBACK,
   LogoutReason,
@@ -476,7 +477,7 @@ export class AppComponent implements OnInit, OnDestroy {
           case "openLoginApproval":
             if (message.notificationId != null) {
               this.dialogService.closeAll();
-              const dialogRef = LoginApprovalComponent.open(this.dialogService, {
+              const dialogRef = LoginApprovalDialogComponent.open(this.dialogService, {
                 notificationId: message.notificationId,
               });
               await firstValueFrom(dialogRef.closed);
diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts
index af035d0b389..dad7739bc5a 100644
--- a/apps/desktop/src/app/services/init.service.ts
+++ b/apps/desktop/src/app/services/init.service.ts
@@ -91,6 +91,7 @@ export class InitService {
       containerService.attachToGlobal(this.win);
 
       await this.autofillService.init();
+      await this.autotypeService.init();
     };
   }
 }
diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts
index 1bd8924ac15..95d1f4643fa 100644
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -5,6 +5,7 @@ import { Router } from "@angular/router";
 import { Subject, merge } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
+import { LoginApprovalDialogComponentServiceAbstraction } from "@bitwarden/angular/auth/login-approval";
 import { SetInitialPasswordService } from "@bitwarden/angular/auth/password-management/set-initial-password/set-initial-password.service.abstraction";
 import { SafeProvider, safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
 import {
@@ -31,7 +32,6 @@ import {
 } from "@bitwarden/auth/angular";
 import {
   InternalUserDecryptionOptionsServiceAbstraction,
-  LoginApprovalComponentServiceAbstraction,
   LoginEmailService,
   SsoUrlService,
 } from "@bitwarden/auth/common";
@@ -49,7 +49,7 @@ import {
 import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
 import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
-import { ClientType, DeviceType } from "@bitwarden/common/enums";
+import { ClientType } from "@bitwarden/common/enums";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
@@ -107,7 +107,7 @@ import {
 import { LockComponentService } from "@bitwarden/key-management-ui";
 import { DefaultSshImportPromptService, SshImportPromptService } from "@bitwarden/vault";
 
-import { DesktopLoginApprovalComponentService } from "../../auth/login/desktop-login-approval-component.service";
+import { DesktopLoginApprovalDialogComponentService } from "../../auth/login/desktop-login-approval-dialog-component.service";
 import { DesktopLoginComponentService } from "../../auth/login/desktop-login-component.service";
 import { DesktopTwoFactorAuthDuoComponentService } from "../../auth/services/desktop-two-factor-auth-duo-component.service";
 import { DesktopAutofillSettingsService } from "../../autofill/services/desktop-autofill-settings.service";
@@ -444,8 +444,8 @@ const safeProviders: SafeProvider[] = [
     deps: [],
   }),
   safeProvider({
-    provide: LoginApprovalComponentServiceAbstraction,
-    useClass: DesktopLoginApprovalComponentService,
+    provide: LoginApprovalDialogComponentServiceAbstraction,
+    useClass: DesktopLoginApprovalDialogComponentService,
     deps: [I18nServiceAbstraction],
   }),
   safeProvider({
@@ -455,17 +455,15 @@ const safeProviders: SafeProvider[] = [
   }),
   safeProvider({
     provide: DesktopAutotypeService,
-    useFactory: (
-      configService: ConfigService,
-      globalStateProvider: GlobalStateProvider,
-      platformUtilsService: PlatformUtilsServiceAbstraction,
-    ) =>
-      new DesktopAutotypeService(
-        configService,
-        globalStateProvider,
-        platformUtilsService.getDevice() === DeviceType.WindowsDesktop,
-      ),
-    deps: [ConfigService, GlobalStateProvider, PlatformUtilsServiceAbstraction],
+    useClass: DesktopAutotypeService,
+    deps: [
+      AccountService,
+      AuthService,
+      CipherServiceAbstraction,
+      ConfigService,
+      GlobalStateProvider,
+      PlatformUtilsServiceAbstraction,
+    ],
   }),
 ];
 
diff --git a/apps/desktop/src/auth/login/desktop-login-approval-component.service.spec.ts b/apps/desktop/src/auth/login/desktop-login-approval-dialog-component.service.spec.ts
similarity index 75%
rename from apps/desktop/src/auth/login/desktop-login-approval-component.service.spec.ts
rename to apps/desktop/src/auth/login/desktop-login-approval-dialog-component.service.spec.ts
index efe17960068..2ae584d7e7f 100644
--- a/apps/desktop/src/auth/login/desktop-login-approval-component.service.spec.ts
+++ b/apps/desktop/src/auth/login/desktop-login-approval-dialog-component.service.spec.ts
@@ -2,13 +2,13 @@ import { TestBed } from "@angular/core/testing";
 import { mock, MockProxy } from "jest-mock-extended";
 import { Subject } from "rxjs";
 
-import { LoginApprovalComponent } from "@bitwarden/auth/angular";
+import { LoginApprovalDialogComponent } from "@bitwarden/angular/auth/login-approval";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 
-import { DesktopLoginApprovalComponentService } from "./desktop-login-approval-component.service";
+import { DesktopLoginApprovalDialogComponentService } from "./desktop-login-approval-dialog-component.service";
 
-describe("DesktopLoginApprovalComponentService", () => {
-  let service: DesktopLoginApprovalComponentService;
+describe("DesktopLoginApprovalDialogComponentService", () => {
+  let service: DesktopLoginApprovalDialogComponentService;
   let i18nService: MockProxy<I18nServiceAbstraction>;
   let originalIpc: any;
 
@@ -31,12 +31,12 @@ describe("DesktopLoginApprovalComponentService", () => {
 
     TestBed.configureTestingModule({
       providers: [
-        DesktopLoginApprovalComponentService,
+        DesktopLoginApprovalDialogComponentService,
         { provide: I18nServiceAbstraction, useValue: i18nService },
       ],
     });
 
-    service = TestBed.inject(DesktopLoginApprovalComponentService);
+    service = TestBed.inject(DesktopLoginApprovalDialogComponentService);
   });
 
   afterEach(() => {
@@ -54,7 +54,7 @@ describe("DesktopLoginApprovalComponentService", () => {
     const message = `Confirm access attempt for ${email}`;
     const closeText = "Close";
 
-    const loginApprovalComponent = { email } as LoginApprovalComponent;
+    const loginApprovalDialogComponent = { email } as LoginApprovalDialogComponent;
     i18nService.t.mockImplementation((key: string) => {
       switch (key) {
         case "accountAccessRequested":
@@ -71,18 +71,20 @@ describe("DesktopLoginApprovalComponentService", () => {
     jest.spyOn(ipc.platform, "isWindowVisible").mockResolvedValue(false);
     jest.spyOn(ipc.auth, "loginRequest").mockResolvedValue();
 
-    await service.showLoginRequestedAlertIfWindowNotVisible(loginApprovalComponent.email);
+    await service.showLoginRequestedAlertIfWindowNotVisible(loginApprovalDialogComponent.email);
 
     expect(ipc.auth.loginRequest).toHaveBeenCalledWith(title, message, closeText);
   });
 
   it("does not call ipc.auth.loginRequest when window is visible", async () => {
-    const loginApprovalComponent = { email: "test@bitwarden.com" } as LoginApprovalComponent;
+    const loginApprovalDialogComponent = {
+      email: "test@bitwarden.com",
+    } as LoginApprovalDialogComponent;
 
     jest.spyOn(ipc.platform, "isWindowVisible").mockResolvedValue(true);
     jest.spyOn(ipc.auth, "loginRequest");
 
-    await service.showLoginRequestedAlertIfWindowNotVisible(loginApprovalComponent.email);
+    await service.showLoginRequestedAlertIfWindowNotVisible(loginApprovalDialogComponent.email);
 
     expect(ipc.auth.loginRequest).not.toHaveBeenCalled();
   });
diff --git a/apps/desktop/src/auth/login/desktop-login-approval-component.service.ts b/apps/desktop/src/auth/login/desktop-login-approval-dialog-component.service.ts
similarity index 65%
rename from apps/desktop/src/auth/login/desktop-login-approval-component.service.ts
rename to apps/desktop/src/auth/login/desktop-login-approval-dialog-component.service.ts
index 3b4658f34c5..9c48f71990a 100644
--- a/apps/desktop/src/auth/login/desktop-login-approval-component.service.ts
+++ b/apps/desktop/src/auth/login/desktop-login-approval-dialog-component.service.ts
@@ -1,13 +1,15 @@
 import { Injectable } from "@angular/core";
 
-import { DefaultLoginApprovalComponentService } from "@bitwarden/auth/angular";
-import { LoginApprovalComponentServiceAbstraction } from "@bitwarden/auth/common";
+import {
+  DefaultLoginApprovalDialogComponentService,
+  LoginApprovalDialogComponentServiceAbstraction,
+} from "@bitwarden/angular/auth/login-approval";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 @Injectable()
-export class DesktopLoginApprovalComponentService
-  extends DefaultLoginApprovalComponentService
-  implements LoginApprovalComponentServiceAbstraction
+export class DesktopLoginApprovalDialogComponentService
+  extends DefaultLoginApprovalDialogComponentService
+  implements LoginApprovalDialogComponentServiceAbstraction
 {
   constructor(private i18nService: I18nServiceAbstraction) {
     super();
diff --git a/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts b/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
index e0871f86f8c..592d1e1b7a8 100644
--- a/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
+++ b/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
@@ -1,33 +1,70 @@
-import { autotype } from "@bitwarden/desktop-napi";
+import { ipcMain, globalShortcut } from "electron";
 
-import { DesktopAutotypeService } from "../services/desktop-autotype.service";
+import { autotype } from "@bitwarden/desktop-napi";
+import { LogService } from "@bitwarden/logging";
+
+import { WindowMain } from "../../main/window.main";
+import { stringIsNotUndefinedNullAndEmpty } from "../../utils";
 
 export class MainDesktopAutotypeService {
-  constructor(private desktopAutotypeService: DesktopAutotypeService) {}
+  keySequence: string = "Alt+CommandOrControl+I";
+
+  constructor(
+    private logService: LogService,
+    private windowMain: WindowMain,
+  ) {}
 
   init() {
-    this.desktopAutotypeService.autotypeEnabled$.subscribe((enabled) => {
-      if (enabled) {
+    ipcMain.on("autofill.configureAutotype", (event, data) => {
+      if (data.enabled === true && !globalShortcut.isRegistered(this.keySequence)) {
         this.enableAutotype();
-      } else {
+      } else if (data.enabled === false && globalShortcut.isRegistered(this.keySequence)) {
         this.disableAutotype();
       }
     });
+
+    ipcMain.on("autofill.completeAutotypeRequest", (event, data) => {
+      const { response } = data;
+
+      if (
+        stringIsNotUndefinedNullAndEmpty(response.username) &&
+        stringIsNotUndefinedNullAndEmpty(response.password)
+      ) {
+        this.doAutotype(response.username, response.password);
+      }
+    });
   }
 
-  // TODO: this will call into desktop native code
-  private enableAutotype() {
-    // eslint-disable-next-line no-console
-    console.log("Enabling Autotype...");
+  disableAutotype() {
+    if (globalShortcut.isRegistered(this.keySequence)) {
+      globalShortcut.unregister(this.keySequence);
+    }
 
-    const result = autotype.getForegroundWindowTitle();
-    // eslint-disable-next-line no-console
-    console.log("Window Title: " + result);
+    this.logService.info("Autotype disabled.");
   }
 
-  // TODO: this will call into desktop native code
-  private disableAutotype() {
-    // eslint-disable-next-line no-console
-    console.log("Disabling Autotype...");
+  private enableAutotype() {
+    const result = globalShortcut.register(this.keySequence, () => {
+      const windowTitle = autotype.getForegroundWindowTitle();
+
+      this.windowMain.win.webContents.send("autofill.listenAutotypeRequest", {
+        windowTitle,
+      });
+    });
+
+    result
+      ? this.logService.info("Autotype enabled.")
+      : this.logService.info("Enabling autotype failed.");
+  }
+
+  private doAutotype(username: string, password: string) {
+    const inputPattern = username + "\t" + password;
+    const inputArray = new Array<number>(inputPattern.length);
+
+    for (let i = 0; i < inputPattern.length; i++) {
+      inputArray[i] = inputPattern.charCodeAt(i);
+    }
+
+    autotype.typeInput(inputArray);
   }
 }
diff --git a/apps/desktop/src/autofill/preload.ts b/apps/desktop/src/autofill/preload.ts
index 2c006b5c928..af238b17e80 100644
--- a/apps/desktop/src/autofill/preload.ts
+++ b/apps/desktop/src/autofill/preload.ts
@@ -127,4 +127,43 @@ export default {
       },
     );
   },
+  configureAutotype: (enabled: boolean) => {
+    ipcRenderer.send("autofill.configureAutotype", { enabled });
+  },
+  listenAutotypeRequest: (
+    fn: (
+      windowTitle: string,
+      completeCallback: (
+        error: Error | null,
+        response: { username?: string; password?: string },
+      ) => void,
+    ) => void,
+  ) => {
+    ipcRenderer.on(
+      "autofill.listenAutotypeRequest",
+      (
+        event,
+        data: {
+          windowTitle: string;
+        },
+      ) => {
+        const { windowTitle } = data;
+
+        fn(windowTitle, (error, response) => {
+          if (error) {
+            ipcRenderer.send("autofill.completeError", {
+              windowTitle,
+              error: error.message,
+            });
+            return;
+          }
+
+          ipcRenderer.send("autofill.completeAutotypeRequest", {
+            windowTitle,
+            response,
+          });
+        });
+      },
+    );
+  },
 };
diff --git a/apps/desktop/src/autofill/services/desktop-autotype.service.ts b/apps/desktop/src/autofill/services/desktop-autotype.service.ts
index 4a00cec465a..65152450a86 100644
--- a/apps/desktop/src/autofill/services/desktop-autotype.service.ts
+++ b/apps/desktop/src/autofill/services/desktop-autotype.service.ts
@@ -1,12 +1,20 @@
-import { combineLatest, map, Observable, of } from "rxjs";
+import { combineLatest, filter, firstValueFrom, map, Observable, of, switchMap } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+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 { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import {
   GlobalStateProvider,
   AUTOTYPE_SETTINGS_DISK,
   KeyDefinition,
 } from "@bitwarden/common/platform/state";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { UserId } from "@bitwarden/user-core";
 
 export const AUTOTYPE_ENABLED = new KeyDefinition<boolean>(
   AUTOTYPE_SETTINGS_DISK,
@@ -20,28 +28,83 @@ export class DesktopAutotypeService {
   autotypeEnabled$: Observable<boolean> = of(false);
 
   constructor(
+    private accountService: AccountService,
+    private authService: AuthService,
+    private cipherService: CipherService,
     private configService: ConfigService,
     private globalStateProvider: GlobalStateProvider,
-    private isWindows: boolean,
+    private platformUtilsService: PlatformUtilsService,
   ) {
-    if (this.isWindows) {
+    ipc.autofill.listenAutotypeRequest(async (windowTitle, callback) => {
+      const possibleCiphers = await this.matchCiphersToWindowTitle(windowTitle);
+      const firstCipher = possibleCiphers?.at(0);
+
+      return callback(null, {
+        username: firstCipher?.login?.username,
+        password: firstCipher?.login?.password,
+      });
+    });
+  }
+
+  async init() {
+    if (this.platformUtilsService.getDevice() === DeviceType.WindowsDesktop) {
       this.autotypeEnabled$ = combineLatest([
         this.autotypeEnabledState.state$,
         this.configService.getFeatureFlag$(FeatureFlag.WindowsDesktopAutotype),
+        this.accountService.activeAccount$.pipe(
+          map((account) => account?.id),
+          switchMap((userId) => this.authService.authStatusFor$(userId)),
+        ),
       ]).pipe(
         map(
-          ([autotypeEnabled, windowsDesktopAutotypeFeatureFlag]) =>
-            autotypeEnabled && windowsDesktopAutotypeFeatureFlag,
+          ([autotypeEnabled, windowsDesktopAutotypeFeatureFlag, authStatus]) =>
+            autotypeEnabled &&
+            windowsDesktopAutotypeFeatureFlag &&
+            authStatus == AuthenticationStatus.Unlocked,
         ),
       );
+
+      this.autotypeEnabled$.subscribe((enabled) => {
+        ipc.autofill.configureAutotype(enabled);
+      });
     }
   }
 
-  init() {}
-
   async setAutotypeEnabledState(enabled: boolean): Promise<void> {
     await this.autotypeEnabledState.update(() => enabled, {
       shouldUpdate: (currentlyEnabled) => currentlyEnabled !== enabled,
     });
   }
+
+  async matchCiphersToWindowTitle(windowTitle: string): Promise<CipherView[]> {
+    const URI_PREFIX = "APP:";
+    windowTitle = windowTitle.toLowerCase();
+
+    const ciphers = await firstValueFrom(
+      this.accountService.activeAccount$.pipe(
+        map((account) => account?.id),
+        filter((userId): userId is UserId => userId != null),
+        switchMap((userId) => this.cipherService.cipherViews$(userId)),
+      ),
+    );
+
+    const possibleCiphers = ciphers.filter((c) => {
+      return (
+        c.login?.username &&
+        c.login?.password &&
+        c.deletedDate == null &&
+        c.login?.uris.some((u) => {
+          if (u.uri?.indexOf(URI_PREFIX) !== 0) {
+            return false;
+          }
+
+          const uri = u.uri.substring(4).toLowerCase();
+
+          return windowTitle.indexOf(uri) > -1;
+        })
+      );
+    });
+
+    return possibleCiphers;
+  }
 }
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index 97b1107056e..8b30bd85ec9 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -3027,9 +3027,6 @@
     "message": "Toggle character count",
     "description": "'Character count' describes a feature that displays a number next to each character of the password."
   },
-  "areYouTryingToAccessYourAccount": {
-    "message": "Are you trying to access your account?"
-  },
   "accessAttemptBy": {
     "message": "Access attempt by $EMAIL$",
     "placeholders": {
@@ -3039,6 +3036,50 @@
       }
     }
   },
+  "loginRequestApprovedForEmailOnDevice": {
+    "message": "Login request approved for $EMAIL$ on $DEVICE$",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      },
+      "device": {
+        "content": "$2",
+        "example": "Web app - Chrome"
+      }
+    }
+  },
+  "youDeniedLoginAttemptFromAnotherDevice": {
+    "message": "You denied a login attempt from another device. If this was you, try to log in with the device again."
+  },
+  "webApp": {
+    "message": "Web app"
+  },
+  "mobile": {
+    "message": "Mobile",
+    "description": "Mobile app"
+  },
+  "extension": {
+    "message": "Extension",
+    "description": "Browser extension/addon"
+  },
+  "desktop": {
+    "message": "Desktop",
+    "description": "Desktop app"
+  },
+  "cli": {
+    "message": "CLI"
+  },
+  "sdk": {
+    "message": "SDK",
+    "description": "Software Development Kit"
+  },
+  "server": {
+    "message": "Server"
+  },
+  "loginRequest": {
+    "message": "Login request"
+  },
   "deviceType": {
     "message": "Device Type"
   },
@@ -3054,22 +3095,6 @@
   "denyAccess": {
     "message": "Deny access"
   },
-  "logInConfirmedForEmailOnDevice": {
-    "message": "Login confirmed for $EMAIL$ on $DEVICE$",
-    "placeholders": {
-      "email": {
-        "content": "$1",
-        "example": "name@example.com"
-      },
-      "device": {
-        "content": "$2",
-        "example": "iOS"
-      }
-    }
-  },
-  "youDeniedALogInAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this really was you, try to log in with the device again."
-  },
   "justNow": {
     "message": "Just now"
   },
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index 67fbf457a77..deb09d2f335 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -37,7 +37,6 @@ import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-
 import { MainDesktopAutotypeService } from "./autofill/main/main-desktop-autotype.service";
 import { MainSshAgentService } from "./autofill/main/main-ssh-agent.service";
 import { DesktopAutofillSettingsService } from "./autofill/services/desktop-autofill-settings.service";
-import { DesktopAutotypeService } from "./autofill/services/desktop-autotype.service";
 import { DesktopBiometricsService } from "./key-management/biometrics/desktop.biometrics.service";
 import { MainBiometricsIPCListener } from "./key-management/biometrics/main-biometrics-ipc.listener";
 import { MainBiometricsService } from "./key-management/biometrics/main-biometrics.service";
@@ -48,7 +47,6 @@ import { PowerMonitorMain } from "./main/power-monitor.main";
 import { TrayMain } from "./main/tray.main";
 import { UpdaterMain } from "./main/updater.main";
 import { WindowMain } from "./main/window.main";
-import { SlimConfigService } from "./platform/config/slim-config.service";
 import { NativeAutofillMain } from "./platform/main/autofill/native-autofill.main";
 import { ClipboardMain } from "./platform/main/clipboard.main";
 import { DesktopCredentialStorageListener } from "./platform/main/desktop-credential-storage-listener";
@@ -307,13 +305,22 @@ export class Main {
     void this.nativeAutofillMain.init();
 
     this.mainDesktopAutotypeService = new MainDesktopAutotypeService(
-      new DesktopAutotypeService(
-        new SlimConfigService(this.environmentService, globalStateProvider),
-        globalStateProvider,
-        process.platform === "win32",
-      ),
+      this.logService,
+      this.windowMain,
     );
-    this.mainDesktopAutotypeService.init();
+
+    app
+      .whenReady()
+      .then(() => {
+        this.mainDesktopAutotypeService.init();
+      })
+      .catch((reason) => {
+        this.logService.error("Error initializing Autotype.", reason);
+      });
+
+    app.on("will-quit", () => {
+      this.mainDesktopAutotypeService.disableAutotype();
+    });
   }
 
   bootstrap() {
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index 01872408a10..44ee6ec862d 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2025.7.0",
+  "version": "2025.8.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.7.1",
+      "version": "2025.8.0",
       "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 0128692f3b4..ffe70bb7bd7 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.7.0",
+  "version": "2025.8.0",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/apps/desktop/src/platform/config/slim-config.service.ts b/apps/desktop/src/platform/config/slim-config.service.ts
deleted file mode 100644
index 9a535ba9dfa..00000000000
--- a/apps/desktop/src/platform/config/slim-config.service.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { combineLatest, map, Observable, throwError } from "rxjs";
-import { SemVer } from "semver";
-
-import {
-  FeatureFlag,
-  FeatureFlagValueType,
-  getFeatureFlagValue,
-} from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { ServerConfig } from "@bitwarden/common/platform/abstractions/config/server-config";
-import {
-  EnvironmentService,
-  Region,
-} from "@bitwarden/common/platform/abstractions/environment.service";
-import { ServerSettings } from "@bitwarden/common/platform/models/domain/server-settings";
-import { GLOBAL_SERVER_CONFIGURATIONS } from "@bitwarden/common/platform/services/config/default-config.service";
-import { GlobalStateProvider } from "@bitwarden/common/platform/state";
-import { UserId } from "@bitwarden/user-core";
-
-/*
-    NOT FOR GENERAL USE
-
-    If you have more uses for the config service in the main process,
-    please reach out to platform.
-*/
-export class SlimConfigService implements ConfigService {
-  constructor(
-    private environmentService: EnvironmentService,
-    private globalStateProvider: GlobalStateProvider,
-  ) {}
-
-  serverConfig$: Observable<ServerConfig> = throwError(() => {
-    return new Error("Method not implemented.");
-  });
-  serverSettings$: Observable<ServerSettings> = throwError(() => {
-    return new Error("Method not implemented.");
-  });
-  cloudRegion$: Observable<Region> = throwError(() => {
-    return new Error("Method not implemented.");
-  });
-  getFeatureFlag$<Flag extends FeatureFlag>(key: Flag): Observable<FeatureFlagValueType<Flag>> {
-    return combineLatest([
-      this.environmentService.environment$,
-      this.globalStateProvider.get(GLOBAL_SERVER_CONFIGURATIONS).state$,
-    ]).pipe(
-      map(([environment, serverConfigMap]) =>
-        getFeatureFlagValue(serverConfigMap?.[environment.getApiUrl()], key),
-      ),
-    );
-  }
-  userCachedFeatureFlag$<Flag extends FeatureFlag>(
-    key: Flag,
-    userId: UserId,
-  ): Observable<FeatureFlagValueType<Flag>> {
-    throw new Error("Method not implemented.");
-  }
-  getFeatureFlag<Flag extends FeatureFlag>(key: Flag): Promise<FeatureFlagValueType<Flag>> {
-    throw new Error("Method not implemented.");
-  }
-  checkServerMeetsVersionRequirement$(minimumRequiredServerVersion: SemVer): Observable<boolean> {
-    throw new Error("Method not implemented.");
-  }
-  ensureConfigFetched(): Promise<void> {
-    throw new Error("Method not implemented.");
-  }
-}
diff --git a/apps/desktop/src/utils.ts b/apps/desktop/src/utils.ts
index c798faac36e..de5cd2daebc 100644
--- a/apps/desktop/src/utils.ts
+++ b/apps/desktop/src/utils.ts
@@ -98,3 +98,11 @@ export function cleanUserAgent(userAgent: string): string {
     .replace(userAgentItem("Bitwarden", " "), "")
     .replace(userAgentItem("Electron", " "), "");
 }
+
+/**
+ * Returns `true` if the provided string is not undefined, not null, and not empty.
+ * Otherwise, returns `false`.
+ */
+export function stringIsNotUndefinedNullAndEmpty(str: string): boolean {
+  return str?.length > 0;
+}
diff --git a/apps/desktop/src/vault/app/vault/vault-v2.component.ts b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
index 3c4a85f96b7..b408eb799fd 100644
--- a/apps/desktop/src/vault/app/vault/vault-v2.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
@@ -466,15 +466,24 @@ export class VaultV2Component<C extends CipherViewLike>
         return;
       }
 
-      const updatedCipher = await this.cipherService.get(
-        this.cipherId as CipherId,
-        this.activeUserId as UserId,
-      );
-      const updatedCipherView = await this.cipherService.decrypt(
-        updatedCipher,
-        this.activeUserId as UserId,
+      // The encrypted state of ciphers is updated when an attachment is added,
+      // but the cache is also cleared. Depending on timing, `cipherService.get` can return the
+      // old cipher. Retrieve the updated cipher from `cipherViews$`,
+      // which refreshes after the cached is cleared.
+      const updatedCipherView = await firstValueFrom(
+        this.cipherService.cipherViews$(this.activeUserId!).pipe(
+          filter((c) => !!c),
+          map((ciphers) => ciphers.find((c) => c.id === this.cipherId)),
+        ),
       );
 
+      // `find` can return undefined but that shouldn't happen as
+      // this would mean that the cipher was deleted.
+      // To make TypeScript happy, exit early if it isn't found.
+      if (!updatedCipherView) {
+        return;
+      }
+
       this.cipherFormComponent.patchCipher((currentCipher) => {
         currentCipher.attachments = updatedCipherView.attachments;
         currentCipher.revisionDate = updatedCipherView.revisionDate;
@@ -499,7 +508,6 @@ export class VaultV2Component<C extends CipherViewLike>
 
     if (cipher.decryptionFailure) {
       invokeMenu(menu);
-      return;
     }
 
     if (!cipher.isDeleted) {
diff --git a/apps/web/src/app/admin-console/icons/admin-console-logo.ts b/apps/web/src/app/admin-console/icons/admin-console-logo.ts
deleted file mode 100644
index 25b463217eb..00000000000
--- a/apps/web/src/app/admin-console/icons/admin-console-logo.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { svgIcon } from "@bitwarden/components";
-
-export const AdminConsoleLogo = svgIcon`
-  <svg viewBox="0 0 506 116" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <g clip-path="url(#clip0_3210_12788)">
-      <path fill-rule="evenodd" clip-rule="evenodd" d="M121.787 20.4684C127.589 20.4684 132.101 22.7366 135.417 27.4619C138.732 32.0928 140.39 38.4247 140.39 46.4578C140.39 54.7744 138.732 61.2009 135.325 65.7372C131.917 70.3681 127.312 72.5417 121.511 72.5417C115.709 72.5417 111.288 70.4626 107.973 66.1153H107.052L105.302 70.5571C105.026 71.2186 104.381 71.5967 103.737 71.5967H96.369C95.4481 71.5967 94.7114 70.8406 94.7114 69.8955V3.45718C94.7114 2.51211 95.4481 1.75606 96.369 1.75606H106.315C107.236 1.75606 107.973 2.51211 107.973 3.45718V18.0112C107.973 20.0904 107.789 23.3981 107.42 27.9345H107.973C111.012 23.0201 115.709 20.4684 121.787 20.4684ZM117.551 31.5257C114.327 31.5257 111.841 32.5653 110.275 34.6445C108.802 36.7236 107.973 40.2204 107.973 44.9457V46.4578C107.973 51.8447 108.71 55.7195 110.275 57.9877C111.841 60.2558 114.327 61.4844 117.735 61.4844C120.405 61.4844 122.708 60.1613 124.273 57.5151C125.839 54.9634 126.668 51.0887 126.668 46.2688C126.668 41.3544 125.839 37.6687 124.273 35.2115C122.616 32.7543 120.313 31.5257 117.551 31.5257ZM162.308 71.6912H152.362C151.441 71.6912 150.704 70.9351 150.704 69.99V23.2091C150.704 22.2641 151.441 21.508 152.362 21.508H162.308C163.229 21.508 163.966 22.2641 163.966 23.2091V69.8955C164.058 70.7461 163.229 71.6912 162.308 71.6912ZM198.685 61.5789C200.619 61.5789 202.921 61.2009 205.684 60.4448C206.421 60.2558 207.065 60.8229 207.065 61.5789V69.423C207.065 69.8955 206.789 70.2736 206.421 70.4626C203.289 71.7857 199.329 72.4472 194.909 72.4472C189.567 72.4472 185.7 71.1241 183.305 68.2889C180.911 65.5482 179.621 61.3899 179.621 55.9085V31.8092H174.372C173.727 31.8092 173.267 31.3367 173.267 30.6752V26.2333C173.267 26.1388 173.359 26.0443 173.359 25.9498L180.634 21.508L184.226 11.6793C184.41 11.2067 184.779 10.9232 185.239 10.9232H191.87C192.514 10.9232 192.975 11.3958 192.975 12.0573V21.6025H206.144C206.421 21.6025 206.697 21.886 206.697 22.1695V30.6752C206.697 31.3367 206.236 31.8092 205.592 31.8092H193.067V55.814C193.067 57.7041 193.62 59.2163 194.633 60.0668C195.554 61.1064 197.027 61.5789 198.685 61.5789ZM260.663 71.6912C259.374 71.6912 258.361 70.8406 257.809 69.612L248.047 39.0863C247.402 36.9126 246.573 33.6049 245.468 29.3521H245.192L244.271 32.7543L242.337 39.1808L232.299 69.7065C231.93 70.9351 230.825 71.6912 229.536 71.6912C228.247 71.6912 227.142 70.8406 226.773 69.5175L214.525 25.5718C214.156 24.2487 215.169 22.8311 216.643 22.8311H216.919C217.84 22.8311 218.669 23.4926 218.945 24.4377L226.128 51.1832C227.878 58.1767 229.075 63.28 229.628 66.6823H229.904C231.562 59.6888 232.851 55.0579 233.68 52.6953L242.982 24.7212C243.35 23.5871 244.363 22.8311 245.652 22.8311C246.85 22.8311 247.862 23.5871 248.231 24.7212L256.888 52.5063C259.006 59.5943 260.295 64.1306 260.756 66.4933H261.032C261.308 64.6031 262.413 59.3108 264.531 50.8051L271.438 24.4377C271.715 23.4926 272.544 22.8311 273.464 22.8311C274.846 22.8311 275.859 24.1542 275.491 25.5718L263.887 69.5175C263.518 70.8406 262.413 71.6912 261.032 71.6912H260.663ZM315.367 71.6912C314.538 71.6912 313.801 71.0296 313.709 70.179L312.88 63.9416H312.42C310.025 67.0603 307.631 69.3285 305.052 70.6516C302.566 71.9747 299.527 72.5417 296.119 72.5417C291.423 72.5417 287.831 71.3131 285.252 68.856C282.95 66.6823 281.661 63.7526 281.477 60.0668C281.108 55.1525 283.134 50.4271 287.002 47.6864C290.962 45.0402 296.488 43.4336 303.947 43.4336L312.972 43.1501V39.9368C312.972 35.2115 312.052 31.8092 310.118 29.4466C308.184 27.0839 305.329 25.9498 301.277 25.9498C297.409 25.9498 293.541 26.8949 289.489 28.8795C288.476 29.3521 287.278 28.8795 286.818 27.84C286.357 26.8004 286.818 25.5718 287.831 25.1938C292.436 23.3036 296.948 22.2641 301.553 22.2641C306.802 22.2641 310.67 23.6817 313.341 26.5169C315.919 29.2576 317.209 33.6994 317.209 39.4643V70.179C317.117 70.7461 316.288 71.6912 315.367 71.6912ZM296.304 68.4779C301.461 68.4779 305.421 66.9658 308.276 64.0361C311.223 61.1064 312.696 56.8536 312.696 51.6557V46.9304L304.408 47.3084C297.685 47.5919 292.988 48.726 290.041 50.5216C287.186 52.3172 285.713 55.247 285.713 59.0272C285.713 62.0515 286.634 64.5086 288.384 66.2098C290.41 67.6274 292.988 68.4779 296.304 68.4779ZM350.823 21.886C352.204 21.886 353.586 21.9805 355.151 22.1695C356.348 22.3586 357.085 23.4926 356.901 24.6267C356.717 25.7608 355.612 26.4224 354.507 26.2333C353.125 26.0443 351.744 25.8553 350.362 25.8553C346.31 25.8553 342.995 27.6509 340.416 31.1477C337.838 34.6445 336.548 39.1808 336.548 44.4732V69.234C336.548 70.4626 335.627 71.4076 334.43 71.4076C333.233 71.4076 332.312 70.4626 332.312 69.234V24.8157C332.312 23.7762 333.141 22.9256 334.154 22.9256C335.167 22.9256 335.996 23.6817 335.996 24.7212L336.364 31.7147H336.64C338.574 28.1235 340.693 25.5718 342.903 24.1542C345.021 22.6421 347.692 21.886 350.823 21.886ZM383.24 21.886C386.647 21.886 389.686 22.5476 392.173 23.7762C394.751 25.0048 396.962 27.2729 398.896 30.3916H399.172C398.988 26.5169 398.896 22.9256 398.896 19.3343V3.92971C398.896 2.70112 399.816 1.75606 401.014 1.75606C402.211 1.75606 403.132 2.70112 403.132 3.92971V69.99C403.132 70.8406 402.487 71.5021 401.658 71.5021C400.922 71.5021 400.277 70.9351 400.185 70.0845L399.264 63.9416H398.896C395.304 69.5175 390.055 72.2582 383.332 72.2582C376.701 72.2582 371.82 70.179 368.228 65.9262C364.821 61.6734 362.979 55.625 362.979 47.5919C362.979 39.1808 364.637 32.7543 368.136 28.218C371.636 24.1542 376.609 21.886 383.24 21.886ZM383.24 25.9498C377.99 25.9498 374.122 27.84 371.452 31.6202C368.873 35.306 367.584 40.6929 367.584 47.8754C367.584 61.6734 372.833 68.5724 383.332 68.5724C388.765 68.5724 392.633 66.9658 395.12 63.7526C397.698 60.5393 398.896 55.247 398.896 47.8754V47.1194C398.896 39.5588 397.698 34.1719 395.12 30.9587C392.725 27.5564 388.765 25.9498 383.24 25.9498ZM438.404 72.5417C431.497 72.5417 426.155 70.3681 422.195 65.9262C418.327 61.5789 416.393 55.436 416.393 47.5919C416.393 39.7478 418.235 33.5104 422.011 28.8795C425.787 24.1542 430.76 21.7915 437.114 21.7915C442.64 21.7915 447.152 23.7762 450.284 27.7455C453.599 31.7147 455.164 37.1961 455.164 44.0951V47.6864H420.906C420.998 54.3964 422.471 59.4998 425.51 63.091C428.55 66.6823 432.786 68.2889 438.404 68.2889C441.074 68.2889 443.561 68.0999 445.587 67.7219C447.06 67.4383 448.81 66.9658 450.928 66.2098C452.125 65.7372 453.415 66.6823 453.415 68.0054C453.415 68.7615 452.954 69.5175 452.217 69.801C450.007 70.7461 447.889 71.3131 445.955 71.6912C443.653 72.3527 441.166 72.5417 438.404 72.5417ZM437.114 25.8553C432.51 25.8553 428.826 27.3674 426.063 30.4862C423.3 33.5104 421.735 38.0467 421.182 43.8116H450.652C450.652 38.2357 449.455 33.6994 447.06 30.5807C444.666 27.4619 441.351 25.8553 437.114 25.8553ZM503.79 71.6912C502.593 71.6912 501.672 70.7461 501.672 69.5175V39.9368C501.672 35.0225 500.659 31.4312 498.725 29.2576C496.606 27.0839 493.567 25.8553 489.331 25.8553C483.621 25.8553 479.477 27.2729 476.898 30.2971C474.32 33.2269 472.846 38.0467 472.846 44.5677V69.3285C472.846 70.5571 471.925 71.5021 470.728 71.5021C469.531 71.5021 468.61 70.5571 468.61 69.3285V24.8157C468.61 23.6817 469.439 22.8311 470.544 22.8311C471.557 22.8311 472.294 23.5872 472.478 24.5322L473.031 29.4466H473.307C476.438 24.3432 481.872 21.7915 489.792 21.7915C500.566 21.7915 506 27.7455 506 39.6533V69.3285C505.908 70.6516 504.895 71.6912 503.79 71.6912ZM157.427 1C153.099 1 149.599 4.40225 149.599 8.65506V9.41111C149.599 13.5694 153.191 17.0662 157.427 17.0662C161.663 17.0662 165.255 13.5694 165.255 9.41111V8.74957C165.255 4.40225 161.663 1 157.427 1Z" class="tw-fill-text-alt2" />
-      <path d="M55.906 45.6061V11.8138H32.8859V71.8481C36.9624 69.6304 40.6106 67.2192 43.8307 64.6144C51.8809 58.1375 55.906 51.8014 55.906 45.6061ZM65.7718 5.05527V45.6061C65.7718 48.6334 65.198 51.6342 64.0504 54.6087C62.9028 57.5831 61.4812 60.2231 59.7855 62.5287C58.0898 64.8344 56.0687 67.0784 53.7222 69.2608C51.3756 71.4433 49.2089 73.2561 47.2221 74.6993C45.2352 76.1425 43.1627 77.5065 41.0046 78.7913C38.8464 80.0761 37.3135 80.9474 36.4057 81.405C35.4979 81.8626 34.77 82.2146 34.2219 82.461C33.8108 82.6722 33.3655 82.7778 32.8859 82.7778C32.4063 82.7778 31.961 82.6722 31.5499 82.461C31.0018 82.2146 30.2738 81.8626 29.3661 81.405C28.4583 80.9474 26.9253 80.0761 24.7672 78.7913C22.609 77.5065 20.5365 76.1425 18.5497 74.6993C16.5628 73.2561 14.3961 71.4433 12.0496 69.2608C9.70305 67.0784 7.68194 64.8344 5.98626 62.5287C4.29058 60.2231 2.86895 57.5831 1.72137 54.6087C0.57379 51.6342 0 48.6334 0 45.6061V5.05527C0 4.14006 0.325433 3.34806 0.9763 2.67925C1.62717 2.01044 2.39793 1.67604 3.28859 1.67604H62.4832C63.3738 1.67604 64.1446 2.01044 64.7955 2.67925C65.4463 3.34806 65.7718 4.14006 65.7718 5.05527Z" class="tw-fill-text-alt2" />
-      <path d="M236.17 115L246.232 87.6999H249.703L259.726 115H256.255L253.759 107.98H242.137L239.602 115H236.17ZM243.112 105.328H252.784L247.948 91.8339L243.112 105.328Z" class="tw-fill-text-alt2" />
-      <path d="M271.298 115.468C269.374 115.468 267.684 115.026 266.228 114.142C264.798 113.258 263.68 112.049 262.874 110.515C262.094 108.981 261.704 107.239 261.704 105.289C261.704 103.339 262.107 101.61 262.913 100.102C263.719 98.5679 264.837 97.3719 266.267 96.5139C267.697 95.6299 269.387 95.1879 271.337 95.1879C272.923 95.1879 274.327 95.5129 275.549 96.1629C276.771 96.8129 277.72 97.7229 278.396 98.8929V86.9199H281.672V115H278.708L278.396 111.802C277.772 112.738 276.875 113.583 275.705 114.337C274.535 115.091 273.066 115.468 271.298 115.468ZM271.649 112.621C272.949 112.621 274.093 112.322 275.081 111.724C276.095 111.1 276.875 110.242 277.421 109.15C277.993 108.058 278.279 106.784 278.279 105.328C278.279 103.872 277.993 102.598 277.421 101.506C276.875 100.414 276.095 99.5689 275.081 98.9709C274.093 98.3469 272.949 98.0349 271.649 98.0349C270.375 98.0349 269.231 98.3469 268.217 98.9709C267.229 99.5689 266.449 100.414 265.877 101.506C265.331 102.598 265.058 103.872 265.058 105.328C265.058 106.784 265.331 108.058 265.877 109.15C266.449 110.242 267.229 111.1 268.217 111.724C269.231 112.322 270.375 112.621 271.649 112.621Z" class="tw-fill-text-alt2" />
-      <path d="M287.012 115V95.6559H289.976L290.21 98.4639C290.834 97.4239 291.666 96.6179 292.706 96.0459C293.746 95.4739 294.916 95.1879 296.216 95.1879C297.75 95.1879 299.063 95.4999 300.155 96.1239C301.273 96.7479 302.131 97.6969 302.729 98.9709C303.405 97.8009 304.328 96.8779 305.498 96.2019C306.694 95.5259 307.981 95.1879 309.359 95.1879C311.673 95.1879 313.519 95.8899 314.897 97.2939C316.275 98.6719 316.964 100.804 316.964 103.69V115H313.727V104.041C313.727 102.039 313.324 100.531 312.518 99.5169C311.712 98.5029 310.555 97.9959 309.047 97.9959C307.487 97.9959 306.187 98.6069 305.147 99.8289C304.133 101.025 303.626 102.741 303.626 104.977V115H300.35V104.041C300.35 102.039 299.947 100.531 299.141 99.5169C298.335 98.5029 297.178 97.9959 295.67 97.9959C294.136 97.9959 292.849 98.6069 291.809 99.8289C290.795 101.025 290.288 102.741 290.288 104.977V115H287.012Z" class="tw-fill-text-alt2" />
-      <path d="M323.888 91.3659C323.238 91.3659 322.692 91.1579 322.25 90.7419C321.834 90.2999 321.626 89.7539 321.626 89.1039C321.626 88.4799 321.834 87.9599 322.25 87.5439C322.692 87.1279 323.238 86.9199 323.888 86.9199C324.512 86.9199 325.045 87.1279 325.487 87.5439C325.929 87.9599 326.15 88.4799 326.15 89.1039C326.15 89.7539 325.929 90.2999 325.487 90.7419C325.045 91.1579 324.512 91.3659 323.888 91.3659ZM322.25 115V95.6559H325.526V115H322.25Z" class="tw-fill-text-alt2" />
-      <path d="M331.23 115V95.6559H334.194L334.389 99.1269C335.013 97.9049 335.91 96.9429 337.08 96.2409C338.25 95.5389 339.576 95.1879 341.058 95.1879C343.346 95.1879 345.166 95.8899 346.518 97.2939C347.896 98.6719 348.585 100.804 348.585 103.69V115H345.309V104.041C345.309 100.011 343.645 97.9959 340.317 97.9959C338.653 97.9959 337.262 98.6069 336.144 99.8289C335.052 101.025 334.506 102.741 334.506 104.977V115H331.23Z" class="tw-fill-text-alt2" />
-      <path d="M376.038 115.468C373.36 115.468 371.046 114.883 369.096 113.713C367.172 112.517 365.677 110.866 364.611 108.76C363.545 106.628 363.012 104.158 363.012 101.35C363.012 98.5679 363.545 96.1239 364.611 94.0179C365.677 91.8859 367.172 90.2219 369.096 89.0259C371.046 87.8299 373.36 87.2319 376.038 87.2319C379.158 87.2319 381.693 87.9859 383.643 89.4939C385.619 90.9759 386.88 93.0559 387.426 95.7339H383.799C383.383 94.0439 382.525 92.6919 381.225 91.6779C379.951 90.6379 378.222 90.1179 376.038 90.1179C374.088 90.1179 372.385 90.5729 370.929 91.4829C369.473 92.3669 368.342 93.6539 367.536 95.3439C366.756 97.0079 366.366 99.0099 366.366 101.35C366.366 103.69 366.756 105.705 367.536 107.395C368.342 109.059 369.473 110.346 370.929 111.256C372.385 112.14 374.088 112.582 376.038 112.582C378.222 112.582 379.951 112.088 381.225 111.1C382.525 110.086 383.383 108.747 383.799 107.083H387.426C386.88 109.709 385.619 111.763 383.643 113.245C381.693 114.727 379.158 115.468 376.038 115.468Z" class="tw-fill-text-alt2" />
-      <path d="M400.753 115.468C398.933 115.468 397.295 115.052 395.839 114.22C394.383 113.388 393.226 112.218 392.368 110.71C391.536 109.176 391.12 107.382 391.12 105.328C391.12 103.274 391.549 101.493 392.407 99.9849C393.265 98.4509 394.422 97.2679 395.878 96.4359C397.36 95.6039 399.011 95.1879 400.831 95.1879C402.651 95.1879 404.289 95.6039 405.745 96.4359C407.201 97.2679 408.345 98.4509 409.177 99.9849C410.035 101.493 410.464 103.274 410.464 105.328C410.464 107.382 410.035 109.176 409.177 110.71C408.319 112.218 407.149 113.388 405.667 114.22C404.211 115.052 402.573 115.468 400.753 115.468ZM400.753 112.66C401.871 112.66 402.911 112.387 403.873 111.841C404.835 111.295 405.615 110.476 406.213 109.384C406.811 108.292 407.11 106.94 407.11 105.328C407.11 103.716 406.811 102.364 406.213 101.272C405.641 100.18 404.874 99.3609 403.912 98.8149C402.95 98.2689 401.923 97.9959 400.831 97.9959C399.713 97.9959 398.673 98.2689 397.711 98.8149C396.749 99.3609 395.969 100.18 395.371 101.272C394.773 102.364 394.474 103.716 394.474 105.328C394.474 106.94 394.773 108.292 395.371 109.384C395.969 110.476 396.736 111.295 397.672 111.841C398.634 112.387 399.661 112.66 400.753 112.66Z" class="tw-fill-text-alt2" />
-      <path d="M415.019 115V95.6559H417.983L418.178 99.1269C418.802 97.9049 419.699 96.9429 420.869 96.2409C422.039 95.5389 423.365 95.1879 424.847 95.1879C427.135 95.1879 428.955 95.8899 430.307 97.2939C431.685 98.6719 432.374 100.804 432.374 103.69V115H429.098V104.041C429.098 100.011 427.434 97.9959 424.106 97.9959C422.442 97.9959 421.051 98.6069 419.933 99.8289C418.841 101.025 418.295 102.741 418.295 104.977V115H415.019Z" class="tw-fill-text-alt2" />
-      <path d="M444.747 115.468C442.433 115.468 440.509 114.883 438.975 113.713C437.441 112.543 436.544 110.957 436.284 108.955H439.638C439.846 109.969 440.379 110.853 441.237 111.607C442.121 112.335 443.304 112.699 444.786 112.699C446.164 112.699 447.178 112.413 447.828 111.841C448.478 111.243 448.803 110.541 448.803 109.735C448.803 108.565 448.374 107.785 447.516 107.395C446.684 107.005 445.501 106.654 443.967 106.342C442.927 106.134 441.887 105.835 440.847 105.445C439.807 105.055 438.936 104.509 438.234 103.807C437.532 103.079 437.181 102.13 437.181 100.96C437.181 99.2699 437.805 97.8919 439.053 96.8259C440.327 95.7339 442.043 95.1879 444.201 95.1879C446.255 95.1879 447.932 95.7079 449.232 96.7479C450.558 97.7619 451.325 99.2179 451.533 101.116H448.296C448.166 100.128 447.737 99.3609 447.009 98.8149C446.307 98.2429 445.358 97.9569 444.162 97.9569C442.992 97.9569 442.082 98.2039 441.432 98.6979C440.808 99.1919 440.496 99.8419 440.496 100.648C440.496 101.428 440.899 102.039 441.705 102.481C442.537 102.923 443.655 103.3 445.059 103.612C446.255 103.872 447.386 104.197 448.452 104.587C449.544 104.951 450.428 105.51 451.104 106.264C451.806 106.992 452.157 108.058 452.157 109.462C452.183 111.204 451.52 112.647 450.168 113.791C448.842 114.909 447.035 115.468 444.747 115.468Z" class="tw-fill-text-alt2" />
-      <path d="M465.651 115.468C463.831 115.468 462.193 115.052 460.737 114.22C459.281 113.388 458.124 112.218 457.266 110.71C456.434 109.176 456.018 107.382 456.018 105.328C456.018 103.274 456.447 101.493 457.305 99.9849C458.163 98.4509 459.32 97.2679 460.776 96.4359C462.258 95.6039 463.909 95.1879 465.729 95.1879C467.549 95.1879 469.187 95.6039 470.643 96.4359C472.099 97.2679 473.243 98.4509 474.075 99.9849C474.933 101.493 475.362 103.274 475.362 105.328C475.362 107.382 474.933 109.176 474.075 110.71C473.217 112.218 472.047 113.388 470.565 114.22C469.109 115.052 467.471 115.468 465.651 115.468ZM465.651 112.66C466.769 112.66 467.809 112.387 468.771 111.841C469.733 111.295 470.513 110.476 471.111 109.384C471.709 108.292 472.008 106.94 472.008 105.328C472.008 103.716 471.709 102.364 471.111 101.272C470.539 100.18 469.772 99.3609 468.81 98.8149C467.848 98.2689 466.821 97.9959 465.729 97.9959C464.611 97.9959 463.571 98.2689 462.609 98.8149C461.647 99.3609 460.867 100.18 460.269 101.272C459.671 102.364 459.372 103.716 459.372 105.328C459.372 106.94 459.671 108.292 460.269 109.384C460.867 110.476 461.634 111.295 462.57 111.841C463.532 112.387 464.559 112.66 465.651 112.66Z" class="tw-fill-text-alt2" />
-      <path d="M479.917 115V86.9199H483.193V115H479.917Z" class="tw-fill-text-alt2" />
-      <path d="M497.26 115.468C495.414 115.468 493.776 115.052 492.346 114.22C490.916 113.362 489.785 112.179 488.953 110.671C488.147 109.163 487.744 107.382 487.744 105.328C487.744 103.3 488.147 101.532 488.953 100.024C489.759 98.4899 490.877 97.3069 492.307 96.4749C493.763 95.6169 495.44 95.1879 497.338 95.1879C499.21 95.1879 500.822 95.6169 502.174 96.4749C503.552 97.3069 504.605 98.4119 505.333 99.7899C506.061 101.168 506.425 102.65 506.425 104.236C506.425 104.522 506.412 104.808 506.386 105.094C506.386 105.38 506.386 105.705 506.386 106.069H490.981C491.059 107.551 491.397 108.786 491.995 109.774C492.619 110.736 493.386 111.464 494.296 111.958C495.232 112.452 496.22 112.699 497.26 112.699C498.612 112.699 499.743 112.387 500.653 111.763C501.563 111.139 502.226 110.294 502.642 109.228H505.879C505.359 111.022 504.358 112.517 502.876 113.713C501.42 114.883 499.548 115.468 497.26 115.468ZM497.26 97.9569C495.7 97.9569 494.309 98.4379 493.087 99.3999C491.891 100.336 491.202 101.714 491.02 103.534H503.188C503.11 101.792 502.512 100.427 501.394 99.4389C500.276 98.4509 498.898 97.9569 497.26 97.9569Z" class="tw-fill-text-alt2" />
-    </g>
-    <defs>
-      <clipPath id="clip0_3210_12788">
-        <rect width="506" height="116" class="tw-fill-text-alt2" />
-      </clipPath>
-    </defs>
-  </svg>
-`;
diff --git a/apps/web/src/app/admin-console/icons/business-unit-portal-logo.icon.ts b/apps/web/src/app/admin-console/icons/business-unit-portal-logo.icon.ts
deleted file mode 100644
index f913ee68ef0..00000000000
--- a/apps/web/src/app/admin-console/icons/business-unit-portal-logo.icon.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { svgIcon } from "@bitwarden/components";
-
-export const BusinessUnitPortalLogo = svgIcon`
-  <svg viewBox="0 0 506 116" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <g clip-path="url(#clip0_9780_21465)">
-      <path d="M502.34 115.543V88.1519H505.536V115.543H502.34Z" class="tw-fill-text-alt2" />
-      <path d="M487.924 116C486.377 116 485.083 115.734 484.043 115.201C483.003 114.643 482.23 113.92 481.723 113.032C481.215 112.119 480.962 111.143 480.962 110.103C480.962 108.81 481.292 107.719 481.951 106.831C482.636 105.918 483.587 105.233 484.804 104.777C486.047 104.295 487.493 104.054 489.141 104.054H494.239C494.239 102.862 494.049 101.873 493.668 101.087C493.313 100.3 492.781 99.7044 492.071 99.2986C491.36 98.8928 490.498 98.6899 489.484 98.6899C488.266 98.6899 487.214 98.9942 486.326 99.6029C485.438 100.212 484.893 101.112 484.69 102.304H481.418C481.57 100.934 482.027 99.7932 482.788 98.8801C483.574 97.9417 484.563 97.2315 485.755 96.7496C486.947 96.2424 488.19 95.9888 489.484 95.9888C491.259 95.9888 492.73 96.3185 493.897 96.9779C495.063 97.612 495.938 98.5123 496.522 99.679C497.13 100.82 497.435 102.165 497.435 103.712V115.543H494.582L494.391 112.157C494.138 112.69 493.808 113.197 493.402 113.679C493.022 114.136 492.565 114.542 492.033 114.897C491.525 115.226 490.929 115.493 490.245 115.696C489.56 115.898 488.786 116 487.924 116ZM488.418 113.299C489.306 113.299 490.105 113.121 490.815 112.766C491.551 112.386 492.172 111.878 492.679 111.244C493.187 110.61 493.567 109.9 493.821 109.114C494.1 108.302 494.239 107.478 494.239 106.641V106.527H489.408C488.19 106.527 487.201 106.679 486.44 106.983C485.679 107.262 485.134 107.668 484.804 108.201C484.475 108.708 484.31 109.291 484.31 109.951C484.31 110.636 484.462 111.232 484.766 111.739C485.096 112.221 485.565 112.601 486.174 112.88C486.783 113.159 487.531 113.299 488.418 113.299Z" class="tw-fill-text-alt2" />
-      <path d="M474.318 115.544C473.177 115.544 472.188 115.367 471.351 115.012C470.514 114.656 469.867 114.06 469.411 113.223C468.98 112.361 468.764 111.207 468.764 109.761V99.1472H465.454V96.4461H468.764L469.183 91.8428H471.96V96.4461H477.552V99.1472H471.96V109.761C471.96 110.954 472.201 111.765 472.683 112.196C473.164 112.602 474.014 112.805 475.232 112.805H477.286V115.544H474.318Z" class="tw-fill-text-alt2" />
-      <path d="M452.779 115.543V96.4453H455.671L455.937 100.098C456.368 99.2352 456.913 98.4997 457.573 97.891C458.258 97.2823 459.069 96.8131 460.008 96.4833C460.946 96.1536 462.011 95.9888 463.203 95.9888V99.3366H462.1C461.289 99.3366 460.515 99.4508 459.779 99.679C459.044 99.8819 458.384 100.224 457.801 100.706C457.243 101.163 456.799 101.809 456.47 102.646C456.14 103.483 455.975 104.511 455.975 105.728V115.543H452.779Z" class="tw-fill-text-alt2" />
-      <path d="M438.826 116C437.05 116 435.453 115.594 434.032 114.782C432.612 113.945 431.483 112.779 430.646 111.282C429.835 109.786 429.429 108.023 429.429 105.994C429.429 103.965 429.847 102.203 430.684 100.706C431.521 99.2098 432.65 98.0558 434.07 97.2442C435.516 96.4073 437.127 95.9888 438.902 95.9888C440.703 95.9888 442.313 96.4073 443.734 97.2442C445.154 98.0558 446.27 99.2098 447.081 100.706C447.893 102.203 448.299 103.965 448.299 105.994C448.299 108.023 447.88 109.786 447.043 111.282C446.232 112.779 445.103 113.945 443.657 114.782C442.237 115.594 440.627 116 438.826 116ZM438.826 113.261C439.942 113.261 440.969 112.994 441.907 112.462C442.846 111.904 443.594 111.092 444.152 110.027C444.735 108.936 445.027 107.592 445.027 105.994C445.027 104.371 444.748 103.027 444.19 101.962C443.632 100.896 442.884 100.098 441.945 99.5649C441.007 99.0069 439.993 98.7279 438.902 98.7279C437.837 98.7279 436.822 99.0069 435.858 99.5649C434.92 100.098 434.159 100.896 433.576 101.962C432.992 103.027 432.701 104.371 432.701 105.994C432.701 107.592 432.992 108.936 433.576 110.027C434.159 111.092 434.907 111.904 435.82 112.462C436.759 112.994 437.761 113.261 438.826 113.261Z" class="tw-fill-text-alt2" />
-      <path d="M409.502 115.543V88.9126H418.214C420.294 88.9126 422.006 89.2677 423.35 89.9778C424.695 90.6626 425.696 91.5884 426.356 92.755C427.015 93.9217 427.345 95.2406 427.345 96.7116C427.345 98.1826 427.015 99.5142 426.356 100.706C425.722 101.873 424.733 102.811 423.388 103.521C422.044 104.206 420.319 104.549 418.214 104.549H412.698V115.543H409.502ZM412.698 101.848H418.138C420.269 101.848 421.791 101.391 422.704 100.478C423.617 99.5395 424.073 98.2841 424.073 96.7116C424.073 95.0884 423.617 93.8329 422.704 92.9453C421.791 92.0322 420.269 91.5757 418.138 91.5757H412.698V101.848Z" class="tw-fill-text-alt2" />
-      <path d="M391.84 115.544C390.699 115.544 389.71 115.367 388.873 115.012C388.036 114.656 387.389 114.06 386.933 113.223C386.502 112.361 386.286 111.207 386.286 109.761V99.1472H382.976V96.4461H386.286L386.705 91.8428H389.482V96.4461H395.074V99.1472H389.482V109.761C389.482 110.954 389.723 111.765 390.205 112.196C390.686 112.602 391.536 112.805 392.753 112.805H394.808V115.544H391.84Z" class="tw-fill-text-alt2" />
-      <path d="M375.548 115.544V96.4458H378.743V115.544H375.548ZM377.146 92.337C376.512 92.337 375.979 92.1341 375.548 91.7283C375.142 91.2971 374.939 90.7645 374.939 90.1305C374.939 89.4964 375.142 88.9891 375.548 88.6087C375.979 88.2029 376.512 88 377.146 88C377.754 88 378.274 88.2029 378.705 88.6087C379.137 88.9891 379.352 89.4964 379.352 90.1305C379.352 90.7645 379.137 91.2971 378.705 91.7283C378.274 92.1341 377.754 92.337 377.146 92.337Z" class="tw-fill-text-alt2" />
-      <path d="M353.397 115.543V96.4453H356.288L356.479 99.7932C357.087 98.6011 357.95 97.6754 359.066 97.016C360.207 96.3312 361.5 95.9888 362.946 95.9888C364.442 95.9888 365.736 96.2804 366.827 96.8638C367.917 97.4471 368.767 98.3475 369.375 99.5649C369.984 100.782 370.289 102.317 370.289 104.168V115.543H367.093V104.511C367.093 102.583 366.674 101.137 365.837 100.174C365 99.2098 363.796 98.7279 362.223 98.7279C361.158 98.7279 360.194 98.9942 359.332 99.5269C358.495 100.034 357.823 100.782 357.316 101.771C356.834 102.761 356.593 103.965 356.593 105.386V115.543H353.397Z" class="tw-fill-text-alt2" />
-      <path d="M338.246 116C336.42 116 334.759 115.632 333.262 114.897C331.791 114.161 330.612 113.045 329.724 111.549C328.837 110.027 328.393 108.087 328.393 105.728V88.9126H331.588V105.766C331.588 107.491 331.867 108.898 332.425 109.989C333.009 111.08 333.808 111.878 334.822 112.386C335.837 112.893 337.003 113.147 338.322 113.147C339.666 113.147 340.833 112.893 341.822 112.386C342.811 111.878 343.585 111.08 344.143 109.989C344.701 108.898 344.98 107.491 344.98 105.766V88.9126H348.176V105.728C348.176 108.087 347.732 110.027 346.844 111.549C345.956 113.045 344.764 114.161 343.268 114.897C341.771 115.632 340.098 116 338.246 116Z" class="tw-fill-text-alt2" />
-      <path d="M306.457 116C304.91 116 303.541 115.746 302.349 115.239C301.157 114.706 300.205 113.958 299.495 112.994C298.81 112.031 298.379 110.902 298.202 109.608H301.474C301.626 110.268 301.905 110.889 302.311 111.473C302.716 112.031 303.262 112.474 303.946 112.804C304.657 113.134 305.506 113.299 306.495 113.299C307.408 113.299 308.157 113.172 308.74 112.918C309.323 112.639 309.754 112.272 310.033 111.815C310.312 111.359 310.452 110.864 310.452 110.331C310.452 109.57 310.262 108.987 309.881 108.581C309.526 108.176 308.994 107.858 308.283 107.63C307.573 107.377 306.724 107.161 305.734 106.983C304.898 106.831 304.073 106.628 303.262 106.375C302.475 106.121 301.765 105.791 301.131 105.386C300.497 104.98 299.99 104.473 299.609 103.864C299.229 103.23 299.039 102.482 299.039 101.619C299.039 100.529 299.318 99.5649 299.876 98.7279C300.459 97.8656 301.258 97.1935 302.272 96.7116C303.312 96.2297 304.542 95.9888 305.963 95.9888C307.992 95.9888 309.64 96.4833 310.908 97.4725C312.202 98.4616 312.95 99.8946 313.153 101.771H309.995C309.894 100.808 309.488 100.059 308.778 99.5269C308.068 98.9689 307.117 98.6899 305.925 98.6899C304.733 98.6899 303.82 98.9308 303.186 99.4127C302.577 99.8946 302.272 100.529 302.272 101.315C302.272 101.822 302.437 102.266 302.767 102.646C303.122 103.027 303.642 103.357 304.327 103.636C305.012 103.889 305.836 104.117 306.8 104.32C308.042 104.549 309.184 104.853 310.224 105.233C311.264 105.614 312.1 106.172 312.735 106.907C313.394 107.643 313.724 108.695 313.724 110.065C313.749 111.257 313.457 112.297 312.849 113.185C312.265 114.072 311.428 114.77 310.338 115.277C309.247 115.759 307.954 116 306.457 116Z" class="tw-fill-text-alt2" />
-      <path d="M287.361 116C285.814 116 284.444 115.746 283.252 115.239C282.06 114.706 281.109 113.958 280.399 112.994C279.714 112.031 279.283 110.902 279.106 109.608H282.377C282.53 110.268 282.809 110.889 283.214 111.473C283.62 112.031 284.165 112.474 284.85 112.804C285.56 113.134 286.41 113.299 287.399 113.299C288.312 113.299 289.06 113.172 289.644 112.918C290.227 112.639 290.658 112.272 290.937 111.815C291.216 111.359 291.356 110.864 291.356 110.331C291.356 109.57 291.166 108.987 290.785 108.581C290.43 108.176 289.897 107.858 289.187 107.63C288.477 107.377 287.627 107.161 286.638 106.983C285.801 106.831 284.977 106.628 284.165 106.375C283.379 106.121 282.669 105.791 282.035 105.386C281.401 104.98 280.894 104.473 280.513 103.864C280.133 103.23 279.943 102.482 279.943 101.619C279.943 100.529 280.222 99.5649 280.78 98.7279C281.363 97.8656 282.162 97.1935 283.176 96.7116C284.216 96.2297 285.446 95.9888 286.867 95.9888C288.896 95.9888 290.544 96.4833 291.812 97.4725C293.106 98.4616 293.854 99.8946 294.057 101.771H290.899C290.798 100.808 290.392 100.059 289.682 99.5269C288.972 98.9689 288.021 98.6899 286.829 98.6899C285.636 98.6899 284.723 98.9308 284.089 99.4127C283.481 99.8946 283.176 100.529 283.176 101.315C283.176 101.822 283.341 102.266 283.671 102.646C284.026 103.027 284.546 103.357 285.231 103.636C285.915 103.889 286.74 104.117 287.704 104.32C288.946 104.549 290.088 104.853 291.127 105.233C292.167 105.614 293.004 106.172 293.638 106.907C294.298 107.643 294.628 108.695 294.628 110.065C294.653 111.257 294.361 112.297 293.753 113.185C293.169 114.072 292.332 114.77 291.242 115.277C290.151 115.759 288.858 116 287.361 116Z" class="tw-fill-text-alt2" />
-      <path d="M266.956 116C265.18 116 263.595 115.581 262.2 114.744C260.805 113.907 259.702 112.741 258.891 111.244C258.104 109.748 257.711 107.998 257.711 105.994C257.711 103.965 258.104 102.215 258.891 100.744C259.677 99.2479 260.767 98.0812 262.162 97.2442C263.583 96.4073 265.206 95.9888 267.032 95.9888C268.909 95.9888 270.507 96.4073 271.825 97.2442C273.144 98.0812 274.146 99.1718 274.831 100.516C275.541 101.86 275.896 103.344 275.896 104.967C275.896 105.221 275.896 105.487 275.896 105.766C275.896 106.045 275.883 106.362 275.858 106.717H260.108V104.244H272.739C272.662 102.494 272.079 101.137 270.989 100.174C269.923 99.1845 268.579 98.6899 266.956 98.6899C265.891 98.6899 264.889 98.9435 263.95 99.4508C263.012 99.9327 262.251 100.643 261.668 101.581C261.11 102.52 260.831 103.699 260.831 105.119V106.185C260.831 107.757 261.122 109.076 261.706 110.141C262.289 111.181 263.037 111.967 263.95 112.5C264.889 113.032 265.891 113.299 266.956 113.299C268.3 113.299 269.403 113.007 270.266 112.424C271.153 111.815 271.8 110.991 272.206 109.951H275.364C275.034 111.118 274.489 112.157 273.728 113.07C272.967 113.958 272.016 114.668 270.874 115.201C269.758 115.734 268.452 116 266.956 116Z" class="tw-fill-text-alt2" />
-      <path d="M236.702 115.543V96.4453H239.593L239.783 99.7932C240.392 98.6011 241.254 97.6754 242.37 97.016C243.512 96.3312 244.805 95.9888 246.251 95.9888C247.747 95.9888 249.041 96.2804 250.131 96.8638C251.222 97.4471 252.072 98.3475 252.68 99.5649C253.289 100.782 253.593 102.317 253.593 104.168V115.543H250.398V104.511C250.398 102.583 249.979 101.137 249.142 100.174C248.305 99.2098 247.1 98.7279 245.528 98.7279C244.463 98.7279 243.499 98.9942 242.637 99.5269C241.8 100.034 241.128 100.782 240.62 101.771C240.138 102.761 239.897 103.965 239.897 105.386V115.543H236.702Z" class="tw-fill-text-alt2" />
-      <path d="M227.942 115.544V96.4458H231.138V115.544H227.942ZM229.54 92.337C228.906 92.337 228.373 92.1341 227.942 91.7283C227.536 91.2971 227.333 90.7645 227.333 90.1305C227.333 89.4964 227.536 88.9891 227.942 88.6087C228.373 88.2029 228.906 88 229.54 88C230.148 88 230.668 88.2029 231.099 88.6087C231.531 88.9891 231.746 89.4964 231.746 90.1305C231.746 90.7645 231.531 91.2971 231.099 91.7283C230.668 92.1341 230.148 92.337 229.54 92.337Z" class="tw-fill-text-alt2" />
-      <path d="M215.731 116C214.184 116 212.815 115.746 211.623 115.239C210.431 114.706 209.48 113.958 208.769 112.994C208.085 112.031 207.653 110.902 207.476 109.608H210.748C210.9 110.268 211.179 110.889 211.585 111.473C211.99 112.031 212.536 112.474 213.221 112.804C213.931 113.134 214.78 113.299 215.77 113.299C216.683 113.299 217.431 113.172 218.014 112.918C218.597 112.639 219.029 112.272 219.308 111.815C219.587 111.359 219.726 110.864 219.726 110.331C219.726 109.57 219.536 108.987 219.155 108.581C218.8 108.176 218.268 107.858 217.558 107.63C216.847 107.377 215.998 107.161 215.009 106.983C214.172 106.831 213.347 106.628 212.536 106.375C211.75 106.121 211.039 105.791 210.405 105.386C209.771 104.98 209.264 104.473 208.884 103.864C208.503 103.23 208.313 102.482 208.313 101.619C208.313 100.529 208.592 99.5649 209.15 98.7279C209.733 97.8656 210.532 97.1935 211.547 96.7116C212.587 96.2297 213.817 95.9888 215.237 95.9888C217.266 95.9888 218.914 96.4833 220.183 97.4725C221.476 98.4616 222.224 99.8946 222.427 101.771H219.27C219.168 100.808 218.762 100.059 218.052 99.5269C217.342 98.9689 216.391 98.6899 215.199 98.6899C214.007 98.6899 213.094 98.9308 212.46 99.4127C211.851 99.8946 211.547 100.529 211.547 101.315C211.547 101.822 211.712 102.266 212.041 102.646C212.396 103.027 212.916 103.357 213.601 103.636C214.286 103.889 215.11 104.117 216.074 104.32C217.317 104.549 218.458 104.853 219.498 105.233C220.538 105.614 221.375 106.172 222.009 106.907C222.668 107.643 222.998 108.695 222.998 110.065C223.023 111.257 222.732 112.297 222.123 113.185C221.54 114.072 220.703 114.77 219.612 115.277C218.521 115.759 217.228 116 215.731 116Z" class="tw-fill-text-alt2" />
-      <path d="M193.657 116C192.186 116 190.892 115.708 189.776 115.125C188.686 114.542 187.836 113.641 187.227 112.424C186.644 111.206 186.352 109.672 186.352 107.82V96.4453H189.548V107.478C189.548 109.406 189.966 110.851 190.803 111.815C191.64 112.779 192.832 113.261 194.38 113.261C195.445 113.261 196.409 113.007 197.271 112.5C198.133 111.967 198.805 111.206 199.287 110.217C199.794 109.228 200.048 108.023 200.048 106.603V96.4453H203.244V115.543H200.352L200.162 112.195C199.554 113.388 198.679 114.326 197.537 115.011C196.396 115.67 195.102 116 193.657 116Z" class="tw-fill-text-alt2" />
-      <path d="M164 115.543V88.9126H173.359C175.236 88.9126 176.783 89.2169 178 89.8257C179.243 90.409 180.169 91.2206 180.777 92.2605C181.386 93.275 181.69 94.4163 181.69 95.6844C181.69 97.054 181.386 98.1953 180.777 99.1084C180.194 100.021 179.42 100.719 178.457 101.201C177.518 101.683 176.516 101.974 175.451 102.076L175.984 101.695C177.125 101.721 178.178 102.025 179.141 102.608C180.105 103.192 180.866 103.978 181.424 104.967C182.007 105.956 182.299 107.06 182.299 108.277C182.299 109.621 181.969 110.851 181.31 111.967C180.651 113.058 179.674 113.933 178.381 114.592C177.112 115.226 175.54 115.543 173.663 115.543H164ZM167.196 112.88H173.321C175.122 112.88 176.516 112.462 177.506 111.625C178.52 110.762 179.027 109.57 179.027 108.049C179.027 106.552 178.507 105.36 177.468 104.473C176.453 103.56 175.045 103.103 173.245 103.103H167.196V112.88ZM167.196 100.554H173.131C174.855 100.554 176.161 100.148 177.049 99.3366C177.962 98.525 178.419 97.4218 178.419 96.0268C178.419 94.6826 177.962 93.6047 177.049 92.7931C176.161 91.9815 174.817 91.5757 173.016 91.5757H167.196V100.554Z" class="tw-fill-text-alt2" />
-      <path fill-rule="evenodd" clip-rule="evenodd" d="M121.787 19.0452C127.589 19.0452 132.101 21.264 135.417 25.8867C138.732 30.4168 140.39 36.6111 140.39 44.4696C140.39 52.6054 138.732 58.8922 135.325 63.3299C131.917 67.86 127.312 69.9864 121.511 69.9864C115.709 69.9864 111.288 67.9525 107.973 63.6997H107.052L105.302 68.0449C105.026 68.6921 104.381 69.0619 103.737 69.0619H96.3691C95.4481 69.0619 94.7114 68.3223 94.7114 67.3978V2.40376C94.7114 1.47924 95.4481 0.739619 96.3691 0.739619H106.315C107.236 0.739619 107.973 1.47924 107.973 2.40376V16.6414C107.973 18.6754 107.789 21.9112 107.42 26.3489H107.973C111.012 21.5414 115.709 19.0452 121.787 19.0452ZM117.551 29.8621C114.327 29.8621 111.841 30.8791 110.275 32.913C108.802 34.947 107.973 38.3677 107.973 42.9903V44.4696C107.973 49.7394 108.71 53.5299 110.275 55.7488C111.841 57.9676 114.327 59.1695 117.735 59.1695C120.405 59.1695 122.708 57.8752 124.273 55.2865C125.839 52.7903 126.668 48.9998 126.668 44.2847C126.668 39.4772 125.839 35.8715 124.273 33.4678C122.616 31.064 120.313 29.8621 117.551 29.8621ZM162.308 69.1544H152.362C151.441 69.1544 150.704 68.4147 150.704 67.4902V21.7263C150.704 20.8018 151.441 20.0622 152.362 20.0622H162.308C163.229 20.0622 163.966 20.8018 163.966 21.7263V67.3978C164.058 68.2298 163.229 69.1544 162.308 69.1544ZM198.685 59.262C200.619 59.262 202.921 58.8922 205.684 58.1525C206.421 57.9676 207.065 58.5223 207.065 59.262V66.9355C207.065 67.3978 206.789 67.7676 206.421 67.9525C203.289 69.2468 199.329 69.894 194.909 69.894C189.567 69.894 185.7 68.5996 183.305 65.8261C180.911 63.145 179.621 59.0771 179.621 53.7148V30.1395H174.372C173.727 30.1395 173.267 29.6772 173.267 29.03V24.6848C173.267 24.5923 173.359 24.4999 173.359 24.4074L180.634 20.0622L184.226 10.4471C184.41 9.98486 184.779 9.7075 185.239 9.7075H191.87C192.514 9.7075 192.975 10.1698 192.975 10.8169V20.1546H206.144C206.421 20.1546 206.697 20.432 206.697 20.7093V29.03C206.697 29.6772 206.236 30.1395 205.592 30.1395H193.067V53.6224C193.067 55.4714 193.62 56.9507 194.633 57.7827C195.554 58.7997 197.027 59.262 198.685 59.262ZM260.663 69.1544C259.374 69.1544 258.361 68.3223 257.809 67.1204L248.047 37.2583C247.402 35.1319 246.573 31.8961 245.468 27.7357H245.192L244.271 31.064L242.337 37.3508L232.299 67.2129C231.93 68.4147 230.825 69.1544 229.536 69.1544C228.247 69.1544 227.142 68.3223 226.773 67.028L214.525 24.0376C214.156 22.7433 215.169 21.3565 216.643 21.3565H216.919C217.84 21.3565 218.669 22.0037 218.945 22.9282L226.129 49.0922C227.878 55.9337 229.076 60.9261 229.628 64.2544H229.904C231.562 57.4129 232.851 52.8828 233.68 50.5714L242.982 23.2055C243.35 22.0961 244.363 21.3565 245.652 21.3565C246.85 21.3565 247.863 22.0961 248.231 23.2055L256.888 50.3865C259.006 57.3205 260.295 61.7582 260.756 64.0695H261.032C261.308 62.2204 262.413 57.0431 264.531 48.7224L271.438 22.9282C271.715 22.0037 272.544 21.3565 273.464 21.3565C274.846 21.3565 275.859 22.6508 275.491 24.0376L263.887 67.028C263.518 68.3223 262.413 69.1544 261.032 69.1544H260.663ZM315.367 69.1544C314.538 69.1544 313.801 68.5072 313.709 67.6751L312.88 61.5733H312.42C310.026 64.6242 307.631 66.8431 305.052 68.1374C302.566 69.4317 299.527 69.9864 296.119 69.9864C291.423 69.9864 287.831 68.7846 285.252 66.3808C282.95 64.2544 281.661 61.3884 281.477 57.7827C281.108 52.9752 283.134 48.3526 287.002 45.6715C290.962 43.0828 296.488 41.5111 303.947 41.5111L312.973 41.2338V38.0904C312.973 33.4678 312.052 30.1395 310.118 27.8282C308.184 25.5169 305.329 24.4074 301.277 24.4074C297.409 24.4074 293.541 25.3319 289.489 27.2734C288.476 27.7357 287.278 27.2734 286.818 26.2565C286.358 25.2395 286.818 24.0376 287.831 23.6678C292.436 21.8188 296.948 20.8018 301.553 20.8018C306.802 20.8018 310.67 22.1886 313.341 24.9621C315.919 27.6433 317.209 31.9885 317.209 37.6281V67.6751C317.117 68.2298 316.288 69.1544 315.367 69.1544ZM296.304 66.011C301.461 66.011 305.421 64.5317 308.276 61.6657C311.223 58.7997 312.696 54.6393 312.696 49.5545V44.9318L304.408 45.3017C297.685 45.579 292.988 46.6884 290.041 48.445C287.186 50.2016 285.713 53.0677 285.713 56.7658C285.713 59.7242 286.634 62.128 288.384 63.7921C290.41 65.1789 292.988 66.011 296.304 66.011ZM350.823 20.432C352.204 20.432 353.586 20.5244 355.151 20.7093C356.348 20.8942 357.085 22.0037 356.901 23.1131C356.717 24.2225 355.612 24.8697 354.507 24.6848C353.125 24.4999 351.744 24.315 350.362 24.315C346.31 24.315 342.995 26.0716 340.416 29.4923C337.838 32.913 336.548 37.3508 336.548 42.5281V66.7506C336.548 67.9525 335.627 68.877 334.43 68.877C333.233 68.877 332.312 67.9525 332.312 66.7506V23.298C332.312 22.281 333.141 21.4489 334.154 21.4489C335.167 21.4489 335.996 22.1886 335.996 23.2055L336.364 30.047H336.64C338.574 26.5338 340.693 24.0376 342.903 22.6508C345.021 21.1716 347.692 20.432 350.823 20.432ZM383.24 20.432C386.647 20.432 389.686 21.0791 392.173 22.281C394.751 23.4829 396.962 25.7018 398.896 28.7527H399.172C398.988 24.9621 398.896 21.4489 398.896 17.9358V2.86602C398.896 1.66414 399.816 0.739619 401.014 0.739619C402.211 0.739619 403.132 1.66414 403.132 2.86602V67.4902C403.132 68.3223 402.487 68.9695 401.658 68.9695C400.922 68.9695 400.277 68.4147 400.185 67.5827L399.264 61.5733H398.896C395.304 67.028 390.055 69.7091 383.332 69.7091C376.701 69.7091 371.82 67.6751 368.228 63.5148C364.821 59.3544 362.979 53.4375 362.979 45.579C362.979 37.3508 364.637 31.064 368.136 26.6263C371.636 22.6508 376.609 20.432 383.24 20.432ZM383.24 24.4074C377.99 24.4074 374.122 26.2565 371.452 29.9546C368.873 33.5602 367.584 38.83 367.584 45.8564C367.584 59.3544 372.833 66.1034 383.332 66.1034C388.765 66.1034 392.633 64.5318 395.12 61.3884C397.698 58.245 398.896 53.0677 398.896 45.8564V45.1168C398.896 37.7206 397.698 32.4508 395.12 29.3074C392.725 25.9791 388.765 24.4074 383.24 24.4074ZM438.404 69.9864C431.497 69.9864 426.155 67.86 422.195 63.5148C418.327 59.262 416.393 53.2526 416.393 45.579C416.393 37.9055 418.235 31.8036 422.011 27.2734C425.787 22.6508 430.76 20.3395 437.114 20.3395C442.64 20.3395 447.152 22.281 450.284 26.164C453.599 30.047 455.165 35.4093 455.165 42.1583V45.6715H420.906C420.998 52.2356 422.471 57.228 425.511 60.7412C428.55 64.2544 432.786 65.8261 438.404 65.8261C441.074 65.8261 443.561 65.6412 445.587 65.2714C447.06 64.994 448.81 64.5317 450.928 63.7921C452.125 63.3299 453.415 64.2544 453.415 65.5487C453.415 66.2883 452.954 67.028 452.218 67.3053C450.007 68.2298 447.889 68.7846 445.955 69.1544C443.653 69.8015 441.166 69.9864 438.404 69.9864ZM437.114 24.315C432.51 24.315 428.826 25.7942 426.063 28.8451C423.3 31.8036 421.735 36.2413 421.182 41.8809H450.652C450.652 36.4262 449.455 31.9885 447.06 28.9376C444.666 25.8867 441.351 24.315 437.114 24.315ZM503.79 69.1544C502.593 69.1544 501.672 68.2298 501.672 67.028V38.0904C501.672 33.2829 500.659 29.7697 498.725 27.6433C496.607 25.5169 493.567 24.315 489.331 24.315C483.621 24.315 479.477 25.7018 476.899 28.6602C474.32 31.5263 472.846 36.2413 472.846 42.6205V66.8431C472.846 68.0449 471.926 68.9695 470.728 68.9695C469.531 68.9695 468.61 68.0449 468.61 66.8431V23.298C468.61 22.1886 469.439 21.3565 470.544 21.3565C471.557 21.3565 472.294 22.0961 472.478 23.0206L473.031 27.8282H473.307C476.438 22.8357 481.872 20.3395 489.792 20.3395C500.567 20.3395 506 26.164 506 37.813V66.8431C505.908 68.1374 504.895 69.1544 503.79 69.1544ZM157.427 0C153.099 0 149.599 3.32829 149.599 7.48864V8.22826C149.599 12.2962 153.191 15.7169 157.427 15.7169C161.663 15.7169 165.255 12.2962 165.255 8.22826V7.58109C165.255 3.32829 161.663 0 157.427 0Z" class="tw-fill-text-alt2" />
-      <path d="M55.906 43.6364V10.5787H32.8859V69.3078C36.9624 67.1384 40.6106 64.7796 43.8307 62.2314C51.8809 55.8954 55.906 49.697 55.906 43.6364ZM65.7718 3.96712V43.6364C65.7718 46.5979 65.198 49.5335 64.0504 52.4432C62.9028 55.353 61.4812 57.9356 59.7855 60.1911C58.0898 62.4466 56.0687 64.6419 53.7222 66.7769C51.3756 68.9118 49.2089 70.6853 47.2221 72.0971C45.2352 73.5089 43.1627 74.8433 41.0046 76.1002C38.8464 77.3571 37.3135 78.2093 36.4057 78.657C35.4979 79.1047 34.77 79.449 34.2219 79.6901C33.8108 79.8967 33.3655 80 32.8859 80C32.4063 80 31.961 79.8967 31.5499 79.6901C31.0018 79.449 30.2739 79.1047 29.3661 78.657C28.4583 78.2093 26.9253 77.3571 24.7672 76.1002C22.609 74.8433 20.5365 73.5089 18.5497 72.0971C16.5628 70.6853 14.3961 68.9118 12.0496 66.7769C9.70305 64.6419 7.68194 62.4466 5.98626 60.1911C4.29058 57.9356 2.86895 55.353 1.72137 52.4432C0.57379 49.5335 0 46.5979 0 43.6364V3.96712C0 3.0718 0.325433 2.29701 0.9763 1.64274C1.62717 0.988473 2.39793 0.661339 3.28859 0.661339H62.4832C63.3738 0.661339 64.1446 0.988473 64.7955 1.64274C65.4463 2.29701 65.7718 3.0718 65.7718 3.96712Z" class="tw-fill-text-alt2" />
-    </g>
-    <defs>
-      <clipPath id="clip0_9780_21465">
-        <rect width="506" height="116" class="tw-fill-text-alt2" />
-      </clipPath>
-    </defs>
-  </svg>
-`;
diff --git a/apps/web/src/app/admin-console/icons/provider-portal-logo.ts b/apps/web/src/app/admin-console/icons/provider-portal-logo.ts
deleted file mode 100644
index bc77c3f7902..00000000000
--- a/apps/web/src/app/admin-console/icons/provider-portal-logo.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { svgIcon } from "@bitwarden/components";
-
-export const ProviderPortalLogo = svgIcon`
-  <svg viewBox="0 0 506 116" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <g clip-path="url(#clip0_3210_12796)">
-      <path fill-rule="evenodd" clip-rule="evenodd" d="M121.787 20.4684C127.589 20.4684 132.101 22.7366 135.417 27.4619C138.732 32.0928 140.39 38.4247 140.39 46.4578C140.39 54.7744 138.732 61.2009 135.325 65.7372C131.917 70.3681 127.312 72.5417 121.511 72.5417C115.709 72.5417 111.288 70.4626 107.973 66.1153H107.052L105.302 70.5571C105.026 71.2186 104.381 71.5967 103.737 71.5967H96.369C95.4481 71.5967 94.7114 70.8406 94.7114 69.8955V3.45718C94.7114 2.51211 95.4481 1.75606 96.369 1.75606H106.315C107.236 1.75606 107.973 2.51211 107.973 3.45718V18.0112C107.973 20.0904 107.789 23.3981 107.42 27.9345H107.973C111.012 23.0201 115.709 20.4684 121.787 20.4684ZM117.551 31.5257C114.327 31.5257 111.841 32.5653 110.275 34.6445C108.802 36.7236 107.973 40.2204 107.973 44.9457V46.4578C107.973 51.8447 108.71 55.7195 110.275 57.9877C111.841 60.2558 114.327 61.4844 117.735 61.4844C120.405 61.4844 122.708 60.1613 124.273 57.5151C125.839 54.9634 126.668 51.0887 126.668 46.2688C126.668 41.3544 125.839 37.6687 124.273 35.2115C122.616 32.7543 120.313 31.5257 117.551 31.5257ZM162.308 71.6912H152.362C151.441 71.6912 150.704 70.9351 150.704 69.99V23.2091C150.704 22.2641 151.441 21.508 152.362 21.508H162.308C163.229 21.508 163.966 22.2641 163.966 23.2091V69.8955C164.058 70.7461 163.229 71.6912 162.308 71.6912ZM198.685 61.5789C200.619 61.5789 202.921 61.2009 205.684 60.4448C206.421 60.2558 207.065 60.8229 207.065 61.5789V69.423C207.065 69.8955 206.789 70.2736 206.421 70.4626C203.289 71.7857 199.329 72.4472 194.909 72.4472C189.567 72.4472 185.7 71.1241 183.305 68.2889C180.911 65.5482 179.621 61.3899 179.621 55.9085V31.8092H174.372C173.727 31.8092 173.267 31.3367 173.267 30.6752V26.2333C173.267 26.1388 173.359 26.0443 173.359 25.9498L180.634 21.508L184.226 11.6793C184.41 11.2067 184.779 10.9232 185.239 10.9232H191.87C192.514 10.9232 192.975 11.3958 192.975 12.0573V21.6025H206.144C206.421 21.6025 206.697 21.886 206.697 22.1695V30.6752C206.697 31.3367 206.236 31.8092 205.592 31.8092H193.067V55.814C193.067 57.7041 193.62 59.2163 194.633 60.0668C195.554 61.1064 197.027 61.5789 198.685 61.5789ZM260.663 71.6912C259.374 71.6912 258.361 70.8406 257.809 69.612L248.047 39.0863C247.402 36.9126 246.573 33.6049 245.468 29.3521H245.192L244.271 32.7543L242.337 39.1808L232.299 69.7065C231.93 70.9351 230.825 71.6912 229.536 71.6912C228.247 71.6912 227.142 70.8406 226.773 69.5175L214.525 25.5718C214.156 24.2487 215.169 22.8311 216.643 22.8311H216.919C217.84 22.8311 218.669 23.4926 218.945 24.4377L226.128 51.1832C227.878 58.1767 229.075 63.28 229.628 66.6823H229.904C231.562 59.6888 232.851 55.0579 233.68 52.6953L242.982 24.7212C243.35 23.5871 244.363 22.8311 245.652 22.8311C246.849 22.8311 247.862 23.5871 248.231 24.7212L256.888 52.5063C259.006 59.5943 260.295 64.1306 260.756 66.4933H261.032C261.308 64.6031 262.413 59.3108 264.531 50.8051L271.438 24.4377C271.715 23.4926 272.544 22.8311 273.464 22.8311C274.846 22.8311 275.859 24.1542 275.491 25.5718L263.887 69.5175C263.518 70.8406 262.413 71.6912 261.032 71.6912H260.663ZM315.367 71.6912C314.538 71.6912 313.801 71.0296 313.709 70.179L312.88 63.9416H312.42C310.025 67.0603 307.631 69.3285 305.052 70.6516C302.566 71.9747 299.527 72.5417 296.119 72.5417C291.423 72.5417 287.831 71.3131 285.252 68.856C282.95 66.6823 281.661 63.7526 281.477 60.0668C281.108 55.1525 283.134 50.4271 287.002 47.6864C290.962 45.0402 296.488 43.4336 303.947 43.4336L312.972 43.1501V39.9368C312.972 35.2115 312.052 31.8092 310.118 29.4466C308.184 27.0839 305.329 25.9498 301.277 25.9498C297.409 25.9498 293.541 26.8949 289.489 28.8795C288.476 29.3521 287.278 28.8795 286.818 27.84C286.358 26.8004 286.818 25.5718 287.831 25.1938C292.436 23.3036 296.948 22.2641 301.553 22.2641C306.802 22.2641 310.67 23.6817 313.341 26.5169C315.919 29.2576 317.209 33.6994 317.209 39.4643V70.179C317.117 70.7461 316.288 71.6912 315.367 71.6912ZM296.304 68.4779C301.461 68.4779 305.421 66.9658 308.276 64.0361C311.223 61.1064 312.696 56.8536 312.696 51.6557V46.9304L304.408 47.3084C297.685 47.5919 292.988 48.726 290.041 50.5216C287.186 52.3172 285.713 55.247 285.713 59.0272C285.713 62.0515 286.634 64.5086 288.384 66.2098C290.41 67.6274 292.988 68.4779 296.304 68.4779ZM350.823 21.886C352.204 21.886 353.586 21.9805 355.151 22.1695C356.348 22.3586 357.085 23.4926 356.901 24.6267C356.717 25.7608 355.612 26.4224 354.507 26.2333C353.125 26.0443 351.744 25.8553 350.362 25.8553C346.31 25.8553 342.995 27.6509 340.416 31.1477C337.838 34.6445 336.548 39.1808 336.548 44.4732V69.234C336.548 70.4626 335.627 71.4076 334.43 71.4076C333.233 71.4076 332.312 70.4626 332.312 69.234V24.8157C332.312 23.7762 333.141 22.9256 334.154 22.9256C335.167 22.9256 335.996 23.6817 335.996 24.7212L336.364 31.7147H336.64C338.574 28.1235 340.693 25.5718 342.903 24.1542C345.021 22.6421 347.692 21.886 350.823 21.886ZM383.24 21.886C386.647 21.886 389.686 22.5476 392.173 23.7762C394.751 25.0048 396.962 27.2729 398.896 30.3916H399.172C398.988 26.5169 398.896 22.9256 398.896 19.3343V3.92971C398.896 2.70112 399.816 1.75606 401.014 1.75606C402.211 1.75606 403.132 2.70112 403.132 3.92971V69.99C403.132 70.8406 402.487 71.5021 401.658 71.5021C400.922 71.5021 400.277 70.9351 400.185 70.0845L399.264 63.9416H398.896C395.304 69.5175 390.055 72.2582 383.332 72.2582C376.701 72.2582 371.82 70.179 368.228 65.9262C364.821 61.6734 362.979 55.625 362.979 47.5919C362.979 39.1808 364.637 32.7543 368.136 28.218C371.636 24.1542 376.609 21.886 383.24 21.886ZM383.24 25.9498C377.99 25.9498 374.122 27.84 371.452 31.6202C368.873 35.306 367.584 40.6929 367.584 47.8754C367.584 61.6734 372.833 68.5724 383.332 68.5724C388.765 68.5724 392.633 66.9658 395.12 63.7526C397.698 60.5393 398.896 55.247 398.896 47.8754V47.1194C398.896 39.5588 397.698 34.1719 395.12 30.9587C392.725 27.5564 388.765 25.9498 383.24 25.9498ZM438.404 72.5417C431.497 72.5417 426.155 70.3681 422.195 65.9262C418.327 61.5789 416.393 55.436 416.393 47.5919C416.393 39.7478 418.235 33.5104 422.011 28.8795C425.787 24.1542 430.76 21.7915 437.114 21.7915C442.64 21.7915 447.152 23.7762 450.284 27.7455C453.599 31.7147 455.164 37.1961 455.164 44.0951V47.6864H420.906C420.998 54.3964 422.471 59.4998 425.51 63.091C428.55 66.6823 432.786 68.2889 438.404 68.2889C441.074 68.2889 443.561 68.0999 445.587 67.7219C447.06 67.4384 448.81 66.9658 450.928 66.2098C452.125 65.7372 453.415 66.6823 453.415 68.0054C453.415 68.7615 452.954 69.5175 452.217 69.801C450.007 70.7461 447.889 71.3131 445.955 71.6912C443.653 72.3527 441.166 72.5417 438.404 72.5417ZM437.114 25.8553C432.51 25.8553 428.826 27.3674 426.063 30.4862C423.3 33.5104 421.735 38.0467 421.182 43.8116H450.652C450.652 38.2357 449.455 33.6994 447.06 30.5807C444.666 27.4619 441.351 25.8553 437.114 25.8553ZM503.79 71.6912C502.593 71.6912 501.672 70.7461 501.672 69.5175V39.9368C501.672 35.0225 500.659 31.4312 498.725 29.2576C496.606 27.0839 493.567 25.8553 489.331 25.8553C483.621 25.8553 479.477 27.2729 476.898 30.2971C474.32 33.2269 472.846 38.0467 472.846 44.5677V69.3285C472.846 70.5571 471.925 71.5021 470.728 71.5021C469.531 71.5021 468.61 70.5571 468.61 69.3285V24.8157C468.61 23.6817 469.439 22.8311 470.544 22.8311C471.557 22.8311 472.294 23.5871 472.478 24.5322L473.031 29.4466H473.307C476.438 24.3432 481.872 21.7915 489.792 21.7915C500.566 21.7915 506 27.7455 506 39.6533V69.3285C505.908 70.6516 504.895 71.6912 503.79 71.6912ZM157.427 1C153.099 1 149.599 4.40225 149.599 8.65506V9.41111C149.599 13.5694 153.191 17.0662 157.427 17.0662C161.663 17.0662 165.255 13.5694 165.255 9.41111V8.74957C165.255 4.40225 161.663 1 157.427 1Z" class="tw-fill-text-alt2" />
-      <path d="M55.906 45.6061V11.8138H32.8859V71.8481C36.9624 69.6304 40.6106 67.2192 43.8307 64.6144C51.8809 58.1375 55.906 51.8014 55.906 45.6061ZM65.7718 5.05527V45.6061C65.7718 48.6334 65.198 51.6342 64.0504 54.6087C62.9028 57.5831 61.4812 60.2231 59.7855 62.5287C58.0898 64.8344 56.0687 67.0784 53.7222 69.2608C51.3756 71.4432 49.2089 73.2561 47.2221 74.6993C45.2352 76.1425 43.1627 77.5065 41.0046 78.7913C38.8464 80.0761 37.3135 80.9474 36.4057 81.405C35.4979 81.8626 34.77 82.2146 34.2219 82.461C33.8108 82.6722 33.3655 82.7778 32.8859 82.7778C32.4063 82.7778 31.961 82.6722 31.5499 82.461C31.0018 82.2146 30.2738 81.8626 29.3661 81.405C28.4583 80.9474 26.9253 80.0761 24.7672 78.7913C22.609 77.5065 20.5365 76.1425 18.5497 74.6993C16.5628 73.2561 14.3961 71.4432 12.0496 69.2608C9.70305 67.0784 7.68194 64.8344 5.98626 62.5287C4.29058 60.2231 2.86895 57.5831 1.72137 54.6087C0.57379 51.6342 0 48.6334 0 45.6061V5.05527C0 4.14006 0.325433 3.34806 0.9763 2.67925C1.62717 2.01044 2.39793 1.67604 3.28859 1.67604H62.4832C63.3738 1.67604 64.1446 2.01044 64.7955 2.67925C65.4463 3.34806 65.7718 4.14006 65.7718 5.05527Z" class="tw-fill-text-alt2" />
-      <path d="M249.398 115V87.6999H258.368C260.5 87.6999 262.255 88.0509 263.633 88.7529C265.011 89.4549 266.025 90.4039 266.675 91.5999C267.351 92.7959 267.689 94.1479 267.689 95.6559C267.689 97.1379 267.364 98.4769 266.714 99.6729C266.064 100.869 265.05 101.831 263.672 102.559C262.294 103.261 260.526 103.612 258.368 103.612H252.674V115H249.398ZM252.674 100.843H258.29C260.474 100.843 262.021 100.388 262.931 99.4779C263.867 98.5419 264.335 97.2679 264.335 95.6559C264.335 94.0179 263.867 92.7439 262.931 91.8339C262.021 90.8979 260.474 90.4299 258.29 90.4299H252.674V100.843Z" class="tw-fill-text-alt2" />
-      <path d="M271.788 115V95.6559H274.752L275.025 99.3609C275.623 98.0869 276.533 97.0729 277.755 96.3189C278.977 95.5649 280.485 95.1879 282.279 95.1879V98.6199H281.382C280.238 98.6199 279.185 98.8279 278.223 99.2439C277.261 99.6339 276.494 100.31 275.922 101.272C275.35 102.234 275.064 103.56 275.064 105.25V115H271.788Z" class="tw-fill-text-alt2" />
-      <path d="M294.046 115.468C292.226 115.468 290.588 115.052 289.132 114.22C287.676 113.388 286.519 112.218 285.661 110.71C284.829 109.176 284.413 107.382 284.413 105.328C284.413 103.274 284.842 101.493 285.7 99.9849C286.558 98.4509 287.715 97.2679 289.171 96.4359C290.653 95.6039 292.304 95.1879 294.124 95.1879C295.944 95.1879 297.582 95.6039 299.038 96.4359C300.494 97.2679 301.638 98.4509 302.47 99.9849C303.328 101.493 303.757 103.274 303.757 105.328C303.757 107.382 303.328 109.176 302.47 110.71C301.612 112.218 300.442 113.388 298.96 114.22C297.504 115.052 295.866 115.468 294.046 115.468ZM294.046 112.66C295.164 112.66 296.204 112.387 297.166 111.841C298.128 111.295 298.908 110.476 299.506 109.384C300.104 108.292 300.403 106.94 300.403 105.328C300.403 103.716 300.104 102.364 299.506 101.272C298.934 100.18 298.167 99.3609 297.205 98.8149C296.243 98.2689 295.216 97.9959 294.124 97.9959C293.006 97.9959 291.966 98.2689 291.004 98.8149C290.042 99.3609 289.262 100.18 288.664 101.272C288.066 102.364 287.767 103.716 287.767 105.328C287.767 106.94 288.066 108.292 288.664 109.384C289.262 110.476 290.029 111.295 290.965 111.841C291.927 112.387 292.954 112.66 294.046 112.66Z" class="tw-fill-text-alt2" />
-      <path d="M312.899 115L305.567 95.6559H308.999L314.81 111.841L320.66 95.6559H324.014L316.682 115H312.899Z" class="tw-fill-text-alt2" />
-      <path d="M329.649 91.3659C328.999 91.3659 328.453 91.1579 328.011 90.7419C327.595 90.2999 327.387 89.7539 327.387 89.1039C327.387 88.4799 327.595 87.9599 328.011 87.5439C328.453 87.1279 328.999 86.9199 329.649 86.9199C330.273 86.9199 330.806 87.1279 331.248 87.5439C331.69 87.9599 331.911 88.4799 331.911 89.1039C331.911 89.7539 331.69 90.2999 331.248 90.7419C330.806 91.1579 330.273 91.3659 329.649 91.3659ZM328.011 115V95.6559H331.287V115H328.011Z" class="tw-fill-text-alt2" />
-      <path d="M345.766 115.468C343.842 115.468 342.152 115.026 340.696 114.142C339.266 113.258 338.148 112.049 337.342 110.515C336.562 108.981 336.172 107.239 336.172 105.289C336.172 103.339 336.575 101.61 337.381 100.102C338.187 98.5679 339.305 97.3719 340.735 96.5139C342.165 95.6299 343.855 95.1879 345.805 95.1879C347.391 95.1879 348.795 95.5129 350.017 96.1629C351.239 96.8129 352.188 97.7229 352.864 98.8929V86.9199H356.14V115H353.176L352.864 111.802C352.24 112.738 351.343 113.583 350.173 114.337C349.003 115.091 347.534 115.468 345.766 115.468ZM346.117 112.621C347.417 112.621 348.561 112.322 349.549 111.724C350.563 111.1 351.343 110.242 351.889 109.15C352.461 108.058 352.747 106.784 352.747 105.328C352.747 103.872 352.461 102.598 351.889 101.506C351.343 100.414 350.563 99.5689 349.549 98.9709C348.561 98.3469 347.417 98.0349 346.117 98.0349C344.843 98.0349 343.699 98.3469 342.685 98.9709C341.697 99.5689 340.917 100.414 340.345 101.506C339.799 102.598 339.526 103.872 339.526 105.328C339.526 106.784 339.799 108.058 340.345 109.15C340.917 110.242 341.697 111.1 342.685 111.724C343.699 112.322 344.843 112.621 346.117 112.621Z" class="tw-fill-text-alt2" />
-      <path d="M370.177 115.468C368.331 115.468 366.693 115.052 365.263 114.22C363.833 113.362 362.702 112.179 361.87 110.671C361.064 109.163 360.661 107.382 360.661 105.328C360.661 103.3 361.064 101.532 361.87 100.024C362.676 98.4899 363.794 97.3069 365.224 96.4749C366.68 95.6169 368.357 95.1879 370.255 95.1879C372.127 95.1879 373.739 95.6169 375.091 96.4749C376.469 97.3069 377.522 98.4119 378.25 99.7899C378.978 101.168 379.342 102.65 379.342 104.236C379.342 104.522 379.329 104.808 379.303 105.094C379.303 105.38 379.303 105.705 379.303 106.069H363.898C363.976 107.551 364.314 108.786 364.912 109.774C365.536 110.736 366.303 111.464 367.213 111.958C368.149 112.452 369.137 112.699 370.177 112.699C371.529 112.699 372.66 112.387 373.57 111.763C374.48 111.139 375.143 110.294 375.559 109.228H378.796C378.276 111.022 377.275 112.517 375.793 113.713C374.337 114.883 372.465 115.468 370.177 115.468ZM370.177 97.9569C368.617 97.9569 367.226 98.4379 366.004 99.3999C364.808 100.336 364.119 101.714 363.937 103.534H376.105C376.027 101.792 375.429 100.427 374.311 99.4389C373.193 98.4509 371.815 97.9569 370.177 97.9569Z" class="tw-fill-text-alt2" />
-      <path d="M383.684 115V95.6559H386.648L386.921 99.3609C387.519 98.0869 388.429 97.0729 389.651 96.3189C390.873 95.5649 392.381 95.1879 394.175 95.1879V98.6199H393.278C392.134 98.6199 391.081 98.8279 390.119 99.2439C389.157 99.6339 388.39 100.31 387.818 101.272C387.246 102.234 386.96 103.56 386.96 105.25V115H383.684Z" class="tw-fill-text-alt2" />
-      <path d="M408.368 115V87.6999H417.338C419.47 87.6999 421.225 88.0509 422.603 88.7529C423.981 89.4549 424.995 90.4039 425.645 91.5999C426.321 92.7959 426.659 94.1479 426.659 95.6559C426.659 97.1379 426.334 98.4769 425.684 99.6729C425.034 100.869 424.02 101.831 422.642 102.559C421.264 103.261 419.496 103.612 417.338 103.612H411.644V115H408.368ZM411.644 100.843H417.26C419.444 100.843 420.991 100.388 421.901 99.4779C422.837 98.5419 423.305 97.2679 423.305 95.6559C423.305 94.0179 422.837 92.7439 421.901 91.8339C420.991 90.8979 419.444 90.4299 417.26 90.4299H411.644V100.843Z" class="tw-fill-text-alt2" />
-      <path d="M438.43 115.468C436.61 115.468 434.972 115.052 433.516 114.22C432.06 113.388 430.903 112.218 430.045 110.71C429.213 109.176 428.797 107.382 428.797 105.328C428.797 103.274 429.226 101.493 430.084 99.9849C430.942 98.4509 432.099 97.2679 433.555 96.4359C435.037 95.6039 436.688 95.1879 438.508 95.1879C440.328 95.1879 441.966 95.6039 443.422 96.4359C444.878 97.2679 446.022 98.4509 446.854 99.9849C447.712 101.493 448.141 103.274 448.141 105.328C448.141 107.382 447.712 109.176 446.854 110.71C445.996 112.218 444.826 113.388 443.344 114.22C441.888 115.052 440.25 115.468 438.43 115.468ZM438.43 112.66C439.548 112.66 440.588 112.387 441.55 111.841C442.512 111.295 443.292 110.476 443.89 109.384C444.488 108.292 444.787 106.94 444.787 105.328C444.787 103.716 444.488 102.364 443.89 101.272C443.318 100.18 442.551 99.3609 441.589 98.8149C440.627 98.2689 439.6 97.9959 438.508 97.9959C437.39 97.9959 436.35 98.2689 435.388 98.8149C434.426 99.3609 433.646 100.18 433.048 101.272C432.45 102.364 432.151 103.716 432.151 105.328C432.151 106.94 432.45 108.292 433.048 109.384C433.646 110.476 434.413 111.295 435.349 111.841C436.311 112.387 437.338 112.66 438.43 112.66Z" class="tw-fill-text-alt2" />
-      <path d="M452.696 115V95.6559H455.66L455.933 99.3609C456.531 98.0869 457.441 97.0729 458.663 96.3189C459.885 95.5649 461.393 95.1879 463.187 95.1879V98.6199H462.29C461.146 98.6199 460.093 98.8279 459.131 99.2439C458.169 99.6339 457.402 100.31 456.83 101.272C456.258 102.234 455.972 103.56 455.972 105.25V115H452.696Z" class="tw-fill-text-alt2" />
-      <path d="M474.508 115C472.74 115 471.349 114.571 470.335 113.713C469.321 112.855 468.814 111.308 468.814 109.072V98.4249H465.46V95.6559H468.814L469.243 91.0149H472.09V95.6559H477.784V98.4249H472.09V109.072C472.09 110.294 472.337 111.126 472.831 111.568C473.325 111.984 474.196 112.192 475.444 112.192H477.472V115H474.508Z" class="tw-fill-text-alt2" />
-      <path d="M488.381 115.468C486.769 115.468 485.43 115.195 484.364 114.649C483.298 114.103 482.505 113.375 481.985 112.465C481.465 111.555 481.205 110.567 481.205 109.501C481.205 107.525 481.959 106.004 483.467 104.938C484.975 103.872 487.029 103.339 489.629 103.339H494.855V103.105C494.855 101.415 494.413 100.141 493.529 99.2829C492.645 98.3989 491.462 97.9569 489.98 97.9569C488.706 97.9569 487.601 98.2819 486.665 98.9319C485.755 99.5559 485.183 100.479 484.949 101.701H481.595C481.725 100.297 482.193 99.1139 482.999 98.1519C483.831 97.1899 484.858 96.4619 486.08 95.9679C487.302 95.4479 488.602 95.1879 489.98 95.1879C492.684 95.1879 494.712 95.9159 496.064 97.3719C497.442 98.8019 498.131 100.713 498.131 103.105V115H495.206L495.011 111.529C494.465 112.621 493.659 113.557 492.593 114.337C491.553 115.091 490.149 115.468 488.381 115.468ZM488.888 112.699C490.136 112.699 491.202 112.374 492.086 111.724C492.996 111.074 493.685 110.229 494.153 109.189C494.621 108.149 494.855 107.057 494.855 105.913V105.874H489.902C487.978 105.874 486.613 106.212 485.807 106.888C485.027 107.538 484.637 108.357 484.637 109.345C484.637 110.359 485.001 111.178 485.729 111.802C486.483 112.4 487.536 112.699 488.888 112.699Z" class="tw-fill-text-alt2" />
-      <path d="M503.045 115V86.9199H506.322V115H503.045Z" class="tw-fill-text-alt2" />
-    </g>
-    <defs>
-      <clipPath id="clip0_3210_12796">
-        <rect width="506" height="116" class="tw-fill-text-alt2" />
-      </clipPath>
-    </defs>
-  </svg>
-`;
diff --git a/apps/web/src/app/admin-console/organizations/collections/vault.component.html b/apps/web/src/app/admin-console/organizations/collections/vault.component.html
index ddfcda04c76..1122f10e8f7 100644
--- a/apps/web/src/app/admin-console/organizations/collections/vault.component.html
+++ b/apps/web/src/app/admin-console/organizations/collections/vault.component.html
@@ -84,6 +84,7 @@
       {{ trashCleanupWarning }}
     </bit-callout>
     <app-vault-items
+      #vaultItems
       [ciphers]="ciphers"
       [collections]="collections"
       [allCollections]="allCollections"
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 5dc217b7a50..9653c405490 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
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angular/core";
+import { ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit, ViewChild } from "@angular/core";
 import { ActivatedRoute, Params, Router } from "@angular/router";
 import {
   BehaviorSubject,
@@ -81,6 +81,7 @@ import {
 } from "@bitwarden/vault";
 import { OrganizationResellerRenewalWarningComponent } from "@bitwarden/web-vault/app/billing/warnings/components/organization-reseller-renewal-warning.component";
 import { OrganizationWarningsService } from "@bitwarden/web-vault/app/billing/warnings/services/organization-warnings.service";
+import { VaultItemsComponent } from "@bitwarden/web-vault/app/vault/components/vault-items/vault-items.component";
 
 import { BillingNotificationService } from "../../../billing/services/billing-notification.service";
 import {
@@ -204,6 +205,8 @@ export class VaultComponent implements OnInit, OnDestroy {
   protected addAccessStatus$ = new BehaviorSubject<AddAccessStatusType>(0);
   private vaultItemDialogRef?: DialogRef<VaultItemDialogResult> | undefined;
 
+  @ViewChild("vaultItems", { static: false }) vaultItemsComponent: VaultItemsComponent<CipherView>;
+
   private readonly unpaidSubscriptionDialog$ = this.accountService.activeAccount$.pipe(
     map((account) => account?.id),
     switchMap((id) =>
@@ -278,9 +281,16 @@ export class VaultComponent implements OnInit, OnDestroy {
     );
 
     const filter$ = this.routedVaultFilterService.filter$;
+
+    // FIXME: The RoutedVaultFilterModel uses `organizationId: Unassigned` to represent the individual vault,
+    // but that is never used in Admin Console. This function narrows the type so it doesn't pollute our code here,
+    // but really we should change to using our own vault filter model that only represents valid states in AC.
+    const isOrganizationId = (value: OrganizationId | Unassigned): value is OrganizationId =>
+      value !== Unassigned;
     const organizationId$ = filter$.pipe(
       map((filter) => filter.organizationId),
       filter((filter) => filter !== undefined),
+      filter(isOrganizationId),
       distinctUntilChanged(),
     );
 
@@ -373,9 +383,12 @@ export class VaultComponent implements OnInit, OnDestroy {
       this.allCollectionsWithoutUnassigned$,
     ]).pipe(
       map(([organizationId, allCollections]) => {
+        // FIXME: We should not assert that the Unassigned type is a CollectionId.
+        // Instead we should consider representing the Unassigned collection as a different object, given that
+        // it is not actually a collection.
         const noneCollection = new CollectionAdminView();
         noneCollection.name = this.i18nService.t("unassigned");
-        noneCollection.id = Unassigned;
+        noneCollection.id = Unassigned as CollectionId;
         noneCollection.organizationId = organizationId;
         return allCollections.concat(noneCollection);
       }),
@@ -1420,6 +1433,7 @@ export class VaultComponent implements OnInit, OnDestroy {
 
   private refresh() {
     this.refresh$.next();
+    this.vaultItemsComponent?.clearSelection();
   }
 
   private go(queryParams: any = null) {
diff --git a/apps/web/src/app/admin-console/organizations/manage/groups.component.ts b/apps/web/src/app/admin-console/organizations/manage/groups.component.ts
index 1c40ec462d3..f48860c69a6 100644
--- a/apps/web/src/app/admin-console/organizations/manage/groups.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/groups.component.ts
@@ -89,8 +89,8 @@ export class GroupsComponent {
   protected searchControl = new FormControl("");
 
   // Fixed sizes used for cdkVirtualScroll
-  protected rowHeight = 52;
-  protected rowHeightClass = `tw-h-[52px]`;
+  protected rowHeight = 50;
+  protected rowHeightClass = `tw-h-[50px]`;
 
   protected ModalTabType = GroupAddEditTabType;
   private refreshGroups$ = new BehaviorSubject<void>(null);
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm-dialog.component.ts
index 4ec50799ae0..01b0d7bc380 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm-dialog.component.ts
@@ -11,10 +11,13 @@ import {
   OrganizationUserBulkResponse,
 } from "@bitwarden/admin-console/common";
 import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { ProviderUserBulkPublicKeyResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user-bulk-public-key.response";
 import { ProviderUserBulkResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-user-bulk.response";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { ListResponse } from "@bitwarden/common/models/response/list.response";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { StateProvider } from "@bitwarden/common/platform/state";
@@ -23,11 +26,13 @@ import { OrgKey } from "@bitwarden/common/types/key";
 import { DIALOG_DATA, DialogConfig, DialogService } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
+import { OrganizationUserService } from "../../services/organization-user/organization-user.service";
+
 import { BaseBulkConfirmComponent } from "./base-bulk-confirm.component";
 import { BulkUserDetails } from "./bulk-status.component";
 
 type BulkConfirmDialogParams = {
-  organizationId: string;
+  organization: Organization;
   users: BulkUserDetails[];
 };
 
@@ -36,7 +41,7 @@ type BulkConfirmDialogParams = {
   standalone: false,
 })
 export class BulkConfirmDialogComponent extends BaseBulkConfirmComponent {
-  organizationId: string;
+  organization: Organization;
   organizationKey$: Observable<OrgKey>;
   users: BulkUserDetails[];
 
@@ -47,13 +52,15 @@ export class BulkConfirmDialogComponent extends BaseBulkConfirmComponent {
     private organizationUserApiService: OrganizationUserApiService,
     protected i18nService: I18nService,
     private stateProvider: StateProvider,
+    private organizationUserService: OrganizationUserService,
+    private configService: ConfigService,
   ) {
     super(keyService, encryptService, i18nService);
 
-    this.organizationId = dialogParams.organizationId;
+    this.organization = dialogParams.organization;
     this.organizationKey$ = this.stateProvider.activeUserId$.pipe(
       switchMap((userId) => this.keyService.orgKeys$(userId)),
-      map((organizationKeysById) => organizationKeysById[this.organizationId as OrganizationId]),
+      map((organizationKeysById) => organizationKeysById[this.organization.id as OrganizationId]),
       takeUntilDestroyed(),
     );
     this.users = dialogParams.users;
@@ -66,7 +73,7 @@ export class BulkConfirmDialogComponent extends BaseBulkConfirmComponent {
     ListResponse<OrganizationUserBulkPublicKeyResponse | ProviderUserBulkPublicKeyResponse>
   > =>
     await this.organizationUserApiService.postOrganizationUsersPublicKey(
-      this.organizationId,
+      this.organization.id,
       this.filteredUsers.map((user) => user.id),
     );
 
@@ -76,11 +83,19 @@ export class BulkConfirmDialogComponent extends BaseBulkConfirmComponent {
   protected postConfirmRequest = async (
     userIdsWithKeys: { id: string; key: string }[],
   ): Promise<ListResponse<OrganizationUserBulkResponse | ProviderUserBulkResponse>> => {
-    const request = new OrganizationUserBulkConfirmRequest(userIdsWithKeys);
-    return await this.organizationUserApiService.postOrganizationUserBulkConfirm(
-      this.organizationId,
-      request,
-    );
+    if (
+      await firstValueFrom(this.configService.getFeatureFlag$(FeatureFlag.CreateDefaultLocation))
+    ) {
+      return await firstValueFrom(
+        this.organizationUserService.bulkConfirmUsers(this.organization, userIdsWithKeys),
+      );
+    } else {
+      const request = new OrganizationUserBulkConfirmRequest(userIdsWithKeys);
+      return await this.organizationUserApiService.postOrganizationUserBulkConfirm(
+        this.organization.id,
+        request,
+      );
+    }
   };
 
   static open(dialogService: DialogService, config: DialogConfig<BulkConfirmDialogParams>) {
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts
index a9cfd79ad60..2aac4d0a5c8 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts
@@ -111,8 +111,8 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
   protected showUserManagementControls$: Observable<boolean>;
 
   // Fixed sizes used for cdkVirtualScroll
-  protected rowHeight = 69;
-  protected rowHeightClass = `tw-h-[69px]`;
+  protected rowHeight = 66;
+  protected rowHeightClass = `tw-h-[66px]`;
 
   private organizationUsersCount = 0;
 
@@ -721,7 +721,7 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
 
     const dialogRef = BulkConfirmDialogComponent.open(this.dialogService, {
       data: {
-        organizationId: this.organization.id,
+        organization: this.organization,
         users: this.dataSource.getCheckedUsers(),
       },
     });
diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.spec.ts b/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.spec.ts
new file mode 100644
index 00000000000..2ae5aa4eb98
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.spec.ts
@@ -0,0 +1,175 @@
+import { TestBed } from "@angular/core/testing";
+import { of } from "rxjs";
+
+import {
+  OrganizationUserConfirmRequest,
+  OrganizationUserBulkConfirmRequest,
+  OrganizationUserApiService,
+  OrganizationUserBulkResponse,
+} from "@bitwarden/admin-console/common";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { CsprngArray } from "@bitwarden/common/types/csprng";
+import { OrganizationId } from "@bitwarden/common/types/guid";
+import { OrgKey } from "@bitwarden/common/types/key";
+import { KeyService } from "@bitwarden/key-management";
+
+import { OrganizationUserView } from "../../../core/views/organization-user.view";
+
+import { OrganizationUserService } from "./organization-user.service";
+
+describe("OrganizationUserService", () => {
+  let service: OrganizationUserService;
+  let keyService: jest.Mocked<KeyService>;
+  let encryptService: jest.Mocked<EncryptService>;
+  let organizationUserApiService: jest.Mocked<OrganizationUserApiService>;
+  let accountService: jest.Mocked<AccountService>;
+  let i18nService: jest.Mocked<I18nService>;
+
+  const mockOrganization = new Organization();
+  mockOrganization.id = "org-123" as OrganizationId;
+
+  const mockOrganizationUser = new OrganizationUserView();
+  mockOrganizationUser.id = "user-123";
+
+  const mockPublicKey = new Uint8Array(64) as CsprngArray;
+  const mockRandomBytes = new Uint8Array(64) as CsprngArray;
+  const mockOrgKey = new SymmetricCryptoKey(mockRandomBytes) as OrgKey;
+  const mockEncryptedKey = { encryptedString: "encrypted-key" } as EncString;
+  const mockEncryptedCollectionName = { encryptedString: "encrypted-collection-name" } as EncString;
+  const mockDefaultCollectionName = "My Items";
+
+  const setupCommonMocks = () => {
+    keyService.orgKeys$.mockReturnValue(
+      of({ [mockOrganization.id]: mockOrgKey } as Record<OrganizationId, OrgKey>),
+    );
+    encryptService.encryptString.mockResolvedValue(mockEncryptedCollectionName);
+    i18nService.t.mockReturnValue(mockDefaultCollectionName);
+  };
+
+  beforeEach(() => {
+    keyService = {
+      orgKeys$: jest.fn(),
+    } as any;
+
+    encryptService = {
+      encryptString: jest.fn(),
+      encapsulateKeyUnsigned: jest.fn(),
+    } as any;
+
+    organizationUserApiService = {
+      postOrganizationUserConfirm: jest.fn(),
+      postOrganizationUserBulkConfirm: jest.fn(),
+    } as any;
+
+    accountService = {
+      activeAccount$: of({ id: "user-123" }),
+    } as any;
+
+    i18nService = {
+      t: jest.fn(),
+    } as any;
+
+    TestBed.configureTestingModule({
+      providers: [
+        OrganizationUserService,
+        { provide: KeyService, useValue: keyService },
+        { provide: EncryptService, useValue: encryptService },
+        { provide: OrganizationUserApiService, useValue: organizationUserApiService },
+        { provide: AccountService, useValue: accountService },
+        { provide: I18nService, useValue: i18nService },
+      ],
+    });
+
+    service = TestBed.inject(OrganizationUserService);
+  });
+
+  describe("confirmUser", () => {
+    beforeEach(() => {
+      setupCommonMocks();
+      encryptService.encapsulateKeyUnsigned.mockResolvedValue(mockEncryptedKey);
+      organizationUserApiService.postOrganizationUserConfirm.mockReturnValue(Promise.resolve());
+    });
+
+    it("should confirm a user successfully", (done) => {
+      service.confirmUser(mockOrganization, mockOrganizationUser, mockPublicKey).subscribe({
+        next: () => {
+          expect(i18nService.t).toHaveBeenCalledWith("myItems");
+
+          expect(encryptService.encryptString).toHaveBeenCalledWith(
+            mockDefaultCollectionName,
+            mockOrgKey,
+          );
+          expect(encryptService.encapsulateKeyUnsigned).toHaveBeenCalledWith(
+            mockOrgKey,
+            mockPublicKey,
+          );
+
+          expect(organizationUserApiService.postOrganizationUserConfirm).toHaveBeenCalledWith(
+            mockOrganization.id,
+            mockOrganizationUser.id,
+            {
+              key: mockEncryptedKey.encryptedString,
+              defaultUserCollectionName: mockEncryptedCollectionName.encryptedString,
+            } as OrganizationUserConfirmRequest,
+          );
+
+          done();
+        },
+        error: done,
+      });
+    });
+  });
+
+  describe("bulkConfirmUsers", () => {
+    const mockUserIdsWithKeys = [
+      { id: "user-1", key: "key-1" },
+      { id: "user-2", key: "key-2" },
+    ];
+
+    const mockBulkResponse = {
+      data: [
+        { id: "user-1", error: null } as OrganizationUserBulkResponse,
+        { id: "user-2", error: null } as OrganizationUserBulkResponse,
+      ],
+    } as ListResponse<OrganizationUserBulkResponse>;
+
+    beforeEach(() => {
+      setupCommonMocks();
+      organizationUserApiService.postOrganizationUserBulkConfirm.mockReturnValue(
+        Promise.resolve(mockBulkResponse),
+      );
+    });
+
+    it("should bulk confirm users successfully", (done) => {
+      service.bulkConfirmUsers(mockOrganization, mockUserIdsWithKeys).subscribe({
+        next: (response) => {
+          expect(i18nService.t).toHaveBeenCalledWith("myItems");
+
+          expect(encryptService.encryptString).toHaveBeenCalledWith(
+            mockDefaultCollectionName,
+            mockOrgKey,
+          );
+
+          expect(organizationUserApiService.postOrganizationUserBulkConfirm).toHaveBeenCalledWith(
+            mockOrganization.id,
+            new OrganizationUserBulkConfirmRequest(
+              mockUserIdsWithKeys,
+              mockEncryptedCollectionName.encryptedString,
+            ),
+          );
+
+          expect(response).toEqual(mockBulkResponse);
+
+          done();
+        },
+        error: done,
+      });
+    });
+  });
+});
diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.ts b/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.ts
index 79efeebca2a..f59b377e26e 100644
--- a/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.ts
+++ b/apps/web/src/app/admin-console/organizations/members/services/organization-user/organization-user.service.ts
@@ -3,12 +3,15 @@ import { combineLatest, filter, map, Observable, switchMap } from "rxjs";
 
 import {
   OrganizationUserConfirmRequest,
+  OrganizationUserBulkConfirmRequest,
   OrganizationUserApiService,
+  OrganizationUserBulkResponse,
 } from "@bitwarden/admin-console/common";
 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 { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
+import { ListResponse } from "@bitwarden/common/models/response/list.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { OrganizationId } from "@bitwarden/common/types/guid";
 import { KeyService } from "@bitwarden/key-management";
@@ -41,11 +44,7 @@ export class OrganizationUserService {
     user: OrganizationUserView,
     publicKey: Uint8Array,
   ): Observable<void> {
-    const encryptedCollectionName$ = this.orgKey$(organization).pipe(
-      switchMap((orgKey) =>
-        this.encryptService.encryptString(this.i18nService.t("myItems"), orgKey),
-      ),
-    );
+    const encryptedCollectionName$ = this.getEncryptedDefaultCollectionName$(organization);
 
     const encryptedKey$ = this.orgKey$(organization).pipe(
       switchMap((orgKey) => this.encryptService.encapsulateKeyUnsigned(orgKey, publicKey)),
@@ -66,4 +65,31 @@ export class OrganizationUserService {
       }),
     );
   }
+
+  bulkConfirmUsers(
+    organization: Organization,
+    userIdsWithKeys: { id: string; key: string }[],
+  ): Observable<ListResponse<OrganizationUserBulkResponse>> {
+    return this.getEncryptedDefaultCollectionName$(organization).pipe(
+      switchMap((collectionName) => {
+        const request = new OrganizationUserBulkConfirmRequest(
+          userIdsWithKeys,
+          collectionName.encryptedString,
+        );
+
+        return this.organizationUserApiService.postOrganizationUserBulkConfirm(
+          organization.id,
+          request,
+        );
+      }),
+    );
+  }
+
+  private getEncryptedDefaultCollectionName$(organization: Organization) {
+    return this.orgKey$(organization).pipe(
+      switchMap((orgKey) =>
+        this.encryptService.encryptString(this.i18nService.t("myItems"), orgKey),
+      ),
+    );
+  }
 }
diff --git a/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts b/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts
index 01c45264236..3af99644dd2 100644
--- a/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts
@@ -1,12 +1,12 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { Directive, Input, OnInit } from "@angular/core";
 import { UntypedFormControl, UntypedFormGroup } from "@angular/forms";
+import { Observable, of } from "rxjs";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
 import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 export abstract class BasePolicy {
   abstract name: string;
@@ -14,38 +14,56 @@ export abstract class BasePolicy {
   abstract type: PolicyType;
   abstract component: any;
 
-  display(organization: Organization) {
-    return true;
+  /**
+   * If true, the description will be reused in the policy edit modal. Set this to false if you
+   * have more complex requirements that you will implement in your template instead.
+   **/
+  showDescription: boolean = true;
+
+  display(organization: Organization, configService: ConfigService): Observable<boolean> {
+    return of(true);
   }
 }
 
 @Directive()
 export abstract class BasePolicyComponent implements OnInit {
-  @Input() policyResponse: PolicyResponse;
-  @Input() policy: BasePolicy;
+  @Input() policyResponse: PolicyResponse | undefined;
+  @Input() policy: BasePolicy | undefined;
 
   enabled = new UntypedFormControl(false);
-  data: UntypedFormGroup = null;
+  data: UntypedFormGroup | undefined;
 
   ngOnInit(): void {
-    this.enabled.setValue(this.policyResponse.enabled);
+    this.enabled.setValue(this.policyResponse?.enabled);
 
-    if (this.policyResponse.data != null) {
+    if (this.policyResponse?.data != null) {
       this.loadData();
     }
   }
 
   buildRequest() {
-    const request = new PolicyRequest();
-    request.enabled = this.enabled.value;
-    request.type = this.policy.type;
-    request.data = this.buildRequestData();
+    if (!this.policy) {
+      throw new Error("Policy was not found");
+    }
+
+    const request: PolicyRequest = {
+      type: this.policy.type,
+      enabled: this.enabled.value,
+      data: this.buildRequestData(),
+    };
 
     return Promise.resolve(request);
   }
 
+  /**
+   * Enable optional validation before sumitting a respose for policy submission
+   * */
+  confirm(): Promise<boolean> | boolean {
+    return true;
+  }
+
   protected loadData() {
-    this.data.patchValue(this.policyResponse.data ?? {});
+    this.data?.patchValue(this.policyResponse?.data ?? {});
   }
 
   protected buildRequestData() {
diff --git a/apps/web/src/app/admin-console/organizations/policies/index.ts b/apps/web/src/app/admin-console/organizations/policies/index.ts
index 828aa8230fa..6b6b2303b2f 100644
--- a/apps/web/src/app/admin-console/organizations/policies/index.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/index.ts
@@ -3,6 +3,7 @@ export { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 export { DisableSendPolicy } from "./disable-send.component";
 export { MasterPasswordPolicy } from "./master-password.component";
 export { PasswordGeneratorPolicy } from "./password-generator.component";
+export { vNextOrganizationDataOwnershipPolicy } from "./vnext-organization-data-ownership.component";
 export { OrganizationDataOwnershipPolicy } from "./organization-data-ownership.component";
 export { RequireSsoPolicy } from "./require-sso.component";
 export { ResetPasswordPolicy } from "./reset-password.component";
diff --git a/apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.ts b/apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.ts
index 1c1710f7662..beb9fd5752a 100644
--- a/apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/organization-data-ownership.component.ts
@@ -1,6 +1,10 @@
 import { Component } from "@angular/core";
+import { map, Observable } from "rxjs";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 
@@ -9,6 +13,12 @@ export class OrganizationDataOwnershipPolicy extends BasePolicy {
   description = "personalOwnershipPolicyDesc";
   type = PolicyType.OrganizationDataOwnership;
   component = OrganizationDataOwnershipPolicyComponent;
+
+  display(organization: Organization, configService: ConfigService): Observable<boolean> {
+    return configService
+      .getFeatureFlag$(FeatureFlag.CreateDefaultLocation)
+      .pipe(map((enabled) => !enabled));
+  }
 }
 
 @Component({
diff --git a/apps/web/src/app/admin-console/organizations/policies/policies.component.html b/apps/web/src/app/admin-console/organizations/policies/policies.component.html
index 016d631019e..8eb204b65a4 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policies.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policies.component.html
@@ -1,38 +1,45 @@
 <app-header>
   @let organization = organization$ | async;
-  <button
-    bitBadge
-    class="!tw-align-middle"
-    (click)="changePlan(organization)"
-    *ngIf="isBreadcrumbingEnabled$ | async"
-    slot="title-suffix"
-    type="button"
-    variant="primary"
-  >
-    {{ "upgrade" | i18n }}
-  </button>
+  @if (isBreadcrumbingEnabled$ | async) {
+    <button
+      bitBadge
+      class="!tw-align-middle"
+      (click)="changePlan(organization)"
+      slot="title-suffix"
+      type="button"
+      variant="primary"
+    >
+      {{ "upgrade" | i18n }}
+    </button>
+  }
 </app-header>
 
 <bit-container>
-  <ng-container *ngIf="loading">
+  @if (loading) {
     <i
       class="bwi bwi-spinner bwi-spin tw-text-muted"
       title="{{ 'loading' | i18n }}"
       aria-hidden="true"
     ></i>
     <span class="tw-sr-only">{{ "loading" | i18n }}</span>
-  </ng-container>
-  <bit-table *ngIf="!loading">
-    <ng-template body>
-      <tr bitRow *ngFor="let p of policies">
-        <td bitCell *ngIf="p.display(organization)" ngPreserveWhitespaces>
-          <button type="button" bitLink (click)="edit(p)">{{ p.name | i18n }}</button>
-          <span bitBadge variant="success" *ngIf="policiesEnabledMap.get(p.type)">{{
-            "on" | i18n
-          }}</span>
-          <small class="tw-text-muted tw-block">{{ p.description | i18n }}</small>
-        </td>
-      </tr>
-    </ng-template>
-  </bit-table>
+  }
+  @if (!loading) {
+    <bit-table>
+      <ng-template body>
+        @for (p of policies; track p.name) {
+          @if (p.display(organization, configService) | async) {
+            <tr bitRow>
+              <td bitCell ngPreserveWhitespaces>
+                <button type="button" bitLink (click)="edit(p)">{{ p.name | i18n }}</button>
+                @if (policiesEnabledMap.get(p.type)) {
+                  <span bitBadge variant="success">{{ "on" | i18n }}</span>
+                }
+                <small class="tw-text-muted tw-block">{{ p.description | i18n }}</small>
+              </td>
+            </tr>
+          }
+        }
+      </ng-template>
+    </bit-table>
+  }
 </bit-container>
diff --git a/apps/web/src/app/admin-console/organizations/policies/policies.component.ts b/apps/web/src/app/admin-console/organizations/policies/policies.component.ts
index 8b6894871bd..3dfc4cc0c20 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policies.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policies.component.ts
@@ -15,7 +15,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { DialogService } from "@bitwarden/components";
 import {
@@ -25,7 +24,7 @@ import {
 import { All } from "@bitwarden/web-vault/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model";
 
 import { PolicyListService } from "../../core/policy-list.service";
-import { BasePolicy, RestrictedItemTypesPolicy } from "../policies";
+import { BasePolicy } from "../policies";
 import { CollectionDialogTabType } from "../shared/components/collection-dialog";
 
 import { PolicyEditComponent, PolicyEditDialogResult } from "./policy-edit.component";
@@ -53,7 +52,7 @@ export class PoliciesComponent implements OnInit {
     private policyListService: PolicyListService,
     private organizationBillingService: OrganizationBillingServiceAbstraction,
     private dialogService: DialogService,
-    private configService: ConfigService,
+    protected configService: ConfigService,
   ) {}
 
   async ngOnInit() {
@@ -71,35 +70,31 @@ export class PoliciesComponent implements OnInit {
       await this.load();
 
       // Handle policies component launch from Event message
-      /* eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe, rxjs/no-nested-subscribe */
-      this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
-        if (qParams.policyId != null) {
-          const policyIdFromEvents: string = qParams.policyId;
-          for (const orgPolicy of this.orgPolicies) {
-            if (orgPolicy.id === policyIdFromEvents) {
-              for (let i = 0; i < this.policies.length; i++) {
-                if (this.policies[i].type === orgPolicy.type) {
-                  // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-                  // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                  this.edit(this.policies[i]);
-                  break;
+      this.route.queryParams
+        .pipe(first())
+        /* eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe, rxjs/no-nested-subscribe */
+        .subscribe(async (qParams) => {
+          if (qParams.policyId != null) {
+            const policyIdFromEvents: string = qParams.policyId;
+            for (const orgPolicy of this.orgPolicies) {
+              if (orgPolicy.id === policyIdFromEvents) {
+                for (let i = 0; i < this.policies.length; i++) {
+                  if (this.policies[i].type === orgPolicy.type) {
+                    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
+                    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                    this.edit(this.policies[i]);
+                    break;
+                  }
                 }
+                break;
               }
-              break;
             }
           }
-        }
-      });
+        });
     });
   }
 
   async load() {
-    if (
-      (await this.configService.getFeatureFlag(FeatureFlag.RemoveCardItemTypePolicy)) &&
-      this.policyListService.getPolicies().every((p) => !(p instanceof RestrictedItemTypesPolicy))
-    ) {
-      this.policyListService.addPolicies([new RestrictedItemTypesPolicy()]);
-    }
     const response = await this.policyApiService.getPolicies(this.organizationId);
     this.orgPolicies = response.data != null && response.data.length > 0 ? response.data : [];
     this.orgPolicies.forEach((op) => {
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
index 7f33f08f888..90cfb52e5ad 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
@@ -22,7 +22,9 @@
         <span class="tw-sr-only">{{ "loading" | i18n }}</span>
       </div>
       <div [hidden]="loading">
-        <p bitTypography="body1">{{ policy.description | i18n }}</p>
+        @if (policy.showDescription) {
+          <p bitTypography="body1">{{ policy.description | i18n }}</p>
+        }
         <ng-template #policyForm></ng-template>
       </div>
     </ng-container>
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
index d3d03d2aaae..2984db67d39 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
@@ -128,13 +128,20 @@ export class PolicyEditComponent implements AfterViewInit {
   }
 
   submit = async () => {
+    if ((await this.policyComponent.confirm()) == false) {
+      this.dialogRef.close();
+      return;
+    }
+
     let request: PolicyRequest;
+
     try {
       request = await this.policyComponent.buildRequest();
     } catch (e) {
       this.toastService.showToast({ variant: "error", title: null, message: e.message });
       return;
     }
+
     await this.policyApiService.putPolicy(this.data.organizationId, this.data.policy.type, request);
     this.toastService.showToast({
       variant: "success",
diff --git a/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts b/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts
index 21de143dea6..3a0d196c593 100644
--- a/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts
@@ -1,7 +1,9 @@
 import { Component } from "@angular/core";
+import { of } from "rxjs";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 
@@ -11,8 +13,8 @@ export class RequireSsoPolicy extends BasePolicy {
   type = PolicyType.RequireSso;
   component = RequireSsoPolicyComponent;
 
-  display(organization: Organization) {
-    return organization.useSso;
+  display(organization: Organization, configService: ConfigService) {
+    return of(organization.useSso);
   }
 }
 
diff --git a/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts b/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts
index 62fc42f6a06..93a42285fbc 100644
--- a/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, of } from "rxjs";
 
 import {
   getOrganizationById,
@@ -10,6 +10,7 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 
@@ -19,8 +20,8 @@ export class ResetPasswordPolicy extends BasePolicy {
   type = PolicyType.ResetPassword;
   component = ResetPasswordPolicyComponent;
 
-  display(organization: Organization) {
-    return organization.useResetPassword;
+  display(organization: Organization, configService: ConfigService) {
+    return of(organization.useResetPassword);
   }
 }
 
@@ -52,6 +53,10 @@ export class ResetPasswordPolicyComponent extends BasePolicyComponent implements
       throw new Error("No user found.");
     }
 
+    if (!this.policyResponse) {
+      throw new Error("Policies not found");
+    }
+
     const organization = await firstValueFrom(
       this.organizationService
         .organizations$(userId)
diff --git a/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.ts b/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.ts
index 1bee5583718..6cad0fc0170 100644
--- a/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/restricted-item-types.component.ts
@@ -1,6 +1,10 @@
 import { Component } from "@angular/core";
+import { Observable } from "rxjs";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 
@@ -9,6 +13,10 @@ export class RestrictedItemTypesPolicy extends BasePolicy {
   description = "restrictedItemTypePolicyDesc";
   type = PolicyType.RestrictedItemTypes;
   component = RestrictedItemTypesPolicyComponent;
+
+  display(organization: Organization, configService: ConfigService): Observable<boolean> {
+    return configService.getFeatureFlag$(FeatureFlag.RemoveCardItemTypePolicy);
+  }
 }
 
 @Component({
diff --git a/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts b/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts
index ad32b4218bc..613253ef8d9 100644
--- a/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts
@@ -20,6 +20,9 @@ export class SingleOrgPolicyComponent extends BasePolicyComponent implements OnI
   async ngOnInit() {
     super.ngOnInit();
 
+    if (!this.policyResponse) {
+      throw new Error("Policies not found");
+    }
     if (!this.policyResponse.canToggleState) {
       this.enabled.disable();
     }
diff --git a/apps/web/src/app/admin-console/organizations/policies/vnext-organization-data-ownership.component.html b/apps/web/src/app/admin-console/organizations/policies/vnext-organization-data-ownership.component.html
new file mode 100644
index 00000000000..0abc40da683
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/vnext-organization-data-ownership.component.html
@@ -0,0 +1,57 @@
+<p>
+  {{ "organizationDataOwnershipContent" | i18n }}
+  <a
+    bitLink
+    href="https://bitwarden.com/resources/credential-lifecycle-management/"
+    target="_blank"
+  >
+    {{ "organizationDataOwnershipContentAnchor" | i18n }}.
+  </a>
+</p>
+
+<bit-form-control>
+  <input type="checkbox" bitCheckbox [formControl]="enabled" id="enabled" />
+  <bit-label>{{ "turnOn" | i18n }}</bit-label>
+</bit-form-control>
+
+<ng-template #dialog>
+  <bit-simple-dialog background="alt">
+    <span bitDialogTitle>{{ "organizationDataOwnershipWarningTitle" | i18n }}</span>
+    <ng-container bitDialogContent>
+      <div class="tw-text-left tw-overflow-hidden">
+        {{ "organizationDataOwnershipWarningContentTop" | i18n }}
+        <div class="tw-flex tw-flex-col tw-p-2">
+          <ul class="tw-list-disc tw-pl-5 tw-space-y-2 tw-break-words tw-mb-0">
+            <li>
+              {{ "organizationDataOwnershipWarning1" | i18n }}
+            </li>
+            <li>
+              {{ "organizationDataOwnershipWarning2" | i18n }}
+            </li>
+            <li>
+              {{ "organizationDataOwnershipWarning3" | i18n }}
+            </li>
+          </ul>
+        </div>
+        {{ "organizationDataOwnershipWarningContentBottom" | i18n }}
+        <a
+          bitLink
+          href="https://bitwarden.com/resources/credential-lifecycle-management/"
+          target="_blank"
+        >
+          {{ "organizationDataOwnershipContentAnchor" | i18n }}.
+        </a>
+      </div>
+    </ng-container>
+    <ng-container bitDialogFooter>
+      <span class="tw-flex tw-gap-2">
+        <button bitButton buttonType="primary" [bitDialogClose]="true" type="submit">
+          {{ "continue" | i18n }}
+        </button>
+        <button bitButton buttonType="secondary" [bitDialogClose]="false" type="button">
+          {{ "cancel" | i18n }}
+        </button>
+      </span>
+    </ng-container>
+  </bit-simple-dialog>
+</ng-template>
diff --git a/apps/web/src/app/admin-console/organizations/policies/vnext-organization-data-ownership.component.ts b/apps/web/src/app/admin-console/organizations/policies/vnext-organization-data-ownership.component.ts
new file mode 100644
index 00000000000..11b1548d9f9
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/policies/vnext-organization-data-ownership.component.ts
@@ -0,0 +1,50 @@
+import { Component, OnInit, TemplateRef, ViewChild } from "@angular/core";
+import { lastValueFrom, Observable } from "rxjs";
+
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { DialogService } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared";
+
+import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
+
+export class vNextOrganizationDataOwnershipPolicy extends BasePolicy {
+  name = "organizationDataOwnership";
+  description = "organizationDataOwnershipDesc";
+  type = PolicyType.OrganizationDataOwnership;
+  component = vNextOrganizationDataOwnershipPolicyComponent;
+  showDescription = false;
+
+  override display(organization: Organization, configService: ConfigService): Observable<boolean> {
+    return configService.getFeatureFlag$(FeatureFlag.CreateDefaultLocation);
+  }
+}
+
+@Component({
+  selector: "vnext-policy-organization-data-ownership",
+  templateUrl: "vnext-organization-data-ownership.component.html",
+  standalone: true,
+  imports: [SharedModule],
+})
+export class vNextOrganizationDataOwnershipPolicyComponent
+  extends BasePolicyComponent
+  implements OnInit
+{
+  constructor(private dialogService: DialogService) {
+    super();
+  }
+
+  @ViewChild("dialog", { static: true }) warningContent!: TemplateRef<unknown>;
+
+  override async confirm(): Promise<boolean> {
+    if (this.policyResponse?.enabled && !this.enabled.value) {
+      const dialogRef = this.dialogService.open(this.warningContent);
+      const result = await lastValueFrom(dialogRef.closed);
+      return Boolean(result);
+    }
+    return true;
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts
index fabfb65fc6b..a0964a90fca 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts
@@ -39,6 +39,7 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { getById } from "@bitwarden/common/platform/misc";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 import {
   DIALOG_DATA,
   DialogConfig,
@@ -87,8 +88,8 @@ enum ButtonType {
 }
 
 export interface CollectionDialogParams {
-  collectionId?: string;
-  organizationId: string;
+  collectionId?: CollectionId;
+  organizationId: OrganizationId;
   initialTab?: CollectionDialogTabType;
   parentCollectionId?: string;
   showOrgSelector?: boolean;
@@ -136,7 +137,7 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
     externalId: { value: "", disabled: true },
     parent: undefined as string | undefined,
     access: [[] as AccessItemValue[]],
-    selectedOrg: "",
+    selectedOrg: "" as OrganizationId,
   });
   protected PermissionMode = PermissionMode;
   protected showDeleteButton = false;
diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts
index 203bad3754a..0729d42f053 100644
--- a/apps/web/src/app/app.component.ts
+++ b/apps/web/src/app/app.component.ts
@@ -35,12 +35,14 @@ import {
   MasterPasswordPolicy,
   PasswordGeneratorPolicy,
   OrganizationDataOwnershipPolicy,
+  vNextOrganizationDataOwnershipPolicy,
   RequireSsoPolicy,
   ResetPasswordPolicy,
   SendOptionsPolicy,
   SingleOrgPolicy,
   TwoFactorAuthenticationPolicy,
   RemoveUnlockWithPinPolicy,
+  RestrictedItemTypesPolicy,
 } from "./admin-console/organizations/policies";
 
 const BroadcasterSubscriptionId = "AppComponent";
@@ -244,8 +246,10 @@ export class AppComponent implements OnDestroy, OnInit {
       new SingleOrgPolicy(),
       new RequireSsoPolicy(),
       new OrganizationDataOwnershipPolicy(),
+      new vNextOrganizationDataOwnershipPolicy(),
       new DisableSendPolicy(),
       new SendOptionsPolicy(),
+      new RestrictedItemTypesPolicy(),
     ]);
   }
 
diff --git a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts
index ff062b31e6b..2ff38f6eab0 100644
--- a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts
+++ b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.spec.ts
@@ -2,6 +2,7 @@
 // @ts-strict-ignore
 import { MockProxy } from "jest-mock-extended";
 import mock from "jest-mock-extended/lib/Mock";
+import { of } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
@@ -14,9 +15,9 @@ import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { CsprngArray } from "@bitwarden/common/types/csprng";
 import { UserId } from "@bitwarden/common/types/guid";
-import { UserKey, MasterKey } from "@bitwarden/common/types/key";
+import { UserKey, MasterKey, UserPrivateKey } from "@bitwarden/common/types/key";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
-import { KdfType, KeyService } from "@bitwarden/key-management";
+import { Argon2KdfConfig, KdfType, KeyService, PBKDF2KdfConfig } from "@bitwarden/key-management";
 
 import { EmergencyAccessStatusType } from "../enums/emergency-access-status-type";
 import { EmergencyAccessType } from "../enums/emergency-access-type";
@@ -26,6 +27,7 @@ import {
   EmergencyAccessGranteeDetailsResponse,
   EmergencyAccessGrantorDetailsResponse,
   EmergencyAccessTakeoverResponse,
+  EmergencyAccessViewResponse,
 } from "../response/emergency-access.response";
 
 import { EmergencyAccessApiService } from "./emergency-access-api.service";
@@ -142,88 +144,306 @@ describe("EmergencyAccessService", () => {
     });
   });
 
+  describe("getViewOnlyCiphers", () => {
+    const params = {
+      id: "emergency-access-id",
+      activeUserId: Utils.newGuid() as UserId,
+    };
+
+    it("throws an error is the active user's private key isn't available", async () => {
+      keyService.userPrivateKey$.mockReturnValue(of(null));
+
+      await expect(
+        emergencyAccessService.getViewOnlyCiphers(params.id, params.activeUserId),
+      ).rejects.toThrow("Active user does not have a private key, cannot get view only ciphers.");
+    });
+
+    it("should return decrypted and sorted ciphers", async () => {
+      const emergencyAccessViewResponse = {
+        keyEncrypted: "mockKeyEncrypted",
+        ciphers: [
+          { id: "cipher1", name: "encryptedName1" },
+          { id: "cipher2", name: "encryptedName2" },
+        ],
+      } as EmergencyAccessViewResponse;
+
+      const mockEncryptedCipher1 = {
+        id: "cipher1",
+        decrypt: jest.fn().mockResolvedValue({ id: "cipher1", decrypted: true }),
+      };
+      const mockEncryptedCipher2 = {
+        id: "cipher2",
+        decrypt: jest.fn().mockResolvedValue({ id: "cipher2", decrypted: true }),
+      };
+      emergencyAccessViewResponse.ciphers.map = jest.fn().mockImplementation(() => {
+        return [mockEncryptedCipher1, mockEncryptedCipher2];
+      });
+      cipherService.getLocaleSortingFunction.mockReturnValue((a: any, b: any) =>
+        a.id.localeCompare(b.id),
+      );
+      emergencyAccessApiService.postEmergencyAccessView.mockResolvedValue(
+        emergencyAccessViewResponse,
+      );
+
+      const mockPrivateKey = new Uint8Array(64) as UserPrivateKey;
+      keyService.userPrivateKey$.mockReturnValue(of(mockPrivateKey));
+
+      const mockDecryptedGrantorUserKey = new SymmetricCryptoKey(new Uint8Array(64));
+      encryptService.decapsulateKeyUnsigned.mockResolvedValueOnce(mockDecryptedGrantorUserKey);
+      const mockGrantorUserKey = mockDecryptedGrantorUserKey as UserKey;
+
+      const result = await emergencyAccessService.getViewOnlyCiphers(
+        params.id,
+        params.activeUserId,
+      );
+
+      expect(result).toEqual([
+        { id: "cipher1", decrypted: true },
+        { id: "cipher2", decrypted: true },
+      ]);
+      expect(mockEncryptedCipher1.decrypt).toHaveBeenCalledWith(mockGrantorUserKey);
+      expect(mockEncryptedCipher2.decrypt).toHaveBeenCalledWith(mockGrantorUserKey);
+      expect(emergencyAccessApiService.postEmergencyAccessView).toHaveBeenCalledWith(params.id);
+      expect(keyService.userPrivateKey$).toHaveBeenCalledWith(params.activeUserId);
+      expect(encryptService.decapsulateKeyUnsigned).toHaveBeenCalledWith(
+        new EncString(emergencyAccessViewResponse.keyEncrypted),
+        mockPrivateKey,
+      );
+      expect(cipherService.getLocaleSortingFunction).toHaveBeenCalled();
+    });
+  });
+
   describe("takeover", () => {
-    const mockId = "emergencyAccessId";
-    const mockEmail = "emergencyAccessEmail";
-    const mockName = "emergencyAccessName";
+    const params = {
+      id: "emergencyAccessId",
+      masterPassword: "mockPassword",
+      email: "emergencyAccessEmail",
+      activeUserId: Utils.newGuid() as UserId,
+    };
+
+    const takeoverResponse = {
+      keyEncrypted: "EncryptedKey",
+      kdf: KdfType.PBKDF2_SHA256,
+      kdfIterations: 500,
+    } as EmergencyAccessTakeoverResponse;
+
+    const userPrivateKey = new Uint8Array(64) as UserPrivateKey;
+    const mockMasterKey = new SymmetricCryptoKey(new Uint8Array(64) as CsprngArray) as MasterKey;
+    const mockMasterKeyHash = "mockMasterKeyHash";
+    let mockGrantorUserKey: UserKey;
+
+    // must mock [UserKey, EncString] return from keyService.encryptUserKeyWithMasterKey
+    // where UserKey is the decrypted grantor user key
+    const mockMasterKeyEncryptedUserKey = new EncString(
+      EncryptionType.AesCbc256_HmacSha256_B64,
+      "mockMasterKeyEncryptedUserKey",
+    );
+
+    beforeEach(() => {
+      emergencyAccessApiService.postEmergencyAccessTakeover.mockResolvedValueOnce(takeoverResponse);
+      keyService.userPrivateKey$.mockReturnValue(of(userPrivateKey));
+
+      const mockDecryptedGrantorUserKey = new SymmetricCryptoKey(new Uint8Array(64));
+      encryptService.decapsulateKeyUnsigned.mockResolvedValueOnce(mockDecryptedGrantorUserKey);
+      mockGrantorUserKey = mockDecryptedGrantorUserKey as UserKey;
+
+      keyService.makeMasterKey.mockResolvedValueOnce(mockMasterKey);
+      keyService.hashMasterKey.mockResolvedValueOnce(mockMasterKeyHash);
+      keyService.encryptUserKeyWithMasterKey.mockResolvedValueOnce([
+        mockGrantorUserKey,
+        mockMasterKeyEncryptedUserKey,
+      ]);
+    });
 
     it("posts a new password when decryption succeeds", async () => {
       // Arrange
-      emergencyAccessApiService.postEmergencyAccessTakeover.mockResolvedValueOnce({
-        keyEncrypted: "EncryptedKey",
-        kdf: KdfType.PBKDF2_SHA256,
-        kdfIterations: 500,
-      } as EmergencyAccessTakeoverResponse);
-
-      const mockDecryptedGrantorUserKey = new Uint8Array(64);
-      keyService.getPrivateKey.mockResolvedValue(new Uint8Array(64));
-      encryptService.decapsulateKeyUnsigned.mockResolvedValueOnce(
-        new SymmetricCryptoKey(mockDecryptedGrantorUserKey),
-      );
-
-      const mockMasterKey = new SymmetricCryptoKey(new Uint8Array(64) as CsprngArray) as MasterKey;
-
-      keyService.makeMasterKey.mockResolvedValueOnce(mockMasterKey);
-
-      const mockMasterKeyHash = "mockMasterKeyHash";
-      keyService.hashMasterKey.mockResolvedValueOnce(mockMasterKeyHash);
-
-      // must mock [UserKey, EncString] return from keyService.encryptUserKeyWithMasterKey
-      // where UserKey is the decrypted grantor user key
-      const mockMasterKeyEncryptedUserKey = new EncString(
-        EncryptionType.AesCbc256_HmacSha256_B64,
-        "mockMasterKeyEncryptedUserKey",
-      );
-
-      const mockUserKey = new SymmetricCryptoKey(mockDecryptedGrantorUserKey) as UserKey;
-
-      keyService.encryptUserKeyWithMasterKey.mockResolvedValueOnce([
-        mockUserKey,
-        mockMasterKeyEncryptedUserKey,
-      ]);
+      const expectedKdfConfig = new PBKDF2KdfConfig(takeoverResponse.kdfIterations);
 
       const expectedEmergencyAccessPasswordRequest = new EmergencyAccessPasswordRequest();
       expectedEmergencyAccessPasswordRequest.newMasterPasswordHash = mockMasterKeyHash;
       expectedEmergencyAccessPasswordRequest.key = mockMasterKeyEncryptedUserKey.encryptedString;
 
       // Act
-      await emergencyAccessService.takeover(mockId, mockEmail, mockName);
+      await emergencyAccessService.takeover(
+        params.id,
+        params.masterPassword,
+        params.email,
+        params.activeUserId,
+      );
 
       // Assert
+      expect(keyService.userPrivateKey$).toHaveBeenCalledWith(params.activeUserId);
+      expect(encryptService.decapsulateKeyUnsigned).toHaveBeenCalledWith(
+        new EncString(takeoverResponse.keyEncrypted),
+        userPrivateKey,
+      );
+      expect(keyService.makeMasterKey).toHaveBeenCalledWith(
+        params.masterPassword,
+        params.email,
+        expectedKdfConfig,
+      );
+      expect(keyService.hashMasterKey).toHaveBeenCalledWith(params.masterPassword, mockMasterKey);
+      expect(keyService.encryptUserKeyWithMasterKey).toHaveBeenCalledWith(
+        mockMasterKey,
+        mockGrantorUserKey,
+      );
       expect(emergencyAccessApiService.postEmergencyAccessPassword).toHaveBeenCalledWith(
-        mockId,
+        params.id,
         expectedEmergencyAccessPasswordRequest,
       );
     });
 
-    it("should not post a new password if decryption fails", async () => {
-      encryptService.rsaDecrypt.mockResolvedValueOnce(null);
-      emergencyAccessApiService.postEmergencyAccessTakeover.mockResolvedValueOnce({
+    it("uses argon2 KDF if takeover response is argon2", async () => {
+      const argon2TakeoverResponse = {
         keyEncrypted: "EncryptedKey",
-        kdf: KdfType.PBKDF2_SHA256,
-        kdfIterations: 500,
-      } as EmergencyAccessTakeoverResponse);
-      keyService.getPrivateKey.mockResolvedValue(new Uint8Array(64));
+        kdf: KdfType.Argon2id,
+        kdfIterations: 3,
+        kdfMemory: 64,
+        kdfParallelism: 4,
+      } as EmergencyAccessTakeoverResponse;
+      emergencyAccessApiService.postEmergencyAccessTakeover.mockReset();
+      emergencyAccessApiService.postEmergencyAccessTakeover.mockResolvedValueOnce(
+        argon2TakeoverResponse,
+      );
+
+      const expectedKdfConfig = new Argon2KdfConfig(
+        argon2TakeoverResponse.kdfIterations,
+        argon2TakeoverResponse.kdfMemory,
+        argon2TakeoverResponse.kdfParallelism,
+      );
+
+      const expectedEmergencyAccessPasswordRequest = new EmergencyAccessPasswordRequest();
+      expectedEmergencyAccessPasswordRequest.newMasterPasswordHash = mockMasterKeyHash;
+      expectedEmergencyAccessPasswordRequest.key = mockMasterKeyEncryptedUserKey.encryptedString;
+
+      await emergencyAccessService.takeover(
+        params.id,
+        params.masterPassword,
+        params.email,
+        params.activeUserId,
+      );
+
+      expect(keyService.userPrivateKey$).toHaveBeenCalledWith(params.activeUserId);
+      expect(encryptService.decapsulateKeyUnsigned).toHaveBeenCalledWith(
+        new EncString(argon2TakeoverResponse.keyEncrypted),
+        userPrivateKey,
+      );
+      expect(keyService.makeMasterKey).toHaveBeenCalledWith(
+        params.masterPassword,
+        params.email,
+        expectedKdfConfig,
+      );
+      expect(keyService.hashMasterKey).toHaveBeenCalledWith(params.masterPassword, mockMasterKey);
+      expect(keyService.encryptUserKeyWithMasterKey).toHaveBeenCalledWith(
+        mockMasterKey,
+        mockGrantorUserKey,
+      );
+      expect(emergencyAccessApiService.postEmergencyAccessPassword).toHaveBeenCalledWith(
+        params.id,
+        expectedEmergencyAccessPasswordRequest,
+      );
+    });
+
+    it("throws an error if masterKeyEncryptedUserKey is not found", async () => {
+      keyService.encryptUserKeyWithMasterKey.mockReset();
+      keyService.encryptUserKeyWithMasterKey.mockResolvedValueOnce(null);
+      const expectedKdfConfig = new PBKDF2KdfConfig(takeoverResponse.kdfIterations);
 
       await expect(
-        emergencyAccessService.takeover(mockId, mockEmail, mockName),
-      ).rejects.toThrowError("Failed to decrypt grantor key");
+        emergencyAccessService.takeover(
+          params.id,
+          params.masterPassword,
+          params.email,
+          params.activeUserId,
+        ),
+      ).rejects.toThrow("masterKeyEncryptedUserKey not found");
 
+      expect(keyService.userPrivateKey$).toHaveBeenCalledWith(params.activeUserId);
+      expect(encryptService.decapsulateKeyUnsigned).toHaveBeenCalledWith(
+        new EncString(takeoverResponse.keyEncrypted),
+        userPrivateKey,
+      );
+      expect(keyService.makeMasterKey).toHaveBeenCalledWith(
+        params.masterPassword,
+        params.email,
+        expectedKdfConfig,
+      );
+      expect(keyService.hashMasterKey).toHaveBeenCalledWith(params.masterPassword, mockMasterKey);
+      expect(keyService.encryptUserKeyWithMasterKey).toHaveBeenCalledWith(
+        mockMasterKey,
+        mockGrantorUserKey,
+      );
+      expect(emergencyAccessApiService.postEmergencyAccessPassword).not.toHaveBeenCalled();
+    });
+
+    it("should not post a new password if decryption fails", async () => {
+      emergencyAccessApiService.postEmergencyAccessTakeover.mockResolvedValueOnce(takeoverResponse);
+      encryptService.decapsulateKeyUnsigned.mockReset();
+      encryptService.decapsulateKeyUnsigned.mockResolvedValueOnce(null);
+
+      await expect(
+        emergencyAccessService.takeover(
+          params.id,
+          params.masterPassword,
+          params.email,
+          params.activeUserId,
+        ),
+      ).rejects.toThrow("Failed to decrypt grantor key");
+
+      expect(keyService.userPrivateKey$).toHaveBeenCalledWith(params.activeUserId);
+      expect(encryptService.decapsulateKeyUnsigned).toHaveBeenCalledWith(
+        new EncString(takeoverResponse.keyEncrypted),
+        userPrivateKey,
+      );
+      expect(keyService.makeMasterKey).not.toHaveBeenCalled();
+      expect(keyService.hashMasterKey).not.toHaveBeenCalled();
+      expect(keyService.encryptUserKeyWithMasterKey).not.toHaveBeenCalled();
+      expect(emergencyAccessApiService.postEmergencyAccessPassword).not.toHaveBeenCalled();
+    });
+
+    it("should not post a new password if decryption throws", async () => {
+      encryptService.decapsulateKeyUnsigned.mockReset();
+      encryptService.decapsulateKeyUnsigned.mockImplementationOnce(() => {
+        throw new Error("Failed to unwrap grantor key");
+      });
+
+      await expect(
+        emergencyAccessService.takeover(
+          params.id,
+          params.masterPassword,
+          params.email,
+          params.activeUserId,
+        ),
+      ).rejects.toThrowError("Failed to unwrap grantor key");
+
+      expect(keyService.userPrivateKey$).toHaveBeenCalledWith(params.activeUserId);
+      expect(encryptService.decapsulateKeyUnsigned).toHaveBeenCalledWith(
+        new EncString(takeoverResponse.keyEncrypted),
+        userPrivateKey,
+      );
+      expect(keyService.makeMasterKey).not.toHaveBeenCalled();
+      expect(keyService.hashMasterKey).not.toHaveBeenCalled();
+      expect(keyService.encryptUserKeyWithMasterKey).not.toHaveBeenCalled();
       expect(emergencyAccessApiService.postEmergencyAccessPassword).not.toHaveBeenCalled();
     });
 
     it("should throw an error if the users private key cannot be retrieved", async () => {
-      emergencyAccessApiService.postEmergencyAccessTakeover.mockResolvedValueOnce({
-        keyEncrypted: "EncryptedKey",
-        kdf: KdfType.PBKDF2_SHA256,
-        kdfIterations: 500,
-      } as EmergencyAccessTakeoverResponse);
-      keyService.getPrivateKey.mockResolvedValue(null);
+      keyService.userPrivateKey$.mockReturnValue(of(null));
 
-      await expect(emergencyAccessService.takeover(mockId, mockEmail, mockName)).rejects.toThrow(
-        "user does not have a private key",
-      );
+      await expect(
+        emergencyAccessService.takeover(
+          params.id,
+          params.masterPassword,
+          params.email,
+          params.activeUserId,
+        ),
+      ).rejects.toThrow("user does not have a private key");
 
+      expect(keyService.userPrivateKey$).toHaveBeenCalledWith(params.activeUserId);
+      expect(encryptService.decapsulateKeyUnsigned).not.toHaveBeenCalled();
+      expect(keyService.makeMasterKey).not.toHaveBeenCalled();
+      expect(keyService.hashMasterKey).not.toHaveBeenCalled();
+      expect(keyService.encryptUserKeyWithMasterKey).not.toHaveBeenCalled();
       expect(emergencyAccessApiService.postEmergencyAccessPassword).not.toHaveBeenCalled();
     });
   });
diff --git a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts
index 9a31bd9c107..cce8d9345b2 100644
--- a/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts
+++ b/apps/web/src/app/auth/emergency-access/services/emergency-access.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from "@angular/core";
+import { firstValueFrom } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data";
@@ -237,11 +238,14 @@ export class EmergencyAccessService
    * Gets the grantor ciphers for an emergency access in view mode.
    * Intended for grantee.
    * @param id emergency access id
+   * @param activeUserId the user id of the active user
    */
-  async getViewOnlyCiphers(id: string): Promise<CipherView[]> {
+  async getViewOnlyCiphers(id: string, activeUserId: UserId): Promise<CipherView[]> {
     const response = await this.emergencyAccessApiService.postEmergencyAccessView(id);
 
-    const activeUserPrivateKey = await this.keyService.getPrivateKey();
+    const activeUserPrivateKey = await firstValueFrom(
+      this.keyService.userPrivateKey$(activeUserId),
+    );
 
     if (activeUserPrivateKey == null) {
       throw new Error("Active user does not have a private key, cannot get view only ciphers.");
@@ -264,11 +268,14 @@ export class EmergencyAccessService
    * @param id emergency access id
    * @param masterPassword new master password
    * @param email email address of grantee (must be consistent or login will fail)
+   * @param activeUserId the user id of the active user
    */
-  async takeover(id: string, masterPassword: string, email: string) {
+  async takeover(id: string, masterPassword: string, email: string, activeUserId: UserId) {
     const takeoverResponse = await this.emergencyAccessApiService.postEmergencyAccessTakeover(id);
 
-    const activeUserPrivateKey = await this.keyService.getPrivateKey();
+    const activeUserPrivateKey = await firstValueFrom(
+      this.keyService.userPrivateKey$(activeUserId),
+    );
 
     if (activeUserPrivateKey == null) {
       throw new Error("Active user does not have a private key, cannot complete a takeover.");
@@ -312,9 +319,7 @@ export class EmergencyAccessService
     request.newMasterPasswordHash = masterKeyHash;
     request.key = encKey[1].encryptedString;
 
-    // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.emergencyAccessApiService.postEmergencyAccessPassword(id, request);
+    await this.emergencyAccessApiService.postEmergencyAccessPassword(id, request);
   }
 
   private async getEmergencyAccessData(): Promise<EmergencyAccessGranteeDetailsResponse[]> {
diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
index 2619e6852b3..e5c21fb82b9 100644
--- a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
@@ -115,10 +115,12 @@ export class EmergencyAccessTakeoverDialogComponent implements OnInit {
     this.parentSubmittingBehaviorSubject.next(true);
 
     try {
+      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
       await this.emergencyAccessService.takeover(
         this.dialogData.emergencyAccessId,
         passwordInputResult.newPassword,
         this.dialogData.grantorEmail,
+        activeUserId,
       );
     } catch (e) {
       this.logService.error(e);
diff --git a/apps/web/src/app/auth/settings/emergency-access/view/emergency-access-view.component.ts b/apps/web/src/app/auth/settings/emergency-access/view/emergency-access-view.component.ts
index ce46e624972..250261fb0e7 100644
--- a/apps/web/src/app/auth/settings/emergency-access/view/emergency-access-view.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/view/emergency-access-view.component.ts
@@ -2,6 +2,8 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { EmergencyAccessId } from "@bitwarden/common/types/guid";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { DialogService } from "@bitwarden/components";
@@ -27,6 +29,7 @@ export class EmergencyAccessViewComponent implements OnInit {
     private route: ActivatedRoute,
     private emergencyAccessService: EmergencyAccessService,
     private dialogService: DialogService,
+    private accountService: AccountService,
   ) {}
 
   async ngOnInit() {
@@ -37,7 +40,8 @@ export class EmergencyAccessViewComponent implements OnInit {
     }
 
     this.id = qParams.id;
-    this.ciphers = await this.emergencyAccessService.getViewOnlyCiphers(qParams.id);
+    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+    this.ciphers = await this.emergencyAccessService.getViewOnlyCiphers(qParams.id, userId);
     this.loaded = true;
   }
 
diff --git a/apps/web/src/app/auth/settings/security/device-management-old.component.ts b/apps/web/src/app/auth/settings/security/device-management-old.component.ts
index 556ba381acc..816da6e873f 100644
--- a/apps/web/src/app/auth/settings/security/device-management-old.component.ts
+++ b/apps/web/src/app/auth/settings/security/device-management-old.component.ts
@@ -3,7 +3,7 @@ import { Component, DestroyRef } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { firstValueFrom } from "rxjs";
 
-import { LoginApprovalComponent } from "@bitwarden/auth/angular";
+import { LoginApprovalDialogComponent } from "@bitwarden/angular/auth/login-approval";
 import { AuthRequestApiServiceAbstraction } from "@bitwarden/auth/common";
 import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
 import {
@@ -325,7 +325,7 @@ export class DeviceManagementOldComponent {
       return;
     }
 
-    const dialogRef = LoginApprovalComponent.open(this.dialogService, {
+    const dialogRef = LoginApprovalDialogComponent.open(this.dialogService, {
       notificationId: device.devicePendingAuthRequest.id,
     });
 
diff --git a/apps/web/src/app/secrets-manager/models/requests/request-sm-access.request.ts b/apps/web/src/app/secrets-manager/models/requests/request-sm-access.request.ts
index 5edd8bc046e..7292e13a6a5 100644
--- a/apps/web/src/app/secrets-manager/models/requests/request-sm-access.request.ts
+++ b/apps/web/src/app/secrets-manager/models/requests/request-sm-access.request.ts
@@ -1,8 +1,8 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { Guid } from "@bitwarden/common/types/guid";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 
 export class RequestSMAccessRequest {
-  OrganizationId: Guid;
+  OrganizationId: OrganizationId;
   EmailContent: string;
 }
diff --git a/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts b/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts
index 443b3e03e5f..0e32321a0b3 100644
--- a/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts
+++ b/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts
@@ -10,7 +10,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 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 { Guid } from "@bitwarden/common/types/guid";
 import { NoItemsModule, SearchModule, ToastService } from "@bitwarden/components";
 
 import { HeaderModule } from "../../layouts/header/header.module";
@@ -63,7 +62,7 @@ export class RequestSMAccessComponent implements OnInit {
 
     const formValue = this.requestAccessForm.value;
     const request = new RequestSMAccessRequest();
-    request.OrganizationId = formValue.selectedOrganization.id as Guid;
+    request.OrganizationId = formValue.selectedOrganization.id;
     request.EmailContent = formValue.requestAccessEmailContents;
 
     await this.smLandingApiService.requestSMAccessFromAdmins(request);
diff --git a/apps/web/src/app/settings/domain-rules.component.html b/apps/web/src/app/settings/domain-rules.component.html
index 7474b63372d..8ebeecb429f 100644
--- a/apps/web/src/app/settings/domain-rules.component.html
+++ b/apps/web/src/app/settings/domain-rules.component.html
@@ -60,7 +60,6 @@
             <button
               type="button"
               bitIconButton="bwi-ellipsis-v"
-              buttonType="secondary"
               [bitMenuTriggerFor]="appListDropdown"
               class="tw-border-0 tw-bg-transparent tw-p-0"
             ></button>
diff --git a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.html b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.html
index 1c643fcc3e4..56332cc424b 100644
--- a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.html
+++ b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.html
@@ -26,14 +26,7 @@
   </ng-container>
 
   <ng-container *ngIf="pageState === BrowserPromptState.ManualOpen">
-    <p bitTypography="body1" class="tw-mb-0 tw-text-xl">
-      {{ "openExtensionManuallyPart1" | i18n }}
-      <bit-icon
-        [icon]="BitwardenIcon"
-        class="[&>svg]:tw-align-baseline [&>svg]:-tw-mb-[2px]"
-      ></bit-icon>
-      {{ "openExtensionManuallyPart2" | i18n }}
-    </p>
+    <vault-manually-open-extension></vault-manually-open-extension>
   </ng-container>
 
   <ng-container *ngIf="pageState === BrowserPromptState.MobileBrowser">
diff --git a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts
index 624275a8297..177311cbfde 100644
--- a/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts
+++ b/apps/web/src/app/vault/components/browser-extension-prompt/browser-extension-prompt.component.ts
@@ -3,17 +3,17 @@ import { Component, Inject, OnDestroy, OnInit } from "@angular/core";
 
 import { ButtonComponent, IconModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
-import { VaultIcons } from "@bitwarden/vault";
 
 import {
   BrowserExtensionPromptService,
   BrowserPromptState,
 } from "../../services/browser-extension-prompt.service";
+import { ManuallyOpenExtensionComponent } from "../manually-open-extension/manually-open-extension.component";
 
 @Component({
   selector: "vault-browser-extension-prompt",
   templateUrl: "./browser-extension-prompt.component.html",
-  imports: [CommonModule, I18nPipe, ButtonComponent, IconModule],
+  imports: [CommonModule, I18nPipe, ButtonComponent, IconModule, ManuallyOpenExtensionComponent],
 })
 export class BrowserExtensionPromptComponent implements OnInit, OnDestroy {
   /** Current state of the prompt page */
@@ -22,8 +22,6 @@ export class BrowserExtensionPromptComponent implements OnInit, OnDestroy {
   /** All available page states */
   protected BrowserPromptState = BrowserPromptState;
 
-  protected BitwardenIcon = VaultIcons.BitwardenIcon;
-
   /** Content of the meta[name="viewport"] element */
   private viewportContent: string | null = null;
 
diff --git a/apps/web/src/app/vault/components/manually-open-extension/manually-open-extension.component.html b/apps/web/src/app/vault/components/manually-open-extension/manually-open-extension.component.html
new file mode 100644
index 00000000000..22c36e51177
--- /dev/null
+++ b/apps/web/src/app/vault/components/manually-open-extension/manually-open-extension.component.html
@@ -0,0 +1,8 @@
+<p bitTypography="body1" class="tw-mb-0 tw-text-xl">
+  {{ "openExtensionManuallyPart1" | i18n }}
+  <bit-icon
+    [icon]="BitwardenIcon"
+    class="[&>svg]:tw-align-baseline [&>svg]:-tw-mb-[2px]"
+  ></bit-icon>
+  {{ "openExtensionManuallyPart2" | i18n }}
+</p>
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
new file mode 100644
index 00000000000..22041b61198
--- /dev/null
+++ b/apps/web/src/app/vault/components/manually-open-extension/manually-open-extension.component.ts
@@ -0,0 +1,14 @@
+import { Component } from "@angular/core";
+
+import { IconModule } from "@bitwarden/components";
+import { I18nPipe } from "@bitwarden/ui-common";
+import { VaultIcons } from "@bitwarden/vault";
+
+@Component({
+  selector: "vault-manually-open-extension",
+  templateUrl: "./manually-open-extension.component.html",
+  imports: [I18nPipe, IconModule],
+})
+export class ManuallyOpenExtensionComponent {
+  protected BitwardenIcon = VaultIcons.BitwardenIcon;
+}
diff --git a/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.ts b/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.ts
index d053e05c36b..6bde812065b 100644
--- a/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.ts
+++ b/apps/web/src/app/vault/components/setup-extension/add-extension-videos.component.ts
@@ -34,8 +34,8 @@ export class AddExtensionVideosComponent {
   /** CSS classes for the video container, pulled into the class only for readability. */
   protected videoContainerClass = [
     "tw-absolute tw-left-0 tw-top-0 tw-w-[15rem] tw-opacity-0 md:tw-opacity-100 md:tw-relative lg:tw-w-[17rem] tw-max-w-full tw-aspect-[0.807]",
-    `[${this.cssOverlayVariable}:0.7] after:tw-absolute after:tw-top-0 after:tw-left-0 after:tw-size-full after:tw-bg-primary-100 after:tw-content-[''] after:tw-rounded-lg after:tw-opacity-[--overlay-opacity]`,
-    `[${this.cssBorderVariable}:0] before:tw-absolute before:tw-top-0 before:tw-left-0 before:tw-w-full before:tw-h-2 before:tw-bg-primary-600 before:tw-content-[''] before:tw-rounded-t-lg before:tw-opacity-[--border-opacity]`,
+    `[--overlay-opacity:0.7] after:tw-absolute after:tw-top-0 after:tw-left-0 after:tw-size-full after:tw-bg-primary-100 after:tw-content-[''] after:tw-rounded-lg after:tw-opacity-[--overlay-opacity]`,
+    `[--border-opacity:0] before:tw-absolute before:tw-top-0 before:tw-left-0 before:tw-w-full before:tw-h-2 before:tw-bg-primary-600 before:tw-content-[''] before:tw-rounded-t-lg before:tw-opacity-[--border-opacity]`,
     "after:tw-transition-opacity after:tw-duration-400 after:tw-ease-linear",
     "before:tw-transition-opacity before:tw-duration-400 before:tw-ease-linear",
   ].join(" ");
diff --git a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.html b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.html
index c23fa0aac35..ac24383a4d3 100644
--- a/apps/web/src/app/vault/components/setup-extension/setup-extension.component.html
+++ b/apps/web/src/app/vault/components/setup-extension/setup-extension.component.html
@@ -54,3 +54,7 @@
     </a>
   </p>
 </section>
+
+<section *ngIf="state === SetupExtensionState.ManualOpen" aria-live="polite" class="tw-text-center">
+  <vault-manually-open-extension></vault-manually-open-extension>
+</section>
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 e824cd92f37..8bb80e6fb44 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
@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { ComponentFixture, fakeAsync, TestBed, tick } from "@angular/core/testing";
 import { By } from "@angular/platform-browser";
 import { Router, RouterModule } from "@angular/router";
 import { BehaviorSubject } from "rxjs";
@@ -11,10 +11,12 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 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";
+import { AnonLayoutWrapperDataService } from "@bitwarden/components";
+import { VaultIcons } from "@bitwarden/vault";
 
 import { WebBrowserInteractionService } from "../../services/web-browser-interaction.service";
 
-import { SetupExtensionComponent } from "./setup-extension.component";
+import { SetupExtensionComponent, SetupExtensionState } from "./setup-extension.component";
 
 describe("SetupExtensionComponent", () => {
   let fixture: ComponentFixture<SetupExtensionComponent>;
@@ -24,12 +26,14 @@ describe("SetupExtensionComponent", () => {
   const navigate = jest.fn().mockResolvedValue(true);
   const openExtension = jest.fn().mockResolvedValue(true);
   const update = jest.fn().mockResolvedValue(true);
+  const setAnonLayoutWrapperData = jest.fn();
   const extensionInstalled$ = new BehaviorSubject<boolean | null>(null);
 
   beforeEach(async () => {
     navigate.mockClear();
     openExtension.mockClear();
     update.mockClear();
+    setAnonLayoutWrapperData.mockClear();
     getFeatureFlag.mockClear().mockResolvedValue(true);
     window.matchMedia = jest.fn().mockReturnValue(false);
 
@@ -40,6 +44,7 @@ describe("SetupExtensionComponent", () => {
         { provide: ConfigService, useValue: { getFeatureFlag } },
         { provide: WebBrowserInteractionService, useValue: { extensionInstalled$, openExtension } },
         { provide: PlatformUtilsService, useValue: { getDevice: () => DeviceType.UnknownBrowser } },
+        { provide: AnonLayoutWrapperDataService, useValue: { setAnonLayoutWrapperData } },
         {
           provide: AccountService,
           useValue: { activeAccount$: new BehaviorSubject({ account: { id: "account-id" } }) },
@@ -136,6 +141,27 @@ describe("SetupExtensionComponent", () => {
       it("dismisses the extension page", () => {
         expect(update).toHaveBeenCalledTimes(1);
       });
+
+      it("shows error state when extension fails to open", fakeAsync(() => {
+        openExtension.mockRejectedValueOnce(new Error("Failed to open extension"));
+
+        const openExtensionButton = fixture.debugElement.query(By.css("button"));
+
+        openExtensionButton.triggerEventHandler("click");
+
+        tick();
+
+        expect(component["state"]).toBe(SetupExtensionState.ManualOpen);
+        expect(setAnonLayoutWrapperData).toHaveBeenCalledWith({
+          pageTitle: {
+            key: "somethingWentWrong",
+          },
+          pageIcon: VaultIcons.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 14770ca5d6c..67d13ef1e4f 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
@@ -15,6 +15,7 @@ import { StateProvider } from "@bitwarden/common/platform/state";
 import { UnionOfValues } from "@bitwarden/common/vault/types/union-of-values";
 import { getWebStoreUrl } from "@bitwarden/common/vault/utils/get-web-store-url";
 import {
+  AnonLayoutWrapperDataService,
   ButtonComponent,
   DialogRef,
   DialogService,
@@ -25,6 +26,7 @@ import { VaultIcons } from "@bitwarden/vault";
 
 import { SETUP_EXTENSION_DISMISSED } from "../../guards/setup-extension-redirect.guard";
 import { WebBrowserInteractionService } from "../../services/web-browser-interaction.service";
+import { ManuallyOpenExtensionComponent } from "../manually-open-extension/manually-open-extension.component";
 
 import {
   AddExtensionLaterDialogComponent,
@@ -32,10 +34,11 @@ import {
 } from "./add-extension-later-dialog.component";
 import { AddExtensionVideosComponent } from "./add-extension-videos.component";
 
-const SetupExtensionState = {
+export const SetupExtensionState = {
   Loading: "loading",
   NeedsExtension: "needs-extension",
   Success: "success",
+  ManualOpen: "manual-open",
 } as const;
 
 type SetupExtensionState = UnionOfValues<typeof SetupExtensionState>;
@@ -51,6 +54,7 @@ type SetupExtensionState = UnionOfValues<typeof SetupExtensionState>;
     IconModule,
     RouterModule,
     AddExtensionVideosComponent,
+    ManuallyOpenExtensionComponent,
   ],
 })
 export class SetupExtensionComponent implements OnInit, OnDestroy {
@@ -63,6 +67,7 @@ export class SetupExtensionComponent implements OnInit, OnDestroy {
   private stateProvider = inject(StateProvider);
   private accountService = inject(AccountService);
   private document = inject(DOCUMENT);
+  private anonLayoutWrapperDataService = inject(AnonLayoutWrapperDataService);
 
   protected SetupExtensionState = SetupExtensionState;
   protected PartyIcon = VaultIcons.Party;
@@ -153,8 +158,21 @@ export class SetupExtensionComponent implements OnInit, OnDestroy {
   }
 
   /** Opens the browser extension */
-  openExtension() {
-    void this.webBrowserExtensionInteractionService.openExtension();
+  async openExtension() {
+    await this.webBrowserExtensionInteractionService.openExtension().catch(() => {
+      this.state = SetupExtensionState.ManualOpen;
+
+      // Update the anon layout data to show the proper error design
+      this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
+        pageTitle: {
+          key: "somethingWentWrong",
+        },
+        pageIcon: VaultIcons.BrowserExtensionIcon,
+        hideIcon: false,
+        hideCardWrapper: false,
+        maxWidth: "md",
+      });
+    });
   }
 
   /** Update local state to never show this page again. */
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 20b87bfc036..006bf9ff197 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
@@ -93,73 +93,74 @@
       </span>
     </button>
   </bit-menu>
-  <button
-    *ngIf="!decryptionFailure"
-    [disabled]="disabled || disableMenu"
-    [bitMenuTriggerFor]="cipherOptions"
-    size="small"
-    bitIconButton="bwi-ellipsis-v"
-    type="button"
-    appA11yTitle="{{ (disableMenu ? 'missingPermissions' : 'options') | i18n }}"
-    appStopProp
-  ></button>
-  <bit-menu #cipherOptions>
-    <ng-container *ngIf="isNotDeletedLoginCipher">
-      <button bitMenuItem type="button" (click)="copy('username')" *ngIf="hasUsernameToCopy">
-        <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
-        {{ "copyUsername" | i18n }}
-      </button>
-      <button bitMenuItem type="button" (click)="copy('password')" *ngIf="hasPasswordToCopy">
-        <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
-        {{ "copyPassword" | i18n }}
-      </button>
-      <button bitMenuItem type="button" (click)="copy('totp')" *ngIf="showTotpCopyButton">
-        <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
-        {{ "copyVerificationCode" | i18n }}
-      </button>
-      <a
-        bitMenuItem
-        *ngIf="canLaunch"
-        type="button"
-        [href]="launchUri"
-        target="_blank"
-        rel="noreferrer"
-      >
-        <i class="bwi bwi-fw bwi-external-link" aria-hidden="true"></i>
-        {{ "launch" | i18n }}
-      </a>
-    </ng-container>
-
-    <button bitMenuItem *ngIf="showAttachments" type="button" (click)="attachments()">
-      <i class="bwi bwi-fw bwi-paperclip" aria-hidden="true"></i>
-      {{ "attachments" | i18n }}
-    </button>
-    <button bitMenuItem *ngIf="showClone" type="button" (click)="clone()">
-      <i class="bwi bwi-fw bwi-files" aria-hidden="true"></i>
-      {{ "clone" | i18n }}
-    </button>
+  @if (!decryptionFailure && !hideMenu) {
     <button
-      bitMenuItem
-      *ngIf="showAssignToCollections"
+      [bitMenuTriggerFor]="cipherOptions"
+      [disabled]="disabled"
+      size="small"
+      bitIconButton="bwi-ellipsis-v"
       type="button"
-      (click)="assignToCollections()"
-    >
-      <i class="bwi bwi-fw bwi-collection-shared" aria-hidden="true"></i>
-      {{ "assignToCollections" | i18n }}
-    </button>
-    <button bitMenuItem *ngIf="showEventLogs" type="button" (click)="events()">
-      <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
-      {{ "eventLogs" | i18n }}
-    </button>
-    <button bitMenuItem (click)="restore()" type="button" *ngIf="isDeleted && canRestoreCipher">
-      <i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i>
-      {{ "restore" | i18n }}
-    </button>
-    <button bitMenuItem *ngIf="canDeleteCipher" (click)="deleteCipher()" type="button">
-      <span class="tw-text-danger">
-        <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
-        {{ (isDeleted ? "permanentlyDelete" : "delete") | i18n }}
-      </span>
-    </button>
-  </bit-menu>
+      appStopProp
+      appA11yTitle="{{ 'options' | i18n }}"
+    ></button>
+    <bit-menu #cipherOptions>
+      <ng-container *ngIf="isNotDeletedLoginCipher">
+        <button bitMenuItem type="button" (click)="copy('username')" *ngIf="hasUsernameToCopy">
+          <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
+          {{ "copyUsername" | i18n }}
+        </button>
+        <button bitMenuItem type="button" (click)="copy('password')" *ngIf="hasPasswordToCopy">
+          <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
+          {{ "copyPassword" | i18n }}
+        </button>
+        <button bitMenuItem type="button" (click)="copy('totp')" *ngIf="showTotpCopyButton">
+          <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
+          {{ "copyVerificationCode" | i18n }}
+        </button>
+        <a
+          bitMenuItem
+          *ngIf="canLaunch"
+          type="button"
+          [href]="launchUri"
+          target="_blank"
+          rel="noreferrer"
+        >
+          <i class="bwi bwi-fw bwi-external-link" aria-hidden="true"></i>
+          {{ "launch" | i18n }}
+        </a>
+      </ng-container>
+
+      <button bitMenuItem *ngIf="showAttachments" type="button" (click)="attachments()">
+        <i class="bwi bwi-fw bwi-paperclip" aria-hidden="true"></i>
+        {{ "attachments" | i18n }}
+      </button>
+      <button bitMenuItem *ngIf="showClone" type="button" (click)="clone()">
+        <i class="bwi bwi-fw bwi-files" aria-hidden="true"></i>
+        {{ "clone" | i18n }}
+      </button>
+      <button
+        bitMenuItem
+        *ngIf="showAssignToCollections"
+        type="button"
+        (click)="assignToCollections()"
+      >
+        <i class="bwi bwi-fw bwi-collection-shared" aria-hidden="true"></i>
+        {{ "assignToCollections" | i18n }}
+      </button>
+      <button bitMenuItem *ngIf="showEventLogs" type="button" (click)="events()">
+        <i class="bwi bwi-fw bwi-file-text" aria-hidden="true"></i>
+        {{ "eventLogs" | i18n }}
+      </button>
+      <button bitMenuItem (click)="restore()" type="button" *ngIf="isDeleted && canRestoreCipher">
+        <i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i>
+        {{ "restore" | i18n }}
+      </button>
+      <button bitMenuItem *ngIf="canDeleteCipher" (click)="deleteCipher()" type="button">
+        <span class="tw-text-danger">
+          <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
+          {{ (isDeleted ? "permanentlyDelete" : "delete") | i18n }}
+        </span>
+      </button>
+    </bit-menu>
+  }
 </td>
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
index cb4d8ad70b1..32037493e36 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
@@ -189,8 +189,14 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     return this.i18nService.t("noAccess");
   }
 
+  protected get showCopyUsername(): boolean {
+    const usernameCopy = CipherViewLikeUtils.hasCopyableValue(this.cipher, "username");
+    return this.isNotDeletedLoginCipher && usernameCopy;
+  }
+
   protected get showCopyPassword(): boolean {
-    return this.isNotDeletedLoginCipher && this.cipher.viewPassword;
+    const passwordCopy = CipherViewLikeUtils.hasCopyableValue(this.cipher, "password");
+    return this.isNotDeletedLoginCipher && this.cipher.viewPassword && passwordCopy;
   }
 
   protected get showCopyTotp(): boolean {
@@ -201,16 +207,20 @@ export class VaultCipherRowComponent<C extends CipherViewLike> implements OnInit
     return this.isNotDeletedLoginCipher && this.canLaunch;
   }
 
-  protected get disableMenu() {
+  protected get isDeletedCanRestore(): boolean {
+    return CipherViewLikeUtils.isDeleted(this.cipher) && this.canRestoreCipher;
+  }
+
+  protected get hideMenu() {
     return !(
-      this.isNotDeletedLoginCipher ||
+      this.isDeletedCanRestore ||
+      this.showCopyUsername ||
       this.showCopyPassword ||
       this.showCopyTotp ||
       this.showLaunchUri ||
       this.showAttachments ||
       this.showClone ||
-      this.canEditCipher ||
-      (CipherViewLikeUtils.isDeleted(this.cipher) && this.canRestoreCipher)
+      this.canEditCipher
     );
   }
 
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
index e63b353be9c..a8dd0056806 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
@@ -28,8 +28,8 @@ import { VaultItem } from "./vault-item";
 import { VaultItemEvent } from "./vault-item-event";
 
 // Fixed manual row height required due to how cdk-virtual-scroll works
-export const RowHeight = 75.5;
-export const RowHeightClass = `tw-h-[75.5px]`;
+export const RowHeight = 75;
+export const RowHeightClass = `tw-h-[75px]`;
 
 const MaxSelectionCount = 500;
 
@@ -166,6 +166,10 @@ export class VaultItemsComponent<C extends CipherViewLike> {
     );
   }
 
+  clearSelection() {
+    this.selection.clear();
+  }
+
   get showExtraColumn() {
     return this.showCollections || this.showGroups || this.showOwner;
   }
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts b/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
index 78c4d21dede..c114cb6d7c2 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.stories.ts
@@ -29,6 +29,7 @@ import {
 } from "@bitwarden/common/platform/abstractions/environment.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
+import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -262,7 +263,7 @@ export const OrganizationTrash: Story = {
 };
 
 const unassignedCollection = new CollectionAdminView();
-unassignedCollection.id = Unassigned;
+unassignedCollection.id = Unassigned as CollectionId;
 unassignedCollection.name = "Unassigned";
 export const OrganizationTopLevelCollection: Story = {
   args: {
@@ -327,7 +328,7 @@ function createCollectionView(i: number): CollectionAdminView {
   const organization = organizations[i % (organizations.length + 1)];
   const group = groups[i % (groups.length + 1)];
   const view = new CollectionAdminView();
-  view.id = `collection-${i}`;
+  view.id = `collection-${i}` as CollectionId;
   view.name = `Collection ${i}`;
   view.organizationId = organization?.id;
   view.manage = true;
@@ -357,7 +358,7 @@ function createGroupView(i: number): GroupView {
 
 function createOrganization(i: number): Organization {
   const organization = new Organization();
-  organization.id = `organization-${i}`;
+  organization.id = `organization-${i}` as OrganizationId;
   organization.name = `Organization ${i}`;
   organization.type = OrganizationUserType.Owner;
   organization.permissions = new PermissionsApi();
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service.ts
index a42b5228272..a5a99428b2d 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/routed-vault-filter.service.ts
@@ -2,6 +2,8 @@ import { Injectable, OnDestroy } from "@angular/core";
 import { ActivatedRoute, NavigationExtras } from "@angular/router";
 import { combineLatest, map, Observable, Subject, takeUntil } from "rxjs";
 
+import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
+
 import {
   isRoutedVaultFilterItemType,
   RoutedVaultFilterModel,
@@ -31,10 +33,12 @@ export class RoutedVaultFilterService implements OnDestroy {
         const type = isRoutedVaultFilterItemType(unsafeType) ? unsafeType : undefined;
 
         return {
-          collectionId: queryParams.get("collectionId") ?? undefined,
+          collectionId: (queryParams.get("collectionId") as CollectionId) ?? undefined,
           folderId: queryParams.get("folderId") ?? undefined,
           organizationId:
-            params.get("organizationId") ?? queryParams.get("organizationId") ?? undefined,
+            (params.get("organizationId") as OrganizationId) ??
+            (queryParams.get("organizationId") as OrganizationId) ??
+            undefined,
           organizationIdParamType:
             params.get("organizationId") != undefined ? ("path" as const) : ("query" as const),
           type,
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
index 266676e418b..11e074db985 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts
@@ -28,7 +28,7 @@ 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 { SingleUserState, StateProvider } from "@bitwarden/common/platform/state";
-import { UserId } from "@bitwarden/common/types/guid";
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { CipherType } from "@bitwarden/common/vault/enums";
@@ -209,7 +209,7 @@ export class VaultFilterService implements VaultFilterServiceAbstraction {
 
   protected getOrganizationFilterMyVault(): TreeNode<OrganizationFilter> {
     const myVault = new Organization() as OrganizationFilter;
-    myVault.id = "MyVault";
+    myVault.id = "MyVault" as OrganizationId;
     myVault.icon = "bwi-user";
     myVault.enabled = true;
     myVault.hideOptions = true;
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts
index fe236a089e0..02d536eb6ab 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter-bridge.model.ts
@@ -1,4 +1,5 @@
 import { Unassigned } from "@bitwarden/admin-console/common";
+import { CollectionId } from "@bitwarden/common/types/guid";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
 
@@ -65,7 +66,7 @@ export class RoutedVaultFilterBridge implements VaultFilter {
     let type: RoutedVaultFilterItemType | undefined;
 
     if (value?.node.id === "AllItems" && this.routedFilter.organizationIdParamType === "path") {
-      type = "all";
+      type = All;
     } else if (
       value?.node.id === "AllItems" &&
       this.routedFilter.organizationIdParamType === "query"
@@ -98,7 +99,7 @@ export class RoutedVaultFilterBridge implements VaultFilter {
     return this.legacyFilter.selectedCollectionNode;
   }
   set selectedCollectionNode(value: TreeNode<CollectionFilter>) {
-    let collectionId: string | undefined;
+    let collectionId: CollectionId | All | Unassigned | undefined;
 
     if (value != null && value.node.id === null) {
       collectionId = Unassigned;
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model.ts b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model.ts
index 866ba1d9848..280ffd15732 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model.ts
@@ -1,4 +1,11 @@
+import { Unassigned } from "@bitwarden/admin-console/common";
+import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
+
+/**
+ * A constant used to represent viewing "all" of a particular filter.
+ */
 export const All = "all";
+export type All = typeof All;
 
 // TODO: Remove `All` when moving to vertical navigation.
 const itemTypes = [
@@ -19,9 +26,9 @@ export function isRoutedVaultFilterItemType(value: unknown): value is RoutedVaul
 }
 
 export interface RoutedVaultFilterModel {
-  collectionId?: string;
+  collectionId?: CollectionId | All | Unassigned;
   folderId?: string;
-  organizationId?: string;
+  organizationId?: OrganizationId | Unassigned;
   type?: RoutedVaultFilterItemType;
 
   organizationIdParamType?: "path" | "query";
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html
index c20209a0192..35b1a1876a1 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault.component.html
@@ -37,6 +37,7 @@
       {{ trashCleanupWarning }}
     </bit-callout>
     <app-vault-items
+      #vaultItems
       [ciphers]="ciphers"
       [collections]="collections"
       [allCollections]="allCollections"
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 09284cec9c9..658f829128d 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -108,6 +108,7 @@ import {
 } from "../components/vault-item-dialog/vault-item-dialog.component";
 import { VaultItem } from "../components/vault-items/vault-item";
 import { VaultItemEvent } from "../components/vault-items/vault-item-event";
+import { VaultItemsComponent } from "../components/vault-items/vault-items.component";
 import { VaultItemsModule } from "../components/vault-items/vault-items.module";
 
 import {
@@ -156,6 +157,7 @@ const SearchTextDebounceInterval = 200;
 })
 export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestroy {
   @ViewChild("vaultFilter", { static: true }) filterComponent: VaultFilterComponent;
+  @ViewChild("vaultItems", { static: false }) vaultItemsComponent: VaultItemsComponent<C>;
 
   trashCleanupWarning: string = null;
   kdfIterations: number;
@@ -1281,6 +1283,7 @@ export class VaultComponent<C extends CipherViewLike> implements OnInit, OnDestr
 
   private refresh() {
     this.refresh$.next();
+    this.vaultItemsComponent?.clearSelection();
   }
 
   private async go(queryParams: any = null) {
diff --git a/apps/web/src/app/vault/services/web-browser-interaction.service.ts b/apps/web/src/app/vault/services/web-browser-interaction.service.ts
index 1f91942591b..ed5e2ef9948 100644
--- a/apps/web/src/app/vault/services/web-browser-interaction.service.ts
+++ b/apps/web/src/app/vault/services/web-browser-interaction.service.ts
@@ -25,7 +25,7 @@ import { VaultMessages } from "@bitwarden/common/vault/enums/vault-messages.enum
  * used to allow for the extension to open and then emit to the message.
  * NOTE: This value isn't computed by any means, it is just a reasonable timeout for the extension to respond.
  */
-const OPEN_RESPONSE_TIMEOUT_MS = 1500;
+const OPEN_RESPONSE_TIMEOUT_MS = 2000;
 
 /**
  * Timeout for checking if the extension is installed.
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 2a75bf51900..587dcd84e0c 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -1428,9 +1428,6 @@
   "notificationSentDevicePart1": {
     "message": "Unlock Bitwarden on your device or on the "
   },
-  "areYouTryingToAccessYourAccount": {
-    "message": "Are you trying to access your account?"
-  },
   "accessAttemptBy": {
     "message": "Access attempt by $EMAIL$",
     "placeholders": {
@@ -3981,22 +3978,6 @@
   "thisRequestIsNoLongerValid": {
     "message": "This request is no longer valid."
   },
-  "logInConfirmedForEmailOnDevice": {
-    "message": "Login confirmed for $EMAIL$ on $DEVICE$",
-    "placeholders": {
-      "email": {
-        "content": "$1",
-        "example": "name@example.com"
-      },
-      "device": {
-        "content": "$2",
-        "example": "iOS"
-      }
-    }
-  },
-  "youDeniedALogInAttemptFromAnotherDevice": {
-    "message": "You denied a login attempt from another device. If this really was you, try to log in with the device again."
-  },
   "loginRequestApprovedForEmailOnDevice": {
     "message": "Login request approved for $EMAIL$ on $DEVICE$",
     "placeholders": {
@@ -5448,6 +5429,37 @@
   "organizationDataOwnership": {
     "message": "Enforce organization data ownership"
   },
+  "organizationDataOwnershipDesc": {
+    "message": "Require all items to be owned by an organization, removing the option to store items at the account level.",
+    "description": "This is the policy description shown in the policy list."
+  },
+  "organizationDataOwnershipContent": {
+    "message": "All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection be available for each member to store items. Learn more about managing the ",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'All items will be owned and saved to the organization, enabling organization-wide controls, visibility, and reporting. When turned on, a default collection be available for each member to store items. Learn more about managing the credential lifecycle.'"
+  },
+  "organizationDataOwnershipContentAnchor":{
+    "message": "credential lifecycle",
+    "description": "This will be used as a hyperlink"
+  },
+  "organizationDataOwnershipWarningTitle":{
+    "message": "Are you sure you want to proceed?"
+  },
+  "organizationDataOwnershipWarning1":{
+    "message": "will remain accessible to members"
+  },
+  "organizationDataOwnershipWarning2":{
+    "message": "will not be automatically selected when creating new items"
+  },
+  "organizationDataOwnershipWarning3":{
+    "message": "cannot be managed from the Admin Console until the user is offboarded"
+  },
+  "organizationDataOwnershipWarningContentTop":{
+    "message": "By turning this policy off, the default collection: "
+  },
+  "organizationDataOwnershipWarningContentBottom":{
+    "message": "Learn more about the ",
+    "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about the credential lifecycle.'"
+  },
   "personalOwnership": {
     "message": "Remove individual vault"
   },
@@ -10984,5 +10996,11 @@
   },
    "unlimitedSecretsAndProjects": {
     "message": "Unlimited secrets and projects"
+  },
+   "providersubscriptionCanceled": {
+    "message": "Subscription canceled"
+  },
+  "providersubCanceledmessage": {
+    "message" : "To resubscribe, contact Bitwarden Customer Support."
   }
 }
\ No newline at end of file
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.ts
index 61e2133d059..821509b43e2 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/activate-autofill.component.ts
@@ -1,7 +1,9 @@
 import { Component } from "@angular/core";
+import { of } from "rxjs";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import {
   BasePolicy,
   BasePolicyComponent,
@@ -13,8 +15,8 @@ export class ActivateAutofillPolicy extends BasePolicy {
   type = PolicyType.ActivateAutofill;
   component = ActivateAutofillPolicyComponent;
 
-  display(organization: Organization) {
-    return organization.useActivateAutofillPolicy;
+  display(organization: Organization, configService: ConfigService) {
+    return of(organization.useActivateAutofillPolicy);
   }
 }
 
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts
index 9cbe8115008..69d02214717 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts
@@ -52,8 +52,8 @@ export class MembersComponent extends BaseMembersComponent<ProviderUser> {
   dataSource = new MembersTableDataSource();
   loading = true;
   providerId: string;
-  rowHeight = 69;
-  rowHeightClass = `tw-h-[69px]`;
+  rowHeight = 70;
+  rowHeightClass = `tw-h-[70px]`;
   status: ProviderUserStatusType = null;
 
   userStatusType = ProviderUserStatusType;
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 0fc49067740..52260168d4c 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
@@ -12,9 +12,12 @@ import { ProviderStatusType, ProviderType } from "@bitwarden/common/admin-consol
 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 } from "@bitwarden/components";
-import { BusinessUnitPortalLogo } from "@bitwarden/web-vault/app/admin-console/icons/business-unit-portal-logo.icon";
-import { ProviderPortalLogo } from "@bitwarden/web-vault/app/admin-console/icons/provider-portal-logo";
+import {
+  Icon,
+  IconModule,
+  ProviderPortalLogo,
+  BusinessUnitPortalLogo,
+} from "@bitwarden/components";
 import { WebLayoutModule } from "@bitwarden/web-vault/app/layouts/web-layout.module";
 
 import { ProviderWarningsService } from "../../billing/providers/services/provider-warnings.service";
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription-status.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription-status.component.ts
index 974dc9c460f..f9ff006de24 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription-status.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription-status.component.ts
@@ -158,7 +158,7 @@ export class ProviderSubscriptionStatusComponent {
       }
       case "incomplete_expired":
       case "canceled": {
-        const canceledText = this.i18nService.t("canceled");
+        const canceledText = this.i18nService.t("providersubscriptionCanceled");
         return {
           status: {
             label: defaultStatusLabel,
@@ -171,7 +171,7 @@ export class ProviderSubscriptionStatusComponent {
           callout: {
             severity: "danger",
             header: canceledText,
-            body: this.i18nService.t("subscriptionCanceled"),
+            body: this.i18nService.t("providersubCanceledmessage"),
           },
         };
       }
diff --git a/libs/admin-console/src/common/collections/models/collection-admin.view.ts b/libs/admin-console/src/common/collections/models/collection-admin.view.ts
index dd7a57013ca..dcc88551551 100644
--- a/libs/admin-console/src/common/collections/models/collection-admin.view.ts
+++ b/libs/admin-console/src/common/collections/models/collection-admin.view.ts
@@ -4,7 +4,10 @@ import { CollectionAccessSelectionView } from "./collection-access-selection.vie
 import { CollectionAccessDetailsResponse } from "./collection.response";
 import { CollectionView } from "./collection.view";
 
+// TODO: this is used to represent the pseudo "Unassigned" collection as well as
+// the user's personal vault (as a pseudo organization). This should be separated out into different values.
 export const Unassigned = "unassigned";
+export type Unassigned = typeof Unassigned;
 
 export class CollectionAdminView extends CollectionView {
   groups: CollectionAccessSelectionView[] = [];
diff --git a/libs/admin-console/src/common/collections/models/collection.spec.ts b/libs/admin-console/src/common/collections/models/collection.spec.ts
index 925490d22b9..fb38f1507f9 100644
--- a/libs/admin-console/src/common/collections/models/collection.spec.ts
+++ b/libs/admin-console/src/common/collections/models/collection.spec.ts
@@ -54,7 +54,7 @@ describe("Collection", () => {
 
   it("Decrypt", async () => {
     const collection = new Collection();
-    collection.id = "id";
+    collection.id = "id" as CollectionId;
     collection.organizationId = "orgId" as OrganizationId;
     collection.name = mockEnc("encName");
     collection.externalId = "extId";
diff --git a/libs/admin-console/src/common/collections/models/collection.ts b/libs/admin-console/src/common/collections/models/collection.ts
index 7bbd018fa96..d1709d1751d 100644
--- a/libs/admin-console/src/common/collections/models/collection.ts
+++ b/libs/admin-console/src/common/collections/models/collection.ts
@@ -1,5 +1,6 @@
 import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
 import Domain, { EncryptableKeys } from "@bitwarden/common/platform/models/domain/domain-base";
+import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 import { OrgKey } from "@bitwarden/common/types/key";
 
 import { CollectionData } from "./collection.data";
@@ -13,8 +14,8 @@ export const CollectionTypes = {
 export type CollectionType = (typeof CollectionTypes)[keyof typeof CollectionTypes];
 
 export class Collection extends Domain {
-  id: string | undefined;
-  organizationId: string | undefined;
+  id: CollectionId | undefined;
+  organizationId: OrganizationId | undefined;
   name: EncString | undefined;
   externalId: string | undefined;
   readOnly: boolean = false;
diff --git a/libs/admin-console/src/common/collections/models/collection.view.ts b/libs/admin-console/src/common/collections/models/collection.view.ts
index f75ff565100..3a60320856d 100644
--- a/libs/admin-console/src/common/collections/models/collection.view.ts
+++ b/libs/admin-console/src/common/collections/models/collection.view.ts
@@ -2,6 +2,7 @@ import { Jsonify } from "type-fest";
 
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { View } from "@bitwarden/common/models/view/view";
+import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 import { ITreeNodeObject } from "@bitwarden/common/vault/models/domain/tree-node";
 
 import { Collection, CollectionType, CollectionTypes } from "./collection";
@@ -10,8 +11,8 @@ import { CollectionAccessDetailsResponse } from "./collection.response";
 export const NestingDelimiter = "/";
 
 export class CollectionView implements View, ITreeNodeObject {
-  id: string | undefined;
-  organizationId: string | undefined;
+  id: CollectionId | undefined;
+  organizationId: OrganizationId | undefined;
   name: string = "";
   externalId: string | undefined;
   // readOnly applies to the items within a collection
diff --git a/libs/admin-console/src/common/organization-user/models/requests/organization-user-bulk-confirm.request.ts b/libs/admin-console/src/common/organization-user/models/requests/organization-user-bulk-confirm.request.ts
index 35e05602838..4523c3afebc 100644
--- a/libs/admin-console/src/common/organization-user/models/requests/organization-user-bulk-confirm.request.ts
+++ b/libs/admin-console/src/common/organization-user/models/requests/organization-user-bulk-confirm.request.ts
@@ -1,3 +1,5 @@
+import { EncString as SdkEncString } from "@bitwarden/sdk-internal";
+
 type OrganizationUserBulkRequestEntry = {
   id: string;
   key: string;
@@ -5,8 +7,10 @@ type OrganizationUserBulkRequestEntry = {
 
 export class OrganizationUserBulkConfirmRequest {
   keys: OrganizationUserBulkRequestEntry[];
+  defaultUserCollectionName: SdkEncString | undefined;
 
-  constructor(keys: OrganizationUserBulkRequestEntry[]) {
+  constructor(keys: OrganizationUserBulkRequestEntry[], defaultUserCollectionName?: SdkEncString) {
     this.keys = keys;
+    this.defaultUserCollectionName = defaultUserCollectionName;
   }
 }
diff --git a/libs/angular/src/auth/device-management/device-management-item-group.component.ts b/libs/angular/src/auth/device-management/device-management-item-group.component.ts
index 62468a18225..864712ceb78 100644
--- a/libs/angular/src/auth/device-management/device-management-item-group.component.ts
+++ b/libs/angular/src/auth/device-management/device-management-item-group.component.ts
@@ -2,13 +2,12 @@ import { CommonModule } from "@angular/common";
 import { Component, Input } from "@angular/core";
 import { firstValueFrom } from "rxjs";
 
-// 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 { LoginApprovalComponent } from "@bitwarden/auth/angular";
 import { DevicePendingAuthRequest } from "@bitwarden/common/auth/abstractions/devices/responses/device.response";
 import { BadgeModule, DialogService, ItemModule } from "@bitwarden/components";
 import { I18nPipe } from "@bitwarden/ui-common";
 
+import { LoginApprovalDialogComponent } from "../login-approval/login-approval-dialog.component";
+
 import { DeviceDisplayData } from "./device-management.component";
 import { clearAuthRequestAndResortDevices } from "./resort-devices.helper";
 
@@ -29,7 +28,7 @@ export class DeviceManagementItemGroupComponent {
       return;
     }
 
-    const loginApprovalDialog = LoginApprovalComponent.open(this.dialogService, {
+    const loginApprovalDialog = LoginApprovalDialogComponent.open(this.dialogService, {
       notificationId: pendingAuthRequest.id,
     });
 
diff --git a/libs/angular/src/auth/device-management/device-management-table.component.ts b/libs/angular/src/auth/device-management/device-management-table.component.ts
index 1d20e54deec..c3c835f05ed 100644
--- a/libs/angular/src/auth/device-management/device-management-table.component.ts
+++ b/libs/angular/src/auth/device-management/device-management-table.component.ts
@@ -3,9 +3,6 @@ import { Component, Input, OnChanges, SimpleChanges } from "@angular/core";
 import { firstValueFrom } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-// 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 { LoginApprovalComponent } from "@bitwarden/auth/angular";
 import { DevicePendingAuthRequest } from "@bitwarden/common/auth/abstractions/devices/responses/device.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import {
@@ -17,6 +14,8 @@ import {
   TableModule,
 } from "@bitwarden/components";
 
+import { LoginApprovalDialogComponent } from "../login-approval/login-approval-dialog.component";
+
 import { DeviceDisplayData } from "./device-management.component";
 import { clearAuthRequestAndResortDevices } from "./resort-devices.helper";
 
@@ -68,7 +67,7 @@ export class DeviceManagementTableComponent implements OnChanges {
       return;
     }
 
-    const loginApprovalDialog = LoginApprovalComponent.open(this.dialogService, {
+    const loginApprovalDialog = LoginApprovalDialogComponent.open(this.dialogService, {
       notificationId: pendingAuthRequest.id,
     });
 
diff --git a/libs/angular/src/auth/login-approval/default-login-approval-dialog-component.service.spec.ts b/libs/angular/src/auth/login-approval/default-login-approval-dialog-component.service.spec.ts
new file mode 100644
index 00000000000..018b1ce2547
--- /dev/null
+++ b/libs/angular/src/auth/login-approval/default-login-approval-dialog-component.service.spec.ts
@@ -0,0 +1,30 @@
+import { TestBed } from "@angular/core/testing";
+
+import { DefaultLoginApprovalDialogComponentService } from "./default-login-approval-dialog-component.service";
+import { LoginApprovalDialogComponent } from "./login-approval-dialog.component";
+
+describe("DefaultLoginApprovalDialogComponentService", () => {
+  let service: DefaultLoginApprovalDialogComponentService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [DefaultLoginApprovalDialogComponentService],
+    });
+
+    service = TestBed.inject(DefaultLoginApprovalDialogComponentService);
+  });
+
+  it("is created successfully", () => {
+    expect(service).toBeTruthy();
+  });
+
+  it("has showLoginRequestedAlertIfWindowNotVisible method that is a no-op", async () => {
+    const loginApprovalDialogComponent = {} as LoginApprovalDialogComponent;
+
+    const result = await service.showLoginRequestedAlertIfWindowNotVisible(
+      loginApprovalDialogComponent.email,
+    );
+
+    expect(result).toBeUndefined();
+  });
+});
diff --git a/libs/angular/src/auth/login-approval/default-login-approval-dialog-component.service.ts b/libs/angular/src/auth/login-approval/default-login-approval-dialog-component.service.ts
new file mode 100644
index 00000000000..5fefd3c3abb
--- /dev/null
+++ b/libs/angular/src/auth/login-approval/default-login-approval-dialog-component.service.ts
@@ -0,0 +1,16 @@
+import { LoginApprovalDialogComponentServiceAbstraction } from "./login-approval-dialog-component.service.abstraction";
+
+/**
+ * Default implementation of the LoginApprovalDialogComponentServiceAbstraction.
+ */
+export class DefaultLoginApprovalDialogComponentService
+  implements LoginApprovalDialogComponentServiceAbstraction
+{
+  /**
+   * No-op implementation of the showLoginRequestedAlertIfWindowNotVisible method.
+   * @returns
+   */
+  async showLoginRequestedAlertIfWindowNotVisible(email?: string): Promise<void> {
+    return;
+  }
+}
diff --git a/libs/angular/src/auth/login-approval/index.ts b/libs/angular/src/auth/login-approval/index.ts
new file mode 100644
index 00000000000..7b34b17d56b
--- /dev/null
+++ b/libs/angular/src/auth/login-approval/index.ts
@@ -0,0 +1,3 @@
+export * from "./login-approval-dialog.component";
+export * from "./login-approval-dialog-component.service.abstraction";
+export * from "./default-login-approval-dialog-component.service";
diff --git a/libs/auth/src/common/abstractions/login-approval-component.service.abstraction.ts b/libs/angular/src/auth/login-approval/login-approval-dialog-component.service.abstraction.ts
similarity index 57%
rename from libs/auth/src/common/abstractions/login-approval-component.service.abstraction.ts
rename to libs/angular/src/auth/login-approval/login-approval-dialog-component.service.abstraction.ts
index eaa62359808..f29311402a7 100644
--- a/libs/auth/src/common/abstractions/login-approval-component.service.abstraction.ts
+++ b/libs/angular/src/auth/login-approval/login-approval-dialog-component.service.abstraction.ts
@@ -1,7 +1,7 @@
 /**
- * Abstraction for the LoginApprovalComponent service.
+ * Abstraction for the LoginApprovalDialogComponent service.
  */
-export abstract class LoginApprovalComponentServiceAbstraction {
+export abstract class LoginApprovalDialogComponentServiceAbstraction {
   /**
    * Shows a login requested alert if the window is not visible.
    */
diff --git a/libs/auth/src/angular/login-approval/login-approval.component.html b/libs/angular/src/auth/login-approval/login-approval-dialog.component.html
similarity index 72%
rename from libs/auth/src/angular/login-approval/login-approval.component.html
rename to libs/angular/src/auth/login-approval/login-approval-dialog.component.html
index d37e30c5e0a..f2850406235 100644
--- a/libs/auth/src/angular/login-approval/login-approval.component.html
+++ b/libs/angular/src/auth/login-approval/login-approval-dialog.component.html
@@ -1,5 +1,6 @@
 <bit-dialog>
-  <span bitDialogTitle>{{ "areYouTryingToAccessYourAccount" | i18n }}</span>
+  <span bitDialogTitle>{{ "loginRequest" | i18n }}</span>
+
   <ng-container bitDialogContent>
     <ng-container *ngIf="loading">
       <div class="tw-flex tw-items-center tw-justify-center" *ngIf="loading">
@@ -8,28 +9,29 @@
     </ng-container>
 
     <ng-container *ngIf="!loading">
-      <h4 class="tw-mb-3">{{ "accessAttemptBy" | i18n: email }}</h4>
+      <p>{{ "accessAttemptBy" | i18n: email }}</p>
       <div>
-        <b>{{ "fingerprintPhraseHeader" | i18n }}</b>
+        <span class="tw-font-medium">{{ "fingerprintPhraseHeader" | i18n }}</span>
         <p class="tw-text-code">{{ fingerprintPhrase }}</p>
       </div>
       <div>
-        <b>{{ "deviceType" | i18n }}</b>
-        <p>{{ authRequestResponse?.requestDeviceType }}</p>
+        <span class="tw-font-medium">{{ "deviceType" | i18n }}</span>
+        <p>{{ readableDeviceTypeName }}</p>
       </div>
       <div>
-        <b>{{ "location" | i18n }}</b>
+        <span class="tw-font-medium">{{ "location" | i18n }}</span>
         <p>
           <span class="tw-capitalize">{{ authRequestResponse?.requestCountryName }} </span>
           ({{ authRequestResponse?.requestIpAddress }})
         </p>
       </div>
       <div>
-        <b>{{ "time" | i18n }}</b>
+        <span class="tw-font-medium">{{ "time" | i18n }}</span>
         <p>{{ requestTimeText }}</p>
       </div>
     </ng-container>
   </ng-container>
+
   <ng-container bitDialogFooter>
     <button
       bitButton
diff --git a/libs/auth/src/angular/login-approval/login-approval.component.spec.ts b/libs/angular/src/auth/login-approval/login-approval-dialog.component.spec.ts
similarity index 77%
rename from libs/auth/src/angular/login-approval/login-approval.component.spec.ts
rename to libs/angular/src/auth/login-approval/login-approval-dialog.component.spec.ts
index afc2c67de12..b21264eb7c8 100644
--- a/libs/auth/src/angular/login-approval/login-approval.component.spec.ts
+++ b/libs/angular/src/auth/login-approval/login-approval-dialog.component.spec.ts
@@ -2,34 +2,33 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 import { mock, MockProxy } from "jest-mock-extended";
 import { of } from "rxjs";
 
-import {
-  AuthRequestServiceAbstraction,
-  LoginApprovalComponentServiceAbstraction,
-} from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
-import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { UserId } from "@bitwarden/common/types/guid";
 // 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 { AuthRequestServiceAbstraction } from "@bitwarden/auth/common";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
+import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
+import { UserId } from "@bitwarden/common/types/guid";
 import { DialogRef, DIALOG_DATA, ToastService } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
 
-import { LoginApprovalComponent } from "./login-approval.component";
+import { LoginApprovalDialogComponentServiceAbstraction } from "./login-approval-dialog-component.service.abstraction";
+import { LoginApprovalDialogComponent } from "./login-approval-dialog.component";
 
-describe("LoginApprovalComponent", () => {
-  let component: LoginApprovalComponent;
-  let fixture: ComponentFixture<LoginApprovalComponent>;
+describe("LoginApprovalDialogComponent", () => {
+  let component: LoginApprovalDialogComponent;
+  let fixture: ComponentFixture<LoginApprovalDialogComponent>;
 
-  let authRequestService: MockProxy<AuthRequestServiceAbstraction>;
   let accountService: MockProxy<AccountService>;
   let apiService: MockProxy<ApiService>;
-  let i18nService: MockProxy<I18nService>;
+  let authRequestService: MockProxy<AuthRequestServiceAbstraction>;
+  let devicesService: MockProxy<DevicesServiceAbstraction>;
   let dialogRef: MockProxy<DialogRef>;
+  let i18nService: MockProxy<I18nService>;
+  let logService: MockProxy<LogService>;
   let toastService: MockProxy<ToastService>;
   let validationService: MockProxy<ValidationService>;
 
@@ -38,11 +37,13 @@ describe("LoginApprovalComponent", () => {
   const testPublicKey = "test-public-key";
 
   beforeEach(async () => {
-    authRequestService = mock<AuthRequestServiceAbstraction>();
     accountService = mock<AccountService>();
     apiService = mock<ApiService>();
-    i18nService = mock<I18nService>();
+    authRequestService = mock<AuthRequestServiceAbstraction>();
+    devicesService = mock<DevicesServiceAbstraction>();
     dialogRef = mock<DialogRef>();
+    i18nService = mock<I18nService>();
+    logService = mock<LogService>();
     toastService = mock<ToastService>();
     validationService = mock<ValidationService>();
 
@@ -54,27 +55,26 @@ describe("LoginApprovalComponent", () => {
     });
 
     await TestBed.configureTestingModule({
-      imports: [LoginApprovalComponent],
+      imports: [LoginApprovalDialogComponent],
       providers: [
         { provide: DIALOG_DATA, useValue: { notificationId: testNotificationId } },
-        { provide: AuthRequestServiceAbstraction, useValue: authRequestService },
         { provide: AccountService, useValue: accountService },
-        { provide: PlatformUtilsService, useValue: mock<PlatformUtilsService>() },
-        { provide: I18nService, useValue: i18nService },
         { provide: ApiService, useValue: apiService },
-        { provide: AppIdService, useValue: mock<AppIdService>() },
-        { provide: KeyService, useValue: mock<KeyService>() },
+        { provide: AuthRequestServiceAbstraction, useValue: authRequestService },
+        { provide: DevicesServiceAbstraction, useValue: devicesService },
         { provide: DialogRef, useValue: dialogRef },
+        { provide: I18nService, useValue: i18nService },
+        { provide: LogService, useValue: logService },
         { provide: ToastService, useValue: toastService },
         { provide: ValidationService, useValue: validationService },
         {
-          provide: LoginApprovalComponentServiceAbstraction,
-          useValue: mock<LoginApprovalComponentServiceAbstraction>(),
+          provide: LoginApprovalDialogComponentServiceAbstraction,
+          useValue: mock<LoginApprovalDialogComponentServiceAbstraction>(),
         },
       ],
     }).compileComponents();
 
-    fixture = TestBed.createComponent(LoginApprovalComponent);
+    fixture = TestBed.createComponent(LoginApprovalDialogComponent);
     component = fixture.componentInstance;
   });
 
@@ -119,7 +119,6 @@ describe("LoginApprovalComponent", () => {
       expect(authRequestService.approveOrDenyAuthRequest).toHaveBeenCalledWith(false, response);
       expect(toastService.showToast).toHaveBeenCalledWith({
         variant: "info",
-        title: null,
         message: "denied message",
       });
     });
diff --git a/libs/auth/src/angular/login-approval/login-approval.component.ts b/libs/angular/src/auth/login-approval/login-approval-dialog.component.ts
similarity index 56%
rename from libs/auth/src/angular/login-approval/login-approval.component.ts
rename to libs/angular/src/auth/login-approval/login-approval-dialog.component.ts
index 285bdd0ddf0..19dc3f519c6 100644
--- a/libs/auth/src/angular/login-approval/login-approval.component.ts
+++ b/libs/angular/src/auth/login-approval/login-approval-dialog.component.ts
@@ -1,24 +1,18 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { CommonModule } from "@angular/common";
 import { Component, OnInit, OnDestroy, Inject } from "@angular/core";
-import { Subject, firstValueFrom, map } from "rxjs";
+import { firstValueFrom, map } from "rxjs";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
-import {
-  AuthRequestServiceAbstraction,
-  LoginApprovalComponentServiceAbstraction as LoginApprovalComponentService,
-} from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
-import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
 // 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 { AuthRequestServiceAbstraction } from "@bitwarden/auth/common";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
+import { AuthRequestResponse } from "@bitwarden/common/auth/models/response/auth-request.response";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
 import {
   DIALOG_DATA,
   DialogRef,
@@ -28,84 +22,100 @@ import {
   DialogService,
   ToastService,
 } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
+import { LogService } from "@bitwarden/logging";
 
-const RequestTimeOut = 60000 * 15; //15 Minutes
-const RequestTimeUpdate = 60000 * 5; //5 Minutes
+import { LoginApprovalDialogComponentServiceAbstraction } from "./login-approval-dialog-component.service.abstraction";
+
+const RequestTimeOut = 60000 * 15; // 15 Minutes
+const RequestTimeUpdate = 60000 * 5; // 5 Minutes
 
 export interface LoginApprovalDialogParams {
   notificationId: string;
 }
 
 @Component({
-  selector: "login-approval",
-  templateUrl: "login-approval.component.html",
-  imports: [CommonModule, AsyncActionsModule, ButtonModule, DialogModule, JslibModule],
+  templateUrl: "login-approval-dialog.component.html",
+  imports: [AsyncActionsModule, ButtonModule, CommonModule, DialogModule, JslibModule],
 })
-export class LoginApprovalComponent implements OnInit, OnDestroy {
+export class LoginApprovalDialogComponent implements OnInit, OnDestroy {
+  authRequestId: string;
+  authRequestResponse?: AuthRequestResponse;
+  email?: string;
+  fingerprintPhrase?: string;
+  interval?: NodeJS.Timeout;
   loading = true;
-
-  notificationId: string;
-
-  private destroy$ = new Subject<void>();
-
-  email: string;
-  fingerprintPhrase: string;
-  authRequestResponse: AuthRequestResponse;
-  interval: NodeJS.Timeout;
-  requestTimeText: string;
+  readableDeviceTypeName?: string;
+  requestTimeText?: string;
 
   constructor(
     @Inject(DIALOG_DATA) private params: LoginApprovalDialogParams,
-    protected authRequestService: AuthRequestServiceAbstraction,
-    protected accountService: AccountService,
-    protected platformUtilsService: PlatformUtilsService,
-    protected i18nService: I18nService,
-    protected apiService: ApiService,
-    protected appIdService: AppIdService,
-    protected keyService: KeyService,
+    private accountService: AccountService,
+    private apiService: ApiService,
+    private authRequestService: AuthRequestServiceAbstraction,
+    private devicesService: DevicesServiceAbstraction,
     private dialogRef: DialogRef,
+    private i18nService: I18nService,
+    private loginApprovalDialogComponentService: LoginApprovalDialogComponentServiceAbstraction,
+    private logService: LogService,
     private toastService: ToastService,
-    private loginApprovalComponentService: LoginApprovalComponentService,
     private validationService: ValidationService,
   ) {
-    this.notificationId = params.notificationId;
+    this.authRequestId = params.notificationId;
   }
 
   async ngOnDestroy(): Promise<void> {
     clearInterval(this.interval);
-    this.destroy$.next();
-    this.destroy$.complete();
   }
 
   async ngOnInit() {
-    if (this.notificationId != null) {
-      try {
-        this.authRequestResponse = await this.apiService.getAuthRequest(this.notificationId);
-      } catch (error) {
-        this.validationService.showError(error);
-      }
-
-      const publicKey = Utils.fromB64ToArray(this.authRequestResponse.publicKey);
-      this.email = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((a) => a?.email)),
-      );
-      this.fingerprintPhrase = await this.authRequestService.getFingerprintPhrase(
-        this.email,
-        publicKey,
-      );
-      this.updateTimeText();
-
-      this.interval = setInterval(() => {
-        this.updateTimeText();
-      }, RequestTimeUpdate);
-
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.loginApprovalComponentService.showLoginRequestedAlertIfWindowNotVisible(this.email);
-
-      this.loading = false;
+    if (this.authRequestId == null) {
+      this.logService.error("LoginApprovalDialogComponent: authRequestId is null");
+      return;
     }
+
+    try {
+      this.authRequestResponse = await this.apiService.getAuthRequest(this.authRequestId);
+    } catch (error) {
+      this.validationService.showError(error);
+      this.logService.error("LoginApprovalDialogComponent: getAuthRequest error", error);
+    }
+
+    if (this.authRequestResponse == null) {
+      this.logService.error("LoginApprovalDialogComponent: authRequestResponse not found");
+      return;
+    }
+
+    const publicKey = Utils.fromB64ToArray(this.authRequestResponse.publicKey);
+
+    this.email = await firstValueFrom(
+      this.accountService.activeAccount$.pipe(map((a) => a?.email)),
+    );
+
+    if (!this.email) {
+      this.logService.error("LoginApprovalDialogComponent: email not found");
+      return;
+    }
+
+    this.fingerprintPhrase = await this.authRequestService.getFingerprintPhrase(
+      this.email,
+      publicKey,
+    );
+
+    this.readableDeviceTypeName = this.devicesService.getReadableDeviceTypeName(
+      this.authRequestResponse.requestDeviceTypeValue,
+    );
+
+    this.updateTimeText();
+
+    this.interval = setInterval(() => {
+      this.updateTimeText();
+    }, RequestTimeUpdate);
+
+    await this.loginApprovalDialogComponentService.showLoginRequestedAlertIfWindowNotVisible(
+      this.email,
+    );
+
+    this.loading = false;
   }
 
   /**
@@ -114,7 +124,7 @@ export class LoginApprovalComponent implements OnInit, OnDestroy {
    * @param data Configuration for the dialog
    */
   static open(dialogService: DialogService, data: LoginApprovalDialogParams) {
-    return dialogService.open(LoginApprovalComponent, { data });
+    return dialogService.open(LoginApprovalDialogComponent, { data });
   }
 
   denyLogin = async () => {
@@ -126,11 +136,10 @@ export class LoginApprovalComponent implements OnInit, OnDestroy {
   };
 
   private async retrieveAuthRequestAndRespond(approve: boolean) {
-    this.authRequestResponse = await this.apiService.getAuthRequest(this.notificationId);
+    this.authRequestResponse = await this.apiService.getAuthRequest(this.authRequestId);
     if (this.authRequestResponse.requestApproved || this.authRequestResponse.responseDate != null) {
       this.toastService.showToast({
         variant: "info",
-        title: null,
         message: this.i18nService.t("thisRequestIsNoLongerValid"),
       });
     } else {
@@ -148,23 +157,26 @@ export class LoginApprovalComponent implements OnInit, OnDestroy {
     if (loginResponse.requestApproved) {
       this.toastService.showToast({
         variant: "success",
-        title: null,
         message: this.i18nService.t(
-          "logInConfirmedForEmailOnDevice",
+          "loginRequestApprovedForEmailOnDevice",
           this.email,
-          loginResponse.requestDeviceType,
+          this.devicesService.getReadableDeviceTypeName(loginResponse.requestDeviceTypeValue),
         ),
       });
     } else {
       this.toastService.showToast({
         variant: "info",
-        title: null,
-        message: this.i18nService.t("youDeniedALogInAttemptFromAnotherDevice"),
+        message: this.i18nService.t("youDeniedLoginAttemptFromAnotherDevice"),
       });
     }
   }
 
   updateTimeText() {
+    if (this.authRequestResponse == null) {
+      this.logService.error("LoginApprovalDialogComponent: authRequestResponse not found");
+      return;
+    }
+
     const requestDate = new Date(this.authRequestResponse.creationDate);
     const requestDateUTC = Date.UTC(
       requestDate.getUTCFullYear(),
@@ -201,7 +213,6 @@ export class LoginApprovalComponent implements OnInit, OnDestroy {
       this.dialogRef.close();
       this.toastService.showToast({
         variant: "info",
-        title: null,
         message: this.i18nService.t("loginRequestHasAlreadyExpired"),
       });
     }
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 2eda60984b4..0a64c3a90cf 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -18,7 +18,6 @@ import {
 // 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 {
-  DefaultLoginApprovalComponentService,
   DefaultLoginComponentService,
   DefaultLoginDecryptionOptionsService,
   DefaultRegistrationFinishService,
@@ -40,7 +39,6 @@ import {
   DefaultLoginSuccessHandlerService,
   DefaultLogoutService,
   InternalUserDecryptionOptionsServiceAbstraction,
-  LoginApprovalComponentServiceAbstraction,
   LoginEmailService,
   LoginEmailServiceAbstraction,
   LoginStrategyService,
@@ -345,6 +343,8 @@ import {
   VaultExportServiceAbstraction,
 } from "@bitwarden/vault-export-core";
 
+import { DefaultLoginApprovalDialogComponentService } from "../auth/login-approval/default-login-approval-dialog-component.service";
+import { LoginApprovalDialogComponentServiceAbstraction } from "../auth/login-approval/login-approval-dialog-component.service.abstraction";
 import { DefaultSetInitialPasswordService } from "../auth/password-management/set-initial-password/default-set-initial-password.service.implementation";
 import { SetInitialPasswordService } from "../auth/password-management/set-initial-password/set-initial-password.service.abstraction";
 import { DeviceTrustToastService as DeviceTrustToastServiceAbstraction } from "../auth/services/device-trust-toast.service.abstraction";
@@ -539,6 +539,7 @@ const safeProviders: SafeProvider[] = [
       accountService: AccountServiceAbstraction,
       logService: LogService,
       cipherEncryptionService: CipherEncryptionService,
+      messagingService: MessagingServiceAbstraction,
     ) =>
       new CipherService(
         keyService,
@@ -555,6 +556,7 @@ const safeProviders: SafeProvider[] = [
         accountService,
         logService,
         cipherEncryptionService,
+        messagingService,
       ),
     deps: [
       KeyService,
@@ -571,6 +573,7 @@ const safeProviders: SafeProvider[] = [
       AccountServiceAbstraction,
       LogService,
       CipherEncryptionService,
+      MessagingServiceAbstraction,
     ],
   }),
   safeProvider({
@@ -1501,8 +1504,8 @@ const safeProviders: SafeProvider[] = [
     deps: [CryptoFunctionServiceAbstraction],
   }),
   safeProvider({
-    provide: LoginApprovalComponentServiceAbstraction,
-    useClass: DefaultLoginApprovalComponentService,
+    provide: LoginApprovalDialogComponentServiceAbstraction,
+    useClass: DefaultLoginApprovalDialogComponentService,
     deps: [],
   }),
   safeProvider({
diff --git a/libs/angular/src/vault/components/spotlight/spotlight.component.html b/libs/angular/src/vault/components/spotlight/spotlight.component.html
index 29d13d2056c..e445640cff9 100644
--- a/libs/angular/src/vault/components/spotlight/spotlight.component.html
+++ b/libs/angular/src/vault/components/spotlight/spotlight.component.html
@@ -1,5 +1,5 @@
 <div
-  class="tw-rounded-2xl tw-bg-primary-100 tw-border-primary-600 tw-border-solid tw-border tw-p-4 tw-pt-3 tw-flex tw-flex-col tw-gap-2 tw-mb-4"
+  class="tw-rounded-2xl tw-bg-primary-100 tw-border-primary-600 tw-border-solid tw-border tw-p-4 tw-pt-2 tw-flex tw-flex-col tw-gap-2 tw-mb-4"
 >
   <div class="tw-flex tw-justify-between tw-items-start tw-flex-grow">
     <div>
@@ -20,6 +20,7 @@
       (click)="handleDismiss()"
       [attr.title]="'close' | i18n"
       [attr.aria-label]="'close' | i18n"
+      class="-tw-me-2"
     ></button>
   </div>
 
diff --git a/libs/angular/src/vault/services/custom-nudges-services/empty-vault-nudge.service.ts b/libs/angular/src/vault/services/custom-nudges-services/empty-vault-nudge.service.ts
index 57df2d03398..d0dfd44e41d 100644
--- a/libs/angular/src/vault/services/custom-nudges-services/empty-vault-nudge.service.ts
+++ b/libs/angular/src/vault/services/custom-nudges-services/empty-vault-nudge.service.ts
@@ -5,7 +5,7 @@ import { combineLatest, Observable, of, switchMap } from "rxjs";
 // eslint-disable-next-line no-restricted-imports
 import { CollectionService } from "@bitwarden/admin-console/common";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { UserId } from "@bitwarden/common/types/guid";
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
 import { DefaultSingleNudgeService } from "../default-single-nudge.service";
@@ -42,7 +42,7 @@ export class EmptyVaultNudgeService extends DefaultSingleNudgeService {
         const orgIds = new Set(orgs.map((org) => org.id));
         const canCreateCollections = orgs.some((org) => org.canCreateNewCollections);
         const hasManageCollections = collections.some(
-          (c) => c.manage && orgIds.has(c.organizationId!),
+          (c) => c.manage && orgIds.has(c.organizationId! as OrganizationId),
         );
 
         // When the user has dismissed the nudge or spotlight, return the nudge status directly
diff --git a/libs/angular/src/vault/services/custom-nudges-services/vault-settings-import-nudge.service.ts b/libs/angular/src/vault/services/custom-nudges-services/vault-settings-import-nudge.service.ts
index 2529fc40b73..a8f29830f89 100644
--- a/libs/angular/src/vault/services/custom-nudges-services/vault-settings-import-nudge.service.ts
+++ b/libs/angular/src/vault/services/custom-nudges-services/vault-settings-import-nudge.service.ts
@@ -5,7 +5,7 @@ import { combineLatest, Observable, of, switchMap } from "rxjs";
 // eslint-disable-next-line no-restricted-imports
 import { CollectionService } from "@bitwarden/admin-console/common";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
-import { UserId } from "@bitwarden/common/types/guid";
+import { OrganizationId, UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
 import { DefaultSingleNudgeService } from "../default-single-nudge.service";
@@ -46,7 +46,7 @@ export class VaultSettingsImportNudgeService extends DefaultSingleNudgeService {
         const orgIds = new Set(orgs.map((org) => org.id));
         const canCreateCollections = orgs.some((org) => org.canCreateNewCollections);
         const hasManageCollections = collections.some(
-          (c) => c.manage && orgIds.has(c.organizationId!),
+          (c) => c.manage && orgIds.has(c.organizationId! as OrganizationId),
         );
 
         // When the user has dismissed the nudge or spotlight, return the nudge status directly
diff --git a/libs/auth/src/angular/index.ts b/libs/auth/src/angular/index.ts
index 3e8dc575c7b..f8e93932511 100644
--- a/libs/auth/src/angular/index.ts
+++ b/libs/auth/src/angular/index.ts
@@ -57,10 +57,6 @@ export * from "./sso/default-sso-component.service";
 // self hosted environment configuration dialog
 export * from "./self-hosted-env-config-dialog/self-hosted-env-config-dialog.component";
 
-// login approval
-export * from "./login-approval/login-approval.component";
-export * from "./login-approval/default-login-approval-component.service";
-
 // two factor auth
 export * from "./two-factor-auth";
 
diff --git a/libs/auth/src/angular/login-approval/default-login-approval-component.service.spec.ts b/libs/auth/src/angular/login-approval/default-login-approval-component.service.spec.ts
deleted file mode 100644
index ec274fac8bc..00000000000
--- a/libs/auth/src/angular/login-approval/default-login-approval-component.service.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { TestBed } from "@angular/core/testing";
-
-import { DefaultLoginApprovalComponentService } from "./default-login-approval-component.service";
-import { LoginApprovalComponent } from "./login-approval.component";
-
-describe("DefaultLoginApprovalComponentService", () => {
-  let service: DefaultLoginApprovalComponentService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [DefaultLoginApprovalComponentService],
-    });
-
-    service = TestBed.inject(DefaultLoginApprovalComponentService);
-  });
-
-  it("is created successfully", () => {
-    expect(service).toBeTruthy();
-  });
-
-  it("has showLoginRequestedAlertIfWindowNotVisible method that is a no-op", async () => {
-    const loginApprovalComponent = {} as LoginApprovalComponent;
-    await service.showLoginRequestedAlertIfWindowNotVisible(loginApprovalComponent.email);
-  });
-});
diff --git a/libs/auth/src/angular/login-approval/default-login-approval-component.service.ts b/libs/auth/src/angular/login-approval/default-login-approval-component.service.ts
deleted file mode 100644
index 8b0463be6c1..00000000000
--- a/libs/auth/src/angular/login-approval/default-login-approval-component.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { LoginApprovalComponentServiceAbstraction } from "../../common/abstractions/login-approval-component.service.abstraction";
-
-/**
- * Default implementation of the LoginApprovalComponentServiceAbstraction.
- */
-export class DefaultLoginApprovalComponentService
-  implements LoginApprovalComponentServiceAbstraction
-{
-  /**
-   * No-op implementation of the showLoginRequestedAlertIfWindowNotVisible method.
-   * @returns
-   */
-  async showLoginRequestedAlertIfWindowNotVisible(email?: string): Promise<void> {
-    return;
-  }
-}
diff --git a/libs/auth/src/common/abstractions/index.ts b/libs/auth/src/common/abstractions/index.ts
index 6961a029e7d..b0471f79356 100644
--- a/libs/auth/src/common/abstractions/index.ts
+++ b/libs/auth/src/common/abstractions/index.ts
@@ -3,6 +3,5 @@ export * from "./login-email.service";
 export * from "./login-strategy.service";
 export * from "./user-decryption-options.service.abstraction";
 export * from "./auth-request.service.abstraction";
-export * from "./login-approval-component.service.abstraction";
 export * from "./login-success-handler.service";
 export * from "./logout.service";
diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts
index f8de5293913..130b32e519e 100644
--- a/libs/common/src/admin-console/models/domain/organization.ts
+++ b/libs/common/src/admin-console/models/domain/organization.ts
@@ -3,12 +3,13 @@
 import { Jsonify } from "type-fest";
 
 import { ProductTierType } from "../../../billing/enums";
+import { OrganizationId } from "../../../types/guid";
 import { OrganizationUserStatusType, OrganizationUserType, ProviderType } from "../../enums";
 import { PermissionsApi } from "../api/permissions.api";
 import { OrganizationData } from "../data/organization.data";
 
 export class Organization {
-  id: string;
+  id: OrganizationId;
   name: string;
   status: OrganizationUserStatusType;
 
@@ -99,7 +100,7 @@ export class Organization {
       return;
     }
 
-    this.id = obj.id;
+    this.id = obj.id as OrganizationId;
     this.name = obj.name;
     this.status = obj.status;
     this.type = obj.type;
diff --git a/libs/common/src/admin-console/models/domain/policy.ts b/libs/common/src/admin-console/models/domain/policy.ts
index b45acb9920d..8408f4832df 100644
--- a/libs/common/src/admin-console/models/domain/policy.ts
+++ b/libs/common/src/admin-console/models/domain/policy.ts
@@ -2,14 +2,14 @@
 // @ts-strict-ignore
 import { ListResponse } from "../../../models/response/list.response";
 import Domain from "../../../platform/models/domain/domain-base";
-import { PolicyId } from "../../../types/guid";
+import { OrganizationId, PolicyId } from "../../../types/guid";
 import { PolicyType } from "../../enums";
 import { PolicyData } from "../data/policy.data";
 import { PolicyResponse } from "../response/policy.response";
 
 export class Policy extends Domain {
   id: PolicyId;
-  organizationId: string;
+  organizationId: OrganizationId;
   type: PolicyType;
   data: any;
 
@@ -26,7 +26,7 @@ export class Policy extends Domain {
     }
 
     this.id = obj.id;
-    this.organizationId = obj.organizationId;
+    this.organizationId = obj.organizationId as OrganizationId;
     this.type = obj.type;
     this.data = obj.data;
     this.enabled = obj.enabled;
diff --git a/libs/common/src/admin-console/models/request/policy.request.ts b/libs/common/src/admin-console/models/request/policy.request.ts
index 0f3b1be7d88..7b2e4f76063 100644
--- a/libs/common/src/admin-console/models/request/policy.request.ts
+++ b/libs/common/src/admin-console/models/request/policy.request.ts
@@ -1,9 +1,7 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import { PolicyType } from "../../enums";
 
-export class PolicyRequest {
+export type PolicyRequest = {
   type: PolicyType;
   enabled: boolean;
   data: any;
-}
+};
diff --git a/libs/common/src/models/export/collection-with-id.export.ts b/libs/common/src/models/export/collection-with-id.export.ts
index a93f07b54e5..c973472e0bb 100644
--- a/libs/common/src/models/export/collection-with-id.export.ts
+++ b/libs/common/src/models/export/collection-with-id.export.ts
@@ -4,10 +4,12 @@
 // eslint-disable-next-line no-restricted-imports
 import { Collection as CollectionDomain, CollectionView } from "@bitwarden/admin-console/common";
 
+import { CollectionId } from "../../types/guid";
+
 import { CollectionExport } from "./collection.export";
 
 export class CollectionWithIdExport extends CollectionExport {
-  id: string;
+  id: CollectionId;
 
   static toView(req: CollectionWithIdExport, view = new CollectionView()) {
     view.id = req.id;
diff --git a/libs/common/src/models/export/collection.export.ts b/libs/common/src/models/export/collection.export.ts
index 88b68c08c58..b141346d03f 100644
--- a/libs/common/src/models/export/collection.export.ts
+++ b/libs/common/src/models/export/collection.export.ts
@@ -5,13 +5,14 @@
 import { Collection as CollectionDomain, CollectionView } from "@bitwarden/admin-console/common";
 
 import { EncString } from "../../key-management/crypto/models/enc-string";
+import { emptyGuid, OrganizationId } from "../../types/guid";
 
 import { safeGetString } from "./utils";
 
 export class CollectionExport {
   static template(): CollectionExport {
     const req = new CollectionExport();
-    req.organizationId = "00000000-0000-0000-0000-000000000000";
+    req.organizationId = emptyGuid as OrganizationId;
     req.name = "Collection name";
     req.externalId = null;
     return req;
@@ -35,7 +36,7 @@ export class CollectionExport {
     return domain;
   }
 
-  organizationId: string;
+  organizationId: OrganizationId;
   name: string;
   externalId: string;
 
diff --git a/libs/common/src/types/guid.ts b/libs/common/src/types/guid.ts
index bd0980cd36c..5a6aaf2ce51 100644
--- a/libs/common/src/types/guid.ts
+++ b/libs/common/src/types/guid.ts
@@ -20,3 +20,8 @@ export type OrganizationIntegrationConfigurationId = Opaque<
   string,
   "OrganizationIntegrationConfigurationId"
 >;
+
+/**
+ * A string representation of an empty guid.
+ */
+export const emptyGuid = "00000000-0000-0000-0000-000000000000";
diff --git a/libs/common/src/vault/services/cipher.service.spec.ts b/libs/common/src/vault/services/cipher.service.spec.ts
index 996de182f6e..be72d618dee 100644
--- a/libs/common/src/vault/services/cipher.service.spec.ts
+++ b/libs/common/src/vault/services/cipher.service.spec.ts
@@ -1,5 +1,5 @@
 import { mock } from "jest-mock-extended";
-import { BehaviorSubject, map, of } from "rxjs";
+import { BehaviorSubject, filter, firstValueFrom, map, of } from "rxjs";
 
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -7,6 +7,7 @@ import { CipherResponse } from "@bitwarden/common/vault/models/response/cipher.r
 // 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 { CipherDecryptionKeys, KeyService } from "@bitwarden/key-management";
+import { MessageSender } from "@bitwarden/messaging";
 
 import { FakeAccountService, mockAccountServiceWith } from "../../../spec/fake-account-service";
 import { FakeStateProvider } from "../../../spec/fake-state-provider";
@@ -106,6 +107,7 @@ describe("Cipher Service", () => {
   const logService = mock<LogService>();
   const stateProvider = new FakeStateProvider(accountService);
   const cipherEncryptionService = mock<CipherEncryptionService>();
+  const messageSender = mock<MessageSender>();
 
   const userId = "TestUserId" as UserId;
   const orgId = "4ff8c0b2-1d3e-4f8c-9b2d-1d3e4f8c0b2" as OrganizationId;
@@ -134,6 +136,7 @@ describe("Cipher Service", () => {
       accountService,
       logService,
       cipherEncryptionService,
+      messageSender,
     );
 
     encryptionContext = { cipher: new Cipher(cipherData), encryptedFor: userId };
@@ -551,6 +554,23 @@ describe("Cipher Service", () => {
         newUserKey,
       );
     });
+
+    it("sends overlay update when cipherViews$ emits", async () => {
+      (cipherService.cipherViews$ as jest.Mock)?.mockRestore();
+
+      const decryptedView = new CipherView(encryptionContext.cipher);
+      jest.spyOn(cipherService, "getAllDecrypted").mockResolvedValue([decryptedView]);
+
+      const sendSpy = jest.spyOn(messageSender, "send");
+
+      await firstValueFrom(
+        cipherService
+          .cipherViews$(mockUserId)
+          .pipe(filter((cipherViews): cipherViews is CipherView[] => cipherViews != null)),
+      );
+      expect(sendSpy).toHaveBeenCalledWith("updateOverlayCiphers");
+      expect(sendSpy).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe("decrypt", () => {
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index 596483c19ec..ba986dcc763 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -1,9 +1,19 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { combineLatest, filter, firstValueFrom, map, Observable, Subject, switchMap } from "rxjs";
+import {
+  combineLatest,
+  filter,
+  firstValueFrom,
+  map,
+  Observable,
+  Subject,
+  switchMap,
+  tap,
+} from "rxjs";
 import { SemVer } from "semver";
 
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { MessageSender } from "@bitwarden/common/platform/messaging";
 // 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 { KeyService } from "@bitwarden/key-management";
@@ -109,6 +119,7 @@ export class CipherService implements CipherServiceAbstraction {
     private accountService: AccountService,
     private logService: LogService,
     private cipherEncryptionService: CipherEncryptionService,
+    private messageSender: MessageSender,
   ) {}
 
   localData$(userId: UserId): Observable<Record<CipherId, LocalData>> {
@@ -174,6 +185,10 @@ 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);
+        this.messageSender.send("updateOverlayCiphers");
+      }),
     );
   }, this.clearCipherViewsForUser$);
 
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 34fdc5b60fc..4b570df9814 100644
--- a/libs/components/src/anon-layout/anon-layout-wrapper.component.ts
+++ b/libs/components/src/anon-layout/anon-layout-wrapper.component.ts
@@ -157,6 +157,14 @@ export class AnonLayoutWrapperComponent implements OnInit {
       this.hideCardWrapper = data.hideCardWrapper;
     }
 
+    if (data.hideIcon !== undefined) {
+      this.hideIcon = data.hideIcon;
+    }
+
+    if (data.maxWidth !== undefined) {
+      this.maxWidth = data.maxWidth;
+    }
+
     // Manually fire change detection to avoid ExpressionChangedAfterItHasBeenCheckedError
     // when setting the page data from a service
     this.changeDetectorRef.detectChanges();
diff --git a/libs/components/src/async-actions/in-forms.stories.ts b/libs/components/src/async-actions/in-forms.stories.ts
index 7f51a8bdad2..dd901cd2477 100644
--- a/libs/components/src/async-actions/in-forms.stories.ts
+++ b/libs/components/src/async-actions/in-forms.stories.ts
@@ -35,7 +35,7 @@ const template = `
     <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="secondary" bitIconButton="bwi-star" bitFormButton [bitAction]="delete">Delete</button>
+    <button class="tw-me-2" type="button" buttonType="muted" bitIconButton="bwi-star" bitFormButton [bitAction]="delete">Delete</button>
   </form>`;
 
 @Component({
diff --git a/libs/components/src/banner/banner.component.html b/libs/components/src/banner/banner.component.html
index 63b1126104c..581a56d86cb 100644
--- a/libs/components/src/banner/banner.component.html
+++ b/libs/components/src/banner/banner.component.html
@@ -1,5 +1,5 @@
 <div
-  class="tw-flex tw-items-center tw-gap-2 tw-p-2 tw-ps-4 tw-text-main tw-border-transparent tw-bg-clip-padding tw-border-solid tw-border-b tw-border-0"
+  class="tw-flex tw-items-center tw-gap-4 tw-p-2 tw-ps-4 tw-text-main tw-border-transparent tw-bg-clip-padding tw-border-solid tw-border-b tw-border-0"
   [ngClass]="bannerClass"
   [attr.role]="useAlertRole() ? 'status' : null"
   [attr.aria-live]="useAlertRole() ? 'polite' : null"
@@ -14,11 +14,10 @@
   <!-- Overriding hover and focus-visible colors for a11y against colored background -->
   @if (showClose()) {
     <button
-      class="hover:tw-border-text-main focus-visible:before:tw-ring-text-main"
       type="button"
       bitIconButton="bwi-close"
       buttonType="main"
-      size="default"
+      size="small"
       (click)="onClose.emit()"
       [attr.title]="'close' | i18n"
       [attr.aria-label]="'close' | i18n"
diff --git a/libs/components/src/chip-select/chip-select.component.html b/libs/components/src/chip-select/chip-select.component.html
index 61dbc36e48b..d43e09e8338 100644
--- a/libs/components/src/chip-select/chip-select.component.html
+++ b/libs/components/src/chip-select/chip-select.component.html
@@ -46,7 +46,7 @@
       type="button"
       [attr.aria-label]="'removeItem' | i18n: label"
       [disabled]="disabled"
-      class="tw-bg-transparent hover:tw-bg-transparent tw-outline-none tw-rounded-full tw-py-0.5 tw-px-1 tw-me-1 tw-text-[color:inherit] tw-text-[length:inherit] tw-border-solid tw-border tw-border-transparent hover:tw-border-text-contrast hover:disabled:tw-border-transparent tw-flex tw-items-center tw-justify-center focus-visible:tw-ring-2 tw-ring-text-contrast focus-visible:hover:tw-border-transparent"
+      class="tw-bg-transparent hover:tw-bg-hover-contrast tw-outline-none tw-rounded-full tw-py-0.5 tw-px-1 tw-me-1 tw-text-[color:inherit] tw-text-[length:inherit] tw-border-solid tw-border tw-border-transparent tw-flex tw-items-center tw-justify-center focus-visible:tw-ring-2 tw-ring-text-contrast hover:disabled:tw-bg-transparent"
       [ngClass]="{
         'tw-cursor-not-allowed': disabled,
       }"
diff --git a/libs/components/src/color-password/color-password.component.ts b/libs/components/src/color-password/color-password.component.ts
index fb6f6568101..3a35eaab333 100644
--- a/libs/components/src/color-password/color-password.component.ts
+++ b/libs/components/src/color-password/color-password.component.ts
@@ -2,14 +2,8 @@ import { Component, computed, HostBinding, input } from "@angular/core";
 
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 
-// FIXME: update to use a const object instead of a typescript enum
-// eslint-disable-next-line @bitwarden/platform/no-enums
-enum CharacterType {
-  Letter,
-  Emoji,
-  Special,
-  Number,
-}
+type CharacterType = "letter" | "emoji" | "special" | "number";
+
 /**
  * The color password is used primarily in the Generator pages and in the Login type form. It includes
  * the logic for displaying letters as `text-main`, numbers as `primary`, and special symbols as
@@ -36,15 +30,15 @@ export class ColorPasswordComponent {
   });
 
   characterStyles: Record<CharacterType, string[]> = {
-    [CharacterType.Emoji]: [],
-    [CharacterType.Letter]: ["tw-text-main"],
-    [CharacterType.Special]: ["tw-text-danger"],
-    [CharacterType.Number]: ["tw-text-primary-600"],
+    emoji: [],
+    letter: ["tw-text-main"],
+    special: ["tw-text-danger"],
+    number: ["tw-text-primary-600"],
   };
 
   @HostBinding("class")
   get classList() {
-    return ["tw-min-w-0", "tw-whitespace-pre-wrap", "tw-break-all"];
+    return ["tw-min-w-0", "tw-whitespace-pre-wrap", "tw-break-words"];
   }
 
   getCharacterClass(character: string) {
@@ -68,18 +62,18 @@ export class ColorPasswordComponent {
 
   private getCharacterType(character: string): CharacterType {
     if (character.match(Utils.regexpEmojiPresentation)) {
-      return CharacterType.Emoji;
+      return "emoji";
     }
 
     if (character.match(/\d/)) {
-      return CharacterType.Number;
+      return "number";
     }
 
     const specials = ["&", "<", ">", " "];
     if (specials.includes(character) || character.match(/[^\w ]/)) {
-      return CharacterType.Special;
+      return "special";
     }
 
-    return CharacterType.Letter;
+    return "letter";
   }
 }
diff --git a/libs/components/src/dialog/dialog.service.stories.ts b/libs/components/src/dialog/dialog.service.stories.ts
index c7b8f0ae916..5a002f7ee7e 100644
--- a/libs/components/src/dialog/dialog.service.stories.ts
+++ b/libs/components/src/dialog/dialog.service.stories.ts
@@ -93,7 +93,10 @@ class StoryDialogContentComponent {
 
 @Component({
   template: `
-    <bit-dialog title="Dialog Title" dialogSize="large">
+    <bit-dialog
+      title="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore"
+      dialogSize="large"
+    >
       <span bitDialogContent>
         Dialog body text goes here.
         <br />
diff --git a/libs/components/src/dialog/dialog/dialog.component.html b/libs/components/src/dialog/dialog/dialog.component.html
index 0dc3c2eef57..5ae5a9b60e8 100644
--- a/libs/components/src/dialog/dialog/dialog.component.html
+++ b/libs/components/src/dialog/dialog/dialog.component.html
@@ -10,8 +10,8 @@
   <header
     class="tw-flex tw-justify-between tw-items-center tw-gap-4 tw-border-0 tw-border-b tw-border-solid"
     [ngClass]="{
-      'tw-p-4': !isDrawer,
-      'tw-p-6 tw-pb-4': isDrawer,
+      'tw-p-4 has-[[biticonbutton]]:tw-pe-2': !isDrawer,
+      'tw-px-6 tw-py-4 has-[[biticonbutton]]:tw-pe-4': isDrawer,
       'tw-border-secondary-300': showHeaderBorder,
       'tw-border-transparent': !showHeaderBorder,
     }"
@@ -75,7 +75,7 @@
     [ngClass]="[isDrawer ? 'tw-px-6 tw-py-4' : 'tw-p-4']"
     [ngClass]="{
       'tw-px-6 tw-py-4': isDrawer,
-      'tw-p-4': !isDrawer,
+      'tw-p-4 has-[[biticonbutton]]:tw-pe-2': !isDrawer,
       'tw-border-secondary-300': showFooterBorder,
       'tw-border-transparent': !showFooterBorder,
     }"
diff --git a/libs/components/src/drawer/drawer-header.component.html b/libs/components/src/drawer/drawer-header.component.html
index 4652e5537ee..863b19edfb2 100644
--- a/libs/components/src/drawer/drawer-header.component.html
+++ b/libs/components/src/drawer/drawer-header.component.html
@@ -1,5 +1,5 @@
-<header class="tw-flex tw-justify-between tw-items-center">
-  <div class="tw-flex tw-items-center tw-gap-1 tw-overflow-auto">
+<header class="tw-flex tw-justify-between tw-items-center tw-gap-4">
+  <div class="tw-flex tw-items-center tw-gap-4 tw-overflow-auto">
     <ng-content select="[slot=start]"></ng-content>
     <h2 bitTypography="h3" noMargin class="tw-text-main tw-mb-0 tw-truncate" [attr.title]="title()">
       {{ title() }}
diff --git a/libs/components/src/form-field/form-field.component.html b/libs/components/src/form-field/form-field.component.html
index c4fd018b3ba..37a4cfdf66c 100644
--- a/libs/components/src/form-field/form-field.component.html
+++ b/libs/components/src/form-field/form-field.component.html
@@ -50,13 +50,13 @@
     >
       <div
         #prefixContainer
-        class="tw-flex tw-items-center tw-gap-1 tw-ps-3 tw-py-2"
+        class="tw-flex tw-items-center tw-gap-1 tw-ps-3 has-[[biticonbutton]]:tw-ps-1 tw-py-1"
         [hidden]="!prefixHasChildren()"
       >
         <ng-container *ngTemplateOutlet="prefixContent"></ng-container>
       </div>
       <div
-        class="tw-w-full tw-relative tw-py-2 has-[bit-select]:tw-p-0 has-[bit-multi-select]:tw-p-0 has-[input:read-only:not([hidden])]:tw-bg-secondary-100 has-[textarea:read-only:not([hidden])]:tw-bg-secondary-100"
+        class="tw-w-full tw-relative tw-py-1 has-[bit-select]:tw-p-0 has-[bit-multi-select]:tw-p-0 has-[input:read-only:not([hidden])]:tw-bg-secondary-100 has-[textarea:read-only:not([hidden])]:tw-bg-secondary-100"
         data-default-content
         [ngClass]="[
           prefixHasChildren() ? '' : 'tw-rounded-s-lg tw-ps-3',
@@ -67,7 +67,7 @@
       </div>
       <div
         #suffixContainer
-        class="tw-flex tw-items-center tw-gap-1 tw-pe-3 tw-py-2"
+        class="tw-flex tw-items-center tw-pe-3 has-[[biticonbutton]]:tw-pe-1 tw-py-1"
         [hidden]="!suffixHasChildren()"
       >
         <ng-container *ngTemplateOutlet="suffixContent"></ng-container>
@@ -102,11 +102,7 @@
       >
         <ng-container *ngTemplateOutlet="defaultContent"></ng-container>
       </div>
-      <div
-        #suffixContainer
-        [hidden]="!suffixHasChildren()"
-        class="tw-flex tw-items-center tw-gap-1 tw-pe-1"
-      >
+      <div #suffixContainer [hidden]="!suffixHasChildren()" class="tw-flex tw-items-center tw-pe-1">
         <ng-container *ngTemplateOutlet="suffixContent"></ng-container>
       </div>
     </div>
diff --git a/libs/components/src/form-field/form-field.stories.ts b/libs/components/src/form-field/form-field.stories.ts
index 5b92ab5dbd3..fc6d29c11ad 100644
--- a/libs/components/src/form-field/form-field.stories.ts
+++ b/libs/components/src/form-field/form-field.stories.ts
@@ -350,9 +350,7 @@ export const ButtonInputGroup: Story = {
         <input bitInput placeholder="Placeholder" />
         <button bitSuffix bitIconButton="bwi-eye" [appA11yTitle]="'Hide Label'"></button>
         <button bitSuffix bitIconButton="bwi-clone" [appA11yTitle]="'Clone Label'"></button>
-        <button bitSuffix bitLink>
-          Apply
-        </button>
+        <button bitSuffix bitIconButton="bwi-ellipsis-v" [appA11yTitle]="'Menu Label'"></button>
       </bit-form-field>
     `,
   }),
@@ -369,9 +367,8 @@ export const DisabledButtonInputGroup: Story = {
         <input bitInput placeholder="Placeholder" disabled />
         <button bitSuffix bitIconButton="bwi-eye" disabled [appA11yTitle]="'Hide Label'"></button>
         <button bitSuffix bitIconButton="bwi-clone" disabled [appA11yTitle]="'Clone Label'"></button>
-        <button bitSuffix bitLink disabled>
-          Apply
-        </button>
+        <button bitSuffix bitIconButton="bwi-ellipsis-v" disabled [appA11yTitle]="'Menu Label'"></button>
+
       </bit-form-field>
     `,
   }),
@@ -387,9 +384,7 @@ export const PartiallyDisabledButtonInputGroup: Story = {
         <input bitInput placeholder="Placeholder" disabled />
         <button bitSuffix bitIconButton="bwi-eye" [appA11yTitle]="'Hide Label'"></button>
         <button bitSuffix bitIconButton="bwi-clone" [appA11yTitle]="'Clone Label'"></button>
-        <button bitSuffix bitLink disabled>
-          Apply
-        </button>
+        <button bitSuffix bitIconButton="bwi-ellipsis-v" disabled [appA11yTitle]="'Menu Label'"></button>
       </bit-form-field>
     `,
   }),
diff --git a/libs/components/src/icon-button/icon-button.component.html b/libs/components/src/icon-button/icon-button.component.html
index ad8e32dec75..e775a868871 100644
--- a/libs/components/src/icon-button/icon-button.component.html
+++ b/libs/components/src/icon-button/icon-button.component.html
@@ -1,5 +1,5 @@
-<span class="tw-relative">
-  <span [ngClass]="{ 'tw-invisible': showLoadingStyle() }">
+<span class="tw-relative tw-inline-block tw-leading-[0px]">
+  <span class="tw-inline-block tw-leading-[0px]" [ngClass]="{ 'tw-invisible': showLoadingStyle() }">
     <i class="bwi" [ngClass]="iconClass" aria-hidden="true"></i>
   </span>
   <span
diff --git a/libs/components/src/icon-button/icon-button.component.ts b/libs/components/src/icon-button/icon-button.component.ts
index f71faccb1e7..db1f1f40192 100644
--- a/libs/components/src/icon-button/icon-button.component.ts
+++ b/libs/components/src/icon-button/icon-button.component.ts
@@ -5,10 +5,10 @@ import { Component, computed, ElementRef, HostBinding, input, model } from "@ang
 import { toObservable, toSignal } from "@angular/core/rxjs-interop";
 import { debounce, interval } from "rxjs";
 
-import { ButtonLikeAbstraction, ButtonType } from "../shared/button-like.abstraction";
+import { ButtonLikeAbstraction } from "../shared/button-like.abstraction";
 import { FocusableElement } from "../shared/focusable-element";
 
-export type IconButtonType = ButtonType | "contrast" | "main" | "muted" | "light";
+export type IconButtonType = "primary" | "danger" | "contrast" | "main" | "muted" | "nav-contrast";
 
 const focusRing = [
   // Workaround for box-shadow with transparent offset issue:
@@ -20,7 +20,7 @@ const focusRing = [
   "before:tw-content-['']",
   "before:tw-block",
   "before:tw-absolute",
-  "before:-tw-inset-[2px]",
+  "before:-tw-inset-[1px]",
   "before:tw-rounded-lg",
   "before:tw-transition",
   "before:tw-ring-2",
@@ -30,122 +30,38 @@ const focusRing = [
 
 const styles: Record<IconButtonType, string[]> = {
   contrast: [
-    "tw-bg-transparent",
     "!tw-text-contrast",
     "tw-border-transparent",
-    "hover:tw-bg-transparent-hover",
-    "hover:tw-border-text-contrast",
+    "hover:!tw-bg-hover-contrast",
     "focus-visible:before:tw-ring-text-contrast",
     ...focusRing,
   ],
-  main: [
-    "tw-bg-transparent",
-    "!tw-text-main",
-    "tw-border-transparent",
-    "hover:tw-bg-transparent-hover",
-    "hover:tw-border-primary-600",
-    "focus-visible:before:tw-ring-primary-600",
-    ...focusRing,
-  ],
+  main: ["!tw-text-main", "focus-visible:before:tw-ring-primary-600", ...focusRing],
   muted: [
-    "tw-bg-transparent",
     "!tw-text-muted",
     "tw-border-transparent",
     "aria-expanded:tw-bg-text-muted",
     "aria-expanded:!tw-text-contrast",
-    "hover:tw-bg-transparent-hover",
-    "hover:tw-border-primary-600",
     "focus-visible:before:tw-ring-primary-600",
     "aria-expanded:hover:tw-bg-secondary-700",
     "aria-expanded:hover:tw-border-secondary-700",
     ...focusRing,
   ],
-  primary: [
-    "tw-bg-primary-600",
-    "!tw-text-contrast",
-    "tw-border-primary-600",
-    "hover:tw-bg-primary-600",
-    "hover:tw-border-primary-600",
-    "focus-visible:before:tw-ring-primary-600",
-    ...focusRing,
-  ],
-  secondary: [
-    "tw-bg-transparent",
-    "!tw-text-muted",
-    "tw-border-text-muted",
-    "hover:!tw-text-contrast",
-    "hover:tw-bg-text-muted",
-    "focus-visible:before:tw-ring-primary-600",
-    ...focusRing,
-  ],
-  danger: [
-    "tw-bg-transparent",
-    "!tw-text-danger-600",
-    "tw-border-transparent",
-    "hover:!tw-text-danger-600",
-    "hover:tw-bg-transparent",
-    "hover:tw-border-primary-600",
-    "focus-visible:before:tw-ring-primary-600",
-    ...focusRing,
-  ],
-  light: [
-    "tw-bg-transparent",
+  primary: ["!tw-text-primary-600", "focus-visible:before:tw-ring-primary-600", ...focusRing],
+  danger: ["!tw-text-danger-600", "focus-visible:before:tw-ring-primary-600", ...focusRing],
+  "nav-contrast": [
     "!tw-text-alt2",
-    "tw-border-transparent",
-    "hover:tw-bg-transparent-hover",
-    "hover:tw-border-text-alt2",
+    "hover:!tw-bg-hover-contrast",
     "focus-visible:before:tw-ring-text-alt2",
     ...focusRing,
   ],
-  unstyled: [],
-};
-
-const disabledStyles: Record<IconButtonType, string[]> = {
-  contrast: [
-    "disabled:tw-opacity-60",
-    "disabled:hover:tw-border-transparent",
-    "disabled:hover:tw-bg-transparent",
-  ],
-  main: [
-    "disabled:!tw-text-secondary-300",
-    "disabled:hover:tw-border-transparent",
-    "disabled:hover:tw-bg-transparent",
-  ],
-  muted: [
-    "disabled:!tw-text-secondary-300",
-    "disabled:hover:tw-border-transparent",
-    "disabled:hover:tw-bg-transparent",
-  ],
-  primary: [
-    "disabled:tw-opacity-60",
-    "disabled:hover:tw-border-primary-600",
-    "disabled:hover:tw-bg-primary-600",
-  ],
-  secondary: [
-    "disabled:tw-opacity-60",
-    "disabled:hover:tw-border-text-muted",
-    "disabled:hover:tw-bg-transparent",
-    "disabled:hover:!tw-text-muted",
-  ],
-  danger: [
-    "disabled:!tw-text-secondary-300",
-    "disabled:hover:tw-border-transparent",
-    "disabled:hover:tw-bg-transparent",
-    "disabled:hover:!tw-text-secondary-300",
-  ],
-  light: [
-    "disabled:tw-opacity-60",
-    "disabled:hover:tw-border-transparent",
-    "disabled:hover:tw-bg-transparent",
-  ],
-  unstyled: [],
 };
 
 export type IconButtonSize = "default" | "small";
 
 const sizes: Record<IconButtonSize, string[]> = {
-  default: ["tw-px-2.5", "tw-py-1.5"],
-  small: ["tw-leading-none", "tw-text-base", "tw-p-1"],
+  default: ["tw-text-xl", "tw-p-2.5", "tw-rounded-md"],
+  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`.
@@ -164,6 +80,13 @@ 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
+     * a number of components, so this manual attr binding makes sure that the css selector
+     * works when the input is dynamic.
+     */
+    "[attr.bitIconButton]": "icon()",
   },
 })
 export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableElement {
@@ -176,17 +99,20 @@ export class BitIconButtonComponent implements ButtonLikeAbstraction, FocusableE
   @HostBinding("class") get classList() {
     return [
       "tw-font-semibold",
-      "tw-border",
-      "tw-border-solid",
-      "tw-rounded-lg",
+      "tw-leading-[0px]",
+      "tw-border-none",
       "tw-transition",
+      "tw-bg-transparent",
       "hover:tw-no-underline",
+      "hover:tw-bg-hover-default",
       "focus:tw-outline-none",
     ]
       .concat(styles[this.buttonType()])
       .concat(sizes[this.size()])
       .concat(
-        this.showDisabledStyles() || this.disabled() ? disabledStyles[this.buttonType()] : [],
+        this.showDisabledStyles() || this.disabled()
+          ? ["disabled:tw-opacity-60", "disabled:hover:!tw-bg-transparent"]
+          : [],
       );
   }
 
diff --git a/libs/components/src/icon-button/icon-button.mdx b/libs/components/src/icon-button/icon-button.mdx
index 637a9d7daa0..3fcd4a23583 100644
--- a/libs/components/src/icon-button/icon-button.mdx
+++ b/libs/components/src/icon-button/icon-button.mdx
@@ -23,9 +23,6 @@ Icon buttons can be found in other components such as: the
 
 ## Styles
 
-There are 4 common styles for button main, muted, contrast, and danger. The other styles follow the
-button component styles.
-
 ### Main
 
 Used for general icon buttons appearing on the theme’s main `background`
@@ -59,22 +56,11 @@ square.
 
 <Canvas of={stories.Primary} />
 
-### Secondary
+### Nav Contrast
 
-Used in place of the main button component if no text is used. This allows the button to display
-square.
+Used on the side nav background that is dark in both light theme and dark theme.
 
-<Canvas of={stories.Secondary} />
-
-### Light
-
-Used on a background that is dark in both light theme and dark theme. Example: end user navigation
-styles.
-
-<Canvas of={stories.Light} />
-
-**Note:** Main and contrast styles appear on backgrounds where using `primary-700` as a focus
-indicator does not meet WCAG graphic contrast guidelines.
+<Canvas of={stories.NavContrast} />
 
 ## Sizes
 
diff --git a/libs/components/src/icon-button/icon-button.stories.ts b/libs/components/src/icon-button/icon-button.stories.ts
index f63c494f7db..fdcda07f021 100644
--- a/libs/components/src/icon-button/icon-button.stories.ts
+++ b/libs/components/src/icon-button/icon-button.stories.ts
@@ -49,13 +49,6 @@ export const Primary: Story = {
   },
 };
 
-export const Secondary: Story = {
-  ...Default,
-  args: {
-    buttonType: "secondary",
-  },
-};
-
 export const Danger: Story = {
   ...Default,
   args: {
@@ -77,18 +70,18 @@ export const Muted: Story = {
   },
 };
 
-export const Light: Story = {
+export const NavContrast: Story = {
   render: (args) => ({
     props: args,
     template: /*html*/ `
-    <div class="tw-bg-background-alt2 tw-p-6 tw-w-full tw-inline-block">
+    <div class="tw-bg-background-alt3 tw-p-6 tw-w-full tw-inline-block">
       <!-- <div> used only to provide dark background color -->
       <button ${formatArgsForCodeSnippet<BitIconButtonComponent>(args)}>Button</button>
     </div>
       `,
   }),
   args: {
-    buttonType: "light",
+    buttonType: "nav-contrast",
   },
 };
 
diff --git a/libs/components/src/icon/index.ts b/libs/components/src/icon/index.ts
index 4f797326be3..01819a3678e 100644
--- a/libs/components/src/icon/index.ts
+++ b/libs/components/src/icon/index.ts
@@ -1,4 +1,10 @@
 export * from "./icon.module";
 export * from "./icon";
 export * as Icons from "./icons";
-export { AdminConsoleLogo, PasswordManagerLogo, SecretsManagerLogo } from "./logos";
+export {
+  AdminConsoleLogo,
+  BusinessUnitPortalLogo,
+  PasswordManagerLogo,
+  ProviderPortalLogo,
+  SecretsManagerLogo,
+} from "./logos";
diff --git a/libs/components/src/icon/logos/bitwarden/admin-console.ts b/libs/components/src/icon/logos/bitwarden/admin-console.ts
index 673cf9642c8..5fa96d91dfe 100644
--- a/libs/components/src/icon/logos/bitwarden/admin-console.ts
+++ b/libs/components/src/icon/logos/bitwarden/admin-console.ts
@@ -1,7 +1,7 @@
 import { svgIcon } from "../../icon";
 
 const AdminConsoleLogo = svgIcon`
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 46" fill="none"><path class="tw-fill-text-alt2" fill-rule="evenodd" d="M48.137 7.639c2.293 0 4.077.869 5.387 2.68 1.31 1.773 1.966 4.2 1.966 7.277 0 3.186-.655 5.648-2.002 7.386-1.347 1.774-3.167 2.607-5.46 2.607s-4.04-.797-5.351-2.462h-.364l-.692 1.701a.673.673 0 0 1-.618.399H38.09a.65.65 0 0 1-.655-.652V1.122A.65.65 0 0 1 38.09.47h3.932a.65.65 0 0 1 .655.652v5.575c0 .797-.073 2.064-.218 3.802h.218c1.201-1.883 3.058-2.86 5.46-2.86Zm-1.674 4.236c-1.274 0-2.257.398-2.876 1.195-.582.796-.91 2.136-.91 3.946v.58c0 2.064.291 3.548.91 4.417.619.869 1.602 1.34 2.948 1.34 1.056 0 1.966-.507 2.585-1.521.619-.978.946-2.462.946-4.309 0-1.883-.327-3.294-.946-4.236-.655-.941-1.565-1.412-2.657-1.412Zm17.69 15.388h-3.931a.65.65 0 0 1-.655-.652V8.69a.65.65 0 0 1 .655-.652h3.931a.65.65 0 0 1 .655.652v17.886c.037.326-.29.688-.655.688Zm14.378-3.874c.765 0 1.675-.145 2.767-.435a.436.436 0 0 1 .546.435v3.005c0 .181-.11.326-.255.398-1.237.507-2.803.76-4.55.76-2.111 0-3.64-.506-4.586-1.593-.947-1.05-1.456-2.643-1.456-4.743v-9.232h-2.075a.42.42 0 0 1-.437-.435V9.847c0-.036.036-.072.036-.108l2.876-1.702 1.42-3.765c.072-.181.218-.29.4-.29h2.62a.42.42 0 0 1 .438.434v3.657h5.205c.11 0 .218.109.218.218v3.258a.42.42 0 0 1-.436.435h-4.95v9.196c0 .724.218 1.304.618 1.63.364.398.946.579 1.601.579Zm24.498 3.874c-.51 0-.91-.326-1.128-.797l-3.859-11.694c-.255-.833-.582-2.1-1.019-3.73h-.11l-.363 1.304-.765 2.462-3.967 11.695c-.146.47-.583.76-1.092.76-.51 0-.947-.326-1.092-.833L84.792 9.594c-.145-.507.255-1.05.838-1.05h.109c.364 0 .691.253.8.616l2.84 10.246c.691 2.68 1.165 4.635 1.383 5.938h.11c.654-2.68 1.164-4.454 1.492-5.359L96.04 9.268c.146-.434.546-.724 1.056-.724.473 0 .873.29 1.019.724l3.422 10.645c.837 2.715 1.346 4.453 1.528 5.358h.11c.109-.724.546-2.751 1.383-6.01l2.73-10.101a.852.852 0 0 1 .801-.616c.546 0 .946.507.801 1.05l-4.587 16.836c-.146.507-.582.833-1.128.833h-.146Zm21.622 0a.665.665 0 0 1-.655-.58l-.328-2.39h-.182c-.946 1.196-1.893 2.065-2.912 2.572-.983.507-2.184.724-3.531.724-1.856 0-3.276-.47-4.295-1.412-.91-.833-1.42-1.956-1.492-3.367-.146-1.883.655-3.694 2.184-4.744 1.565-1.013 3.749-1.629 6.697-1.629l3.568-.109v-1.23c0-1.81-.364-3.114-1.129-4.02-.764-.905-1.893-1.34-3.494-1.34-1.529 0-3.058.363-4.66 1.123a.8.8 0 0 1-1.055-.398c-.182-.398 0-.869.4-1.014 1.82-.724 3.604-1.122 5.424-1.122 2.075 0 3.604.543 4.659 1.63 1.019 1.05 1.529 2.75 1.529 4.96v11.767c-.036.217-.364.579-.728.579Zm-7.535-1.231c2.038 0 3.604-.58 4.732-1.702 1.165-1.122 1.747-2.752 1.747-4.743v-1.81l-3.276.145c-2.657.108-4.513.543-5.678 1.23-1.129.688-1.711 1.81-1.711 3.26 0 1.158.364 2.1 1.056 2.75.8.544 1.82.87 3.13.87Zm21.549-17.85c.546 0 1.092.036 1.711.109a.819.819 0 0 1 .692.941c-.073.434-.51.688-.947.615-.546-.072-1.092-.144-1.638-.144-1.601 0-2.912.688-3.931 2.027-1.019 1.34-1.529 3.078-1.529 5.105v9.486c0 .471-.364.833-.837.833a.822.822 0 0 1-.837-.832V9.303c0-.398.327-.724.728-.724.4 0 .728.29.728.688l.145 2.68h.109c.765-1.376 1.602-2.354 2.476-2.897.837-.58 1.893-.869 3.13-.869Zm12.813 0c1.347 0 2.548.253 3.531.724 1.019.47 1.893 1.34 2.657 2.535h.109a86.503 86.503 0 0 1-.109-4.237V1.303c0-.471.364-.833.837-.833.474 0 .838.362.838.833V26.61c0 .326-.255.58-.583.58a.59.59 0 0 1-.582-.544l-.364-2.353h-.146c-1.419 2.136-3.494 3.186-6.151 3.186-2.621 0-4.551-.796-5.97-2.426-1.347-1.629-2.075-3.946-2.075-7.024 0-3.222.655-5.684 2.038-7.422 1.384-1.557 3.349-2.426 5.97-2.426Zm0 1.557c-2.075 0-3.604.724-4.659 2.172-1.019 1.412-1.529 3.476-1.529 6.228 0 5.286 2.075 7.93 6.225 7.93 2.147 0 3.676-.616 4.659-1.848 1.019-1.23 1.492-3.258 1.492-6.082v-.29c0-2.896-.473-4.96-1.492-6.191-.947-1.304-2.512-1.92-4.696-1.92Zm21.804 17.85c-2.73 0-4.841-.833-6.406-2.535-1.529-1.665-2.294-4.019-2.294-7.024s.728-5.395 2.221-7.169c1.492-1.81 3.458-2.715 5.969-2.715 2.184 0 3.968.76 5.206 2.28 1.31 1.521 1.929 3.621 1.929 6.264v1.376h-13.541c.036 2.571.619 4.526 1.82 5.902 1.201 1.376 2.876 1.991 5.096 1.991 1.056 0 2.038-.072 2.839-.217a14.74 14.74 0 0 0 2.111-.58.731.731 0 0 1 .983.689c0 .29-.182.58-.473.688-.874.362-1.711.58-2.475.724-.91.253-1.893.326-2.985.326Zm-.51-17.886c-1.82 0-3.276.579-4.368 1.774-1.092 1.158-1.71 2.896-1.929 5.105h11.648c0-2.136-.473-3.874-1.419-5.069-.947-1.195-2.257-1.81-3.932-1.81Zm26.354 17.56a.822.822 0 0 1-.837-.833V15.097c0-1.882-.4-3.258-1.165-4.09-.837-.834-2.038-1.304-3.713-1.304-2.256 0-3.894.543-4.914 1.701-1.019 1.123-1.601 2.97-1.601 5.468v9.486c0 .47-.364.832-.837.832a.822.822 0 0 1-.838-.832V9.304c0-.434.328-.76.765-.76.4 0 .691.29.764.652l.219 1.883h.109c1.237-1.956 3.385-2.933 6.516-2.933 4.258 0 6.406 2.28 6.406 6.843v11.369c-.036.507-.437.905-.874.905ZM62.224.18c-1.71 0-3.094 1.304-3.094 2.933v.29c0 1.593 1.42 2.932 3.094 2.932 1.675 0 3.094-1.34 3.094-2.932v-.254c0-1.665-1.42-2.969-3.094-2.969Z" clip-rule="evenodd"/><path class="tw-fill-text-alt2" d="M22.097 17.27V4.322h-9.099v23c1.612-.85 3.054-1.773 4.326-2.771 3.182-2.482 4.773-4.91 4.773-7.283Zm3.9-15.536v15.535a9.26 9.26 0 0 1-.68 3.45 12.85 12.85 0 0 1-1.686 3.034c-.67.883-1.47 1.743-2.397 2.579a27.862 27.862 0 0 1-2.57 2.083 32.334 32.334 0 0 1-2.457 1.568c-.853.492-1.459.826-1.817 1.001-.36.176-.647.31-.864.405-.162.08-.338.121-.528.121s-.365-.04-.528-.121c-.216-.095-.504-.23-.863-.405-.359-.175-.965-.509-1.818-1.001a32.354 32.354 0 0 1-2.457-1.568 27.873 27.873 0 0 1-2.57-2.083 18.756 18.756 0 0 1-2.396-2.58A12.851 12.851 0 0 1 .68 20.719 9.259 9.259 0 0 1 0 17.27V1.734c0-.35.129-.654.386-.91C.643.567.948.439 1.3.439h23.397c.352 0 .657.128.914.385.257.256.386.56.386.91ZM92.527 45.635l3.977-10.79h1.372l3.962 10.79h-1.372l-.987-2.775h-4.593l-1.002 2.775h-1.357Zm2.744-3.823h3.823l-1.911-5.334-1.912 5.334ZM106.412 45.82c-.761 0-1.429-.175-2.004-.524a3.647 3.647 0 0 1-1.326-1.434c-.308-.606-.462-1.295-.462-2.066 0-.77.159-1.454.478-2.05.318-.606.76-1.079 1.325-1.418.565-.35 1.233-.524 2.004-.524.627 0 1.182.128 1.665.385.483.257.858.617 1.125 1.08v-4.733h1.295v11.099h-1.171l-.124-1.264c-.246.37-.601.704-1.063 1.002-.463.298-1.043.447-1.742.447Zm.139-1.126c.513 0 .966-.118 1.356-.354.401-.247.709-.586.925-1.017.226-.432.339-.936.339-1.511 0-.576-.113-1.08-.339-1.51a2.36 2.36 0 0 0-.925-1.003c-.39-.246-.843-.37-1.356-.37-.504 0-.956.124-1.357.37-.39.237-.699.57-.925 1.002-.216.432-.324.935-.324 1.51 0 .576.108 1.08.324 1.512.226.431.535.77.925 1.017.401.236.853.354 1.357.354ZM112.623 45.635v-7.646h1.172l.092 1.11c.247-.411.576-.73.987-.956.411-.226.873-.339 1.387-.339.606 0 1.125.123 1.557.37.442.247.781.622 1.017 1.125a2.94 2.94 0 0 1 1.095-1.094c.472-.267.981-.401 1.526-.401.914 0 1.644.277 2.189.832.544.545.817 1.388.817 2.528v4.47h-1.28v-4.33c0-.792-.159-1.388-.478-1.789-.318-.4-.775-.601-1.372-.601-.616 0-1.13.241-1.541.724-.401.473-.601 1.151-.601 2.035v3.962h-1.295v-4.332c0-.791-.159-1.387-.478-1.788-.319-.4-.776-.601-1.372-.601-.606 0-1.115.241-1.526.724-.401.473-.601 1.151-.601 2.035v3.962h-1.295ZM127.198 36.293a.908.908 0 0 1-.647-.246.91.91 0 0 1-.247-.648c0-.246.083-.452.247-.616a.908.908 0 0 1 .647-.247c.247 0 .458.082.632.247a.81.81 0 0 1 .262.616.878.878 0 0 1-.262.648.887.887 0 0 1-.632.246Zm-.647 9.342v-7.646h1.295v7.646h-1.295ZM130.1 45.635v-7.646h1.172l.077 1.372a2.777 2.777 0 0 1 1.064-1.14 2.993 2.993 0 0 1 1.572-.417c.904 0 1.624.277 2.158.832.545.545.817 1.388.817 2.528v4.47h-1.295v-4.33c0-1.594-.658-2.39-1.973-2.39-.658 0-1.207.241-1.649.724-.432.473-.648 1.151-.648 2.035v3.962H130.1ZM147.811 45.82c-1.059 0-1.973-.231-2.744-.694a4.818 4.818 0 0 1-1.773-1.958c-.421-.842-.632-1.819-.632-2.928 0-1.1.211-2.066.632-2.898.422-.843 1.013-1.5 1.773-1.974.771-.472 1.685-.709 2.744-.709 1.233 0 2.235.298 3.006.894.781.586 1.279 1.408 1.495 2.467h-1.434c-.164-.668-.503-1.203-1.017-1.603-.503-.411-1.187-.617-2.05-.617-.771 0-1.444.18-2.019.54-.576.349-1.023.858-1.342 1.526-.308.657-.462 1.449-.462 2.374 0 .924.154 1.72.462 2.389.319.658.766 1.166 1.342 1.526.575.35 1.248.524 2.019.524.863 0 1.547-.195 2.05-.586.514-.4.853-.93 1.017-1.587h1.434c-.216 1.038-.714 1.85-1.495 2.435-.771.586-1.773.879-3.006.879ZM157.58 45.82c-.72 0-1.367-.165-1.942-.493a3.627 3.627 0 0 1-1.372-1.388c-.329-.606-.494-1.315-.494-2.127 0-.812.17-1.516.509-2.112a3.598 3.598 0 0 1 1.372-1.403 3.93 3.93 0 0 1 1.958-.493c.719 0 1.366.164 1.942.493a3.494 3.494 0 0 1 1.356 1.403c.34.596.509 1.3.509 2.112s-.169 1.52-.509 2.127a3.596 3.596 0 0 1-1.387 1.388c-.575.328-1.223.493-1.942.493Zm0-1.11c.442 0 .853-.108 1.233-.324.38-.216.689-.54.925-.97.236-.433.354-.967.354-1.604 0-.637-.118-1.172-.354-1.603-.226-.432-.529-.756-.91-.971a2.426 2.426 0 0 0-1.217-.324c-.442 0-.853.108-1.234.324-.38.215-.688.54-.924.97-.237.432-.355.967-.355 1.604 0 .637.118 1.171.355 1.603.236.432.539.755.909.971.38.216.786.324 1.218.324ZM163.219 45.635v-7.646h1.171l.077 1.372a2.777 2.777 0 0 1 1.064-1.14 2.993 2.993 0 0 1 1.572-.417c.905 0 1.624.277 2.158.832.545.545.817 1.388.817 2.528v4.47h-1.295v-4.33c0-1.594-.657-2.39-1.973-2.39-.657 0-1.207.241-1.649.724-.432.473-.648 1.151-.648 2.035v3.962h-1.294ZM174.969 45.82c-.915 0-1.675-.231-2.282-.694-.606-.462-.96-1.09-1.063-1.88h1.326c.082.4.292.75.632 1.048.349.288.817.431 1.402.431.545 0 .946-.113 1.203-.339.257-.236.385-.514.385-.832 0-.463-.169-.771-.509-.925-.328-.154-.796-.293-1.402-.416a7.953 7.953 0 0 1-1.234-.355 2.846 2.846 0 0 1-1.032-.647c-.278-.288-.417-.663-.417-1.126 0-.668.247-1.212.74-1.634.504-.431 1.182-.647 2.035-.647.812 0 1.475.206 1.989.617.524.4.827.976.909 1.726h-1.279c-.052-.39-.221-.694-.509-.91-.277-.226-.653-.339-1.125-.339-.463 0-.822.098-1.079.293a.935.935 0 0 0-.37.771c0 .308.159.55.478.725.328.174.77.323 1.325.447.473.102.92.23 1.341.385.432.144.781.365 1.049.663.277.288.416.709.416 1.264.01.688-.252 1.259-.786 1.711-.525.442-1.239.663-2.143.663ZM183.231 45.82c-.719 0-1.366-.165-1.942-.493a3.634 3.634 0 0 1-1.372-1.388c-.329-.606-.493-1.315-.493-2.127 0-.812.169-1.516.509-2.112a3.603 3.603 0 0 1 1.371-1.403 3.932 3.932 0 0 1 1.958-.493c.72 0 1.367.164 1.942.493a3.496 3.496 0 0 1 1.357 1.403c.339.596.509 1.3.509 2.112s-.17 1.52-.509 2.127a3.603 3.603 0 0 1-1.387 1.388c-.576.328-1.223.493-1.943.493Zm0-1.11c.442 0 .853-.108 1.234-.324.38-.216.688-.54.924-.97.237-.433.355-.967.355-1.604 0-.637-.118-1.172-.355-1.603-.226-.432-.529-.756-.909-.971a2.427 2.427 0 0 0-1.218-.324c-.442 0-.853.108-1.233.324-.38.215-.689.54-.925.97-.236.432-.354.967-.354 1.604 0 .637.118 1.171.354 1.603.236.432.54.755.91.971.38.216.786.324 1.217.324ZM188.87 45.635V34.536h1.295v11.099h-1.295ZM195.725 45.82c-.73 0-1.377-.165-1.942-.493a3.666 3.666 0 0 1-1.342-1.403c-.318-.596-.477-1.3-.477-2.112 0-.802.159-1.5.477-2.096a3.43 3.43 0 0 1 1.326-1.403c.576-.34 1.239-.509 1.989-.509.74 0 1.377.17 1.911.509.545.328.961.765 1.249 1.31.288.545.431 1.13.431 1.757 0 .113-.005.226-.015.34v.385h-6.089c.031.586.164 1.074.401 1.464.246.38.55.668.909.863.37.196.761.293 1.172.293.534 0 .981-.123 1.341-.37.36-.246.622-.58.786-1.002h1.28c-.206.71-.602 1.3-1.187 1.773-.576.463-1.316.694-2.22.694Zm0-6.922c-.617 0-1.167.19-1.65.57-.472.37-.745.915-.817 1.635h4.81c-.031-.689-.267-1.228-.709-1.619-.442-.39-.987-.586-1.634-.586Z"/></svg>
+    <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>
 `;
 
 export default AdminConsoleLogo;
diff --git a/libs/components/src/icon/logos/bitwarden/business-unit-portal.ts b/libs/components/src/icon/logos/bitwarden/business-unit-portal.ts
new file mode 100644
index 00000000000..6206256f88b
--- /dev/null
+++ b/libs/components/src/icon/logos/bitwarden/business-unit-portal.ts
@@ -0,0 +1,7 @@
+import { svgIcon } from "../../icon";
+
+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>
+`;
+
+export default BusinessUnitPortalLogo;
diff --git a/libs/components/src/icon/logos/bitwarden/index.ts b/libs/components/src/icon/logos/bitwarden/index.ts
index ba78bdb4fe5..d74c6fe453a 100644
--- a/libs/components/src/icon/logos/bitwarden/index.ts
+++ b/libs/components/src/icon/logos/bitwarden/index.ts
@@ -1,4 +1,6 @@
 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/bitwarden/password-manager.ts b/libs/components/src/icon/logos/bitwarden/password-manager.ts
index 37b62c5dbc2..7586e28bfae 100644
--- a/libs/components/src/icon/logos/bitwarden/password-manager.ts
+++ b/libs/components/src/icon/logos/bitwarden/password-manager.ts
@@ -1,7 +1,7 @@
 import { svgIcon } from "../../icon";
 
 const PasswordManagerLogo = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 200 49"><path class="tw-fill-text-alt2" fill-rule="evenodd" d="M48.038 7.458c2.289 0 4.069.869 5.376 2.679 1.308 1.774 1.962 4.2 1.962 7.277 0 3.186-.654 5.647-1.998 7.385-1.344 1.774-3.16 2.607-5.449 2.607-2.288 0-4.032-.797-5.34-2.462h-.363l-.69 1.701a.672.672 0 0 1-.618.399h-2.906a.65.65 0 0 1-.654-.652V.942a.65.65 0 0 1 .654-.652h3.923a.65.65 0 0 1 .654.651v5.576c0 .796-.072 2.063-.218 3.8h.218c1.2-1.882 3.052-2.86 5.45-2.86Zm-1.67 4.236c-1.272 0-2.253.398-2.87 1.194-.582.797-.909 2.136-.909 3.946v.58c0 2.063.29 3.548.909 4.416.617.87 1.598 1.34 2.942 1.34 1.053 0 1.962-.507 2.579-1.52.617-.978.945-2.462.945-4.309 0-1.882-.328-3.294-.945-4.236-.654-.94-1.562-1.411-2.652-1.411ZM64.021 27.08h-3.924a.65.65 0 0 1-.654-.652V8.508a.65.65 0 0 1 .654-.652h3.924a.65.65 0 0 1 .653.652v17.884c.037.326-.29.688-.653.688Zm14.348-3.874c.763 0 1.671-.145 2.761-.434a.436.436 0 0 1 .545.434v3.005a.445.445 0 0 1-.254.398c-1.236.507-2.797.76-4.541.76-2.107 0-3.633-.506-4.577-1.592-.945-1.05-1.453-2.643-1.453-4.743v-9.232h-2.07a.419.419 0 0 1-.437-.434V9.666c0-.036.037-.072.037-.108l2.87-1.702 1.416-3.765c.073-.181.218-.29.4-.29h2.615c.254 0 .436.181.436.435v3.656h5.195c.109 0 .218.109.218.218v3.258a.419.419 0 0 1-.436.434h-4.94v9.196c0 .724.217 1.303.617 1.629.363.398.944.58 1.598.58Zm24.447 3.874c-.508 0-.908-.326-1.126-.796l-3.85-11.694c-.254-.833-.581-2.1-1.017-3.73h-.11l-.363 1.304-.762 2.462-3.96 11.694c-.145.47-.581.76-1.09.76-.508 0-.944-.326-1.09-.833L84.62 9.413c-.146-.507.254-1.05.835-1.05h.109a.85.85 0 0 1 .799.615l2.833 10.246c.69 2.679 1.163 4.634 1.38 5.937h.11c.653-2.679 1.162-4.453 1.489-5.358l3.669-10.716c.145-.434.545-.724 1.053-.724.473 0 .872.29 1.017.724l3.415 10.644c.836 2.715 1.344 4.453 1.526 5.358h.109c.109-.724.545-2.752 1.38-6.01l2.725-10.1a.85.85 0 0 1 .799-.616c.545 0 .944.507.799 1.05l-4.577 16.834c-.145.507-.581.833-1.126.833h-.146Zm21.578 0a.664.664 0 0 1-.654-.58l-.327-2.389h-.182c-.944 1.195-1.888 2.064-2.906 2.57-.98.508-2.179.725-3.523.725-1.853 0-3.269-.47-4.287-1.412-.908-.833-1.416-1.955-1.489-3.367-.145-1.883.654-3.693 2.18-4.743 1.562-1.013 3.741-1.629 6.684-1.629l3.559-.108v-1.231c0-1.81-.363-3.114-1.126-4.019-.762-.905-1.889-1.34-3.487-1.34-1.526 0-3.051.363-4.65 1.123a.799.799 0 0 1-1.053-.398c-.182-.399 0-.87.4-1.014 1.816-.724 3.596-1.122 5.412-1.122 2.071 0 3.596.543 4.65 1.629 1.017 1.05 1.525 2.751 1.525 4.96V26.5c-.036.217-.363.579-.726.579Zm-7.52-1.231c2.035 0 3.597-.58 4.723-1.701 1.162-1.123 1.743-2.752 1.743-4.743v-1.81l-3.269.145c-2.652.108-4.504.543-5.667 1.23-1.126.688-1.707 1.81-1.707 3.259 0 1.158.363 2.1 1.053 2.751.8.543 1.817.869 3.124.869ZM138.38 8.001c.545 0 1.09.036 1.708.109a.818.818 0 0 1 .69.94c-.073.435-.509.689-.945.616-.545-.072-1.089-.145-1.634-.145-1.599 0-2.906.688-3.923 2.028-1.018 1.34-1.526 3.077-1.526 5.104v9.486a.82.82 0 0 1-.836.832.82.82 0 0 1-.835-.832V9.123c0-.398.327-.724.726-.724.4 0 .727.29.727.688l.145 2.679h.109c.763-1.376 1.598-2.353 2.47-2.896.836-.58 1.889-.87 3.124-.87Zm12.787 0c1.344 0 2.543.253 3.524.724 1.017.47 1.889 1.34 2.651 2.534h.109a86.486 86.486 0 0 1-.109-4.236v-5.9c0-.471.364-.833.836-.833a.82.82 0 0 1 .835.832v25.306c0 .326-.254.58-.581.58a.589.589 0 0 1-.581-.543l-.363-2.354h-.146c-1.416 2.136-3.487 3.186-6.139 3.186-2.615 0-4.54-.796-5.957-2.425-1.344-1.63-2.071-3.947-2.071-7.024 0-3.222.654-5.684 2.035-7.421C146.59 8.87 148.552 8 151.167 8Zm0 1.557c-2.071 0-3.596.724-4.65 2.172-1.017 1.412-1.525 3.475-1.525 6.227 0 5.285 2.07 7.928 6.211 7.928 2.144 0 3.669-.615 4.65-1.846 1.017-1.231 1.489-3.258 1.489-6.082v-.29c0-2.896-.472-4.96-1.489-6.19-.944-1.304-2.506-1.92-4.686-1.92Zm21.759 17.848c-2.724 0-4.831-.833-6.393-2.534-1.526-1.666-2.289-4.019-2.289-7.024s.727-5.394 2.216-7.168c1.489-1.81 3.451-2.715 5.958-2.715 2.179 0 3.959.76 5.194 2.28 1.308 1.521 1.925 3.62 1.925 6.264v1.375h-13.513c.037 2.57.618 4.526 1.816 5.901 1.199 1.376 2.87 1.992 5.086 1.992 1.054 0 2.034-.073 2.834-.218a14.71 14.71 0 0 0 2.106-.579c.473-.18.981.181.981.688 0 .29-.181.58-.472.688-.872.362-1.707.58-2.47.724-.908.253-1.889.326-2.979.326Zm-.508-17.885c-1.817 0-3.27.58-4.36 1.774-1.089 1.159-1.707 2.897-1.925 5.105h11.624c0-2.136-.472-3.874-1.416-5.068-.945-1.195-2.252-1.81-3.923-1.81Zm26.299 17.559a.82.82 0 0 1-.835-.833V14.916c0-1.883-.4-3.259-1.163-4.091-.835-.833-2.034-1.304-3.705-1.304-2.252 0-3.887.543-4.904 1.702-1.017 1.122-1.598 2.969-1.598 5.467v9.485a.82.82 0 0 1-.836.832.82.82 0 0 1-.835-.832V9.123c0-.434.327-.76.763-.76.399 0 .69.29.763.652l.218 1.882h.109c1.235-1.955 3.378-2.932 6.502-2.932 4.25 0 6.393 2.28 6.393 6.842v11.368c-.036.507-.436.905-.872.905ZM62.097 0c-1.708 0-3.088 1.303-3.088 2.932v.29c0 1.593 1.416 2.933 3.087 2.933 1.671 0 3.088-1.34 3.088-2.933V2.97C65.184 1.303 63.767 0 62.096 0Z" clip-rule="evenodd"/><path class="tw-fill-text-alt2" d="M22.052 17.087V4.142h-9.08V27.14c1.608-.85 3.047-1.773 4.317-2.771 3.175-2.481 4.763-4.908 4.763-7.282Zm3.891-15.534v15.534c0 1.16-.226 2.31-.679 3.45a12.86 12.86 0 0 1-1.682 3.033 18.741 18.741 0 0 1-2.392 2.579c-.925.836-1.78 1.53-2.564 2.083a32.288 32.288 0 0 1-2.452 1.568c-.851.492-1.456.826-1.814 1.001-.358.175-.645.31-.861.405-.163.08-.338.12-.527.12-.19 0-.365-.04-.527-.12-.216-.095-.504-.23-.862-.405-.358-.175-.962-.509-1.814-1.001a32.279 32.279 0 0 1-2.452-1.568 27.823 27.823 0 0 1-2.564-2.083A18.74 18.74 0 0 1 2.36 23.57 12.857 12.857 0 0 1 .68 20.536 9.273 9.273 0 0 1 0 17.087V1.553C0 1.203.128.9.385.643S.945.26 1.297.26h23.35c.35 0 .655.128.911.384.257.256.385.56.385.91ZM195.682 44.967v-7.753h1.12l.088 1.415c.177-.354.408-.649.693-.884a2.853 2.853 0 0 1 1.032-.531 5.033 5.033 0 0 1 1.385-.177v1.297h-.766c-.295 0-.58.04-.855.118a2.183 2.183 0 0 0-.752.383 1.825 1.825 0 0 0-.516.722c-.128.305-.191.688-.191 1.15v4.26h-1.238ZM190.546 45.144c-.688 0-1.297-.167-1.827-.502-.531-.334-.949-.805-1.253-1.415-.295-.609-.442-1.321-.442-2.137 0-.815.147-1.528.442-2.137.304-.609.722-1.08 1.253-1.415.54-.334 1.159-.5 1.857-.5.747 0 1.371.166 1.872.5.501.334.879.781 1.135 1.342.255.56.383 1.174.383 1.842v.295c0 .098-.005.216-.015.353h-5.999v-.958h4.805c-.019-.756-.241-1.331-.663-1.724-.413-.403-.929-.604-1.548-.604a2.24 2.24 0 0 0-1.149.31 2.214 2.214 0 0 0-.84.884c-.217.392-.325.884-.325 1.473v.413c0 .649.108 1.194.325 1.636.216.433.496.757.84.973.353.216.737.324 1.149.324.551 0 .983-.103 1.297-.31.315-.215.546-.52.693-.913h1.223c-.117.432-.324.82-.619 1.164a2.941 2.941 0 0 1-1.09.81c-.433.197-.934.296-1.504.296ZM182.179 48.386c-.697 0-1.311-.088-1.842-.265-.521-.167-.929-.428-1.223-.781-.285-.354-.428-.791-.428-1.312 0-.246.044-.501.133-.767.098-.265.26-.52.486-.766.236-.245.565-.467.988-.663l.943.501c-.56.216-.924.467-1.091.752-.167.285-.25.56-.25.825 0 .324.093.595.28.81.196.217.467.379.81.487.344.108.742.162 1.194.162.443 0 .821-.059 1.135-.177.325-.108.57-.27.737-.486.177-.206.266-.452.266-.737 0-.413-.133-.737-.398-.973-.266-.226-.782-.358-1.548-.398a15 15 0 0 1-1.503-.162 6.95 6.95 0 0 1-1.003-.236 3.329 3.329 0 0 1-.648-.324 4.345 4.345 0 0 1-.457-.368v-.34l1.459-1.4 1.164.384-1.591 1.311.191-.56c.108.079.211.153.31.221.098.07.231.133.398.192.177.05.417.098.722.147.314.05.727.094 1.238.133.707.05 1.272.167 1.695.354.423.186.727.447.914.78.187.325.28.723.28 1.195 0 .413-.118.806-.354 1.179-.226.373-.589.678-1.091.914-.491.245-1.13.368-1.916.368Zm-.014-5.837c-.629 0-1.165-.117-1.607-.353a2.512 2.512 0 0 1-.987-.988 2.952 2.952 0 0 1-.339-1.415c0-.52.113-.987.339-1.4a2.605 2.605 0 0 1 1.002-.987c.442-.246.973-.369 1.592-.369.638 0 1.174.123 1.606.369.433.245.762.574.988.987.226.413.339.88.339 1.4 0 .521-.113.993-.339 1.415a2.508 2.508 0 0 1-.988.988c-.432.236-.968.354-1.606.354Zm0-1.017c.55 0 .977-.142 1.282-.427.305-.295.457-.732.457-1.312 0-.58-.152-1.012-.457-1.297-.305-.285-.732-.427-1.282-.427-.521 0-.949.142-1.283.427-.324.285-.486.718-.486 1.297 0 .58.157 1.017.472 1.312.324.285.756.428 1.297.428Zm1.297-3.271-.369-1.047h3.036v.928l-2.667.118ZM173.442 45.144c-.589 0-1.081-.108-1.474-.325a2.252 2.252 0 0 1-.884-.884 2.533 2.533 0 0 1-.295-1.194c0-.51.128-.943.384-1.297.265-.364.633-.639 1.105-.825.472-.187 1.022-.28 1.651-.28h1.931c0-.502-.059-.92-.177-1.253a1.407 1.407 0 0 0-.575-.752c-.265-.167-.619-.25-1.061-.25-.443 0-.821.113-1.135.339-.315.216-.511.54-.59.972h-1.267c.059-.51.231-.938.515-1.282.285-.354.644-.619 1.076-.796.443-.187.909-.28 1.401-.28.697 0 1.272.128 1.724.383.452.246.786.595 1.002 1.047.217.442.325.968.325 1.577v4.923h-1.106l-.073-1.327a2.752 2.752 0 0 1-.384.59 2.459 2.459 0 0 1-.53.472 2.6 2.6 0 0 1-.708.324c-.255.078-.54.118-.855.118Zm.177-1.047c.324 0 .624-.074.899-.22a2.28 2.28 0 0 0 .708-.59 2.8 2.8 0 0 0 .471-.855c.109-.315.163-.644.163-.988v-.147h-1.828c-.462 0-.84.059-1.135.177-.285.118-.491.285-.619.5a1.315 1.315 0 0 0-.192.708c0 .285.059.536.177.752.118.206.29.368.516.486.236.118.516.177.84.177ZM162.504 44.967v-7.753h1.12l.059 1.223c.226-.442.55-.786.973-1.031.432-.246.929-.369 1.489-.369.57 0 1.066.108 1.488.324.423.217.752.546.988.988.236.442.354 1.002.354 1.68v4.938h-1.239v-4.805c0-.688-.172-1.204-.515-1.548-.335-.344-.787-.516-1.356-.516-.384 0-.737.094-1.062.28a1.97 1.97 0 0 0-.781.796c-.187.354-.28.786-.28 1.297v4.496h-1.238ZM156.803 45.144c-.589 0-1.081-.108-1.474-.325a2.246 2.246 0 0 1-.884-.884 2.52 2.52 0 0 1-.295-1.194c0-.51.128-.943.383-1.297.266-.364.634-.639 1.106-.825.471-.187 1.022-.28 1.651-.28h1.93c0-.502-.059-.92-.176-1.253a1.407 1.407 0 0 0-.575-.752c-.266-.167-.619-.25-1.062-.25-.442 0-.82.113-1.134.339-.315.216-.511.54-.59.972h-1.268c.059-.51.231-.938.516-1.282.285-.354.644-.619 1.076-.796.442-.187.909-.28 1.4-.28.698 0 1.273.128 1.725.383.452.246.786.595 1.002 1.047.216.442.324.968.324 1.577v4.923h-1.105l-.074-1.327a2.747 2.747 0 0 1-.383.59 2.459 2.459 0 0 1-.53.472 2.614 2.614 0 0 1-.708.324c-.255.078-.54.118-.855.118Zm.177-1.047c.324 0 .624-.074.899-.22a2.28 2.28 0 0 0 .708-.59 2.8 2.8 0 0 0 .471-.855c.108-.315.162-.644.162-.988v-.147h-1.827c-.462 0-.84.059-1.135.177-.285.118-.491.285-.619.5a1.315 1.315 0 0 0-.192.708c0 .285.059.536.177.752.118.206.29.368.516.486.236.118.516.177.84.177ZM142.312 44.967V34.649h1.444l3.508 7.267 3.479-7.267h1.459v10.318h-1.238v-8.092l-3.243 6.736h-.929l-3.242-6.677v8.033h-1.238ZM132.309 45.144c-.688 0-1.297-.177-1.828-.53a3.564 3.564 0 0 1-1.238-1.445c-.294-.62-.442-1.317-.442-2.093 0-.786.148-1.48.442-2.079a3.459 3.459 0 0 1 1.238-1.43c.531-.353 1.145-.53 1.843-.53.609 0 1.13.123 1.562.369.442.245.791.59 1.047 1.031v-4.082h1.238v10.612h-1.12l-.104-1.238a2.951 2.951 0 0 1-.589.692 2.826 2.826 0 0 1-.87.531c-.334.128-.727.192-1.179.192Zm.162-1.076c.492 0 .919-.118 1.282-.354.364-.246.644-.59.841-1.032.196-.452.294-.982.294-1.592 0-.609-.098-1.135-.294-1.577-.197-.452-.477-.796-.841-1.031-.363-.246-.79-.369-1.282-.369a2.16 2.16 0 0 0-1.238.369c-.363.235-.648.58-.855 1.031-.206.443-.309.968-.309 1.577 0 .61.103 1.14.309 1.592.207.442.492.786.855 1.032.364.236.776.354 1.238.354ZM123.641 44.967v-7.753h1.12l.089 1.415c.177-.354.408-.649.692-.884a2.853 2.853 0 0 1 1.032-.531 5.045 5.045 0 0 1 1.386-.177v1.297h-.767c-.295 0-.579.04-.855.118a2.178 2.178 0 0 0-.751.383 1.825 1.825 0 0 0-.516.722c-.128.305-.192.688-.192 1.15v4.26h-1.238ZM118.178 45.144c-.718 0-1.352-.167-1.902-.502a3.385 3.385 0 0 1-1.282-1.415c-.305-.609-.457-1.321-.457-2.137 0-.825.152-1.537.457-2.137a3.48 3.48 0 0 1 1.297-1.415c.56-.334 1.199-.5 1.916-.5.727 0 1.361.166 1.901.5.551.334.978.806 1.283 1.415.304.6.457 1.312.457 2.137 0 .816-.158 1.528-.472 2.137a3.385 3.385 0 0 1-1.282 1.416c-.551.334-1.189.5-1.916.5Zm0-1.062c.452 0 .859-.108 1.223-.324.363-.226.648-.56.855-1.002.216-.452.324-1.007.324-1.666 0-.668-.103-1.223-.309-1.665-.207-.442-.492-.771-.855-.988a2.198 2.198 0 0 0-1.209-.339c-.442 0-.845.113-1.209.34-.363.215-.653.545-.869.987-.216.442-.324.997-.324 1.665 0 .659.103 1.214.309 1.666.216.442.501.776.855 1.002.364.216.766.324 1.209.324ZM105.111 44.967l-2.285-7.753h1.238l1.695 6.176 1.799-6.176h1.4l1.813 6.16 1.68-6.16h1.253l-2.285 7.753h-1.267l-1.887-6.456-1.887 6.456h-1.267ZM99.08 45.144c-.698 0-1.278-.103-1.74-.31-.452-.216-.796-.51-1.032-.884a3.065 3.065 0 0 1-.427-1.327h1.267c.04.266.128.511.266.737.147.216.358.393.633.53.276.138.624.207 1.047.207.334 0 .619-.049.855-.147a1.19 1.19 0 0 0 .53-.442c.128-.187.192-.403.192-.649 0-.324-.074-.575-.221-.752-.138-.186-.344-.324-.62-.412a4.498 4.498 0 0 0-1.001-.221 6.69 6.69 0 0 1-1.15-.251 2.902 2.902 0 0 1-.855-.427 1.712 1.712 0 0 1-.516-.664 2.309 2.309 0 0 1-.177-.943c0-.422.113-.796.34-1.12.225-.324.545-.575.957-.752.423-.187.92-.28 1.489-.28.835 0 1.494.192 1.975.575.491.383.781.928.87 1.636h-1.224a1.209 1.209 0 0 0-.501-.855c-.285-.206-.663-.31-1.135-.31-.5 0-.88.094-1.135.28a.871.871 0 0 0-.383.738c0 .226.054.432.162.619.118.177.315.329.59.456.275.118.643.207 1.105.266.58.069 1.071.182 1.474.339.403.147.708.378.914.693.216.314.319.742.31 1.282 0 .51-.123.943-.369 1.297-.236.354-.57.624-1.002.81-.423.187-.919.28-1.489.28ZM91.58 45.144c-.698 0-1.277-.103-1.74-.31-.451-.216-.795-.51-1.031-.884a3.065 3.065 0 0 1-.427-1.327h1.267c.04.266.128.511.266.737.147.216.358.393.633.53.275.138.624.207 1.047.207.334 0 .619-.049.855-.147.235-.108.412-.256.53-.442a1.12 1.12 0 0 0 .192-.649c0-.324-.074-.575-.221-.752-.138-.186-.344-.324-.62-.412a4.498 4.498 0 0 0-1.002-.221 6.692 6.692 0 0 1-1.15-.251 2.9 2.9 0 0 1-.854-.427 1.712 1.712 0 0 1-.516-.664 2.309 2.309 0 0 1-.177-.943c0-.422.113-.796.34-1.12.225-.324.544-.575.957-.752.423-.187.919-.28 1.489-.28.835 0 1.493.192 1.975.575.491.383.781.928.87 1.636h-1.224a1.21 1.21 0 0 0-.501-.855c-.285-.206-.663-.31-1.135-.31-.501 0-.88.094-1.135.28a.87.87 0 0 0-.383.738c0 .226.054.432.162.619.118.177.315.329.59.456.275.118.643.207 1.105.266.58.069 1.071.182 1.474.339.403.147.708.378.914.693.216.314.32.742.31 1.282 0 .51-.123.943-.37 1.297a2.23 2.23 0 0 1-1.001.81c-.423.187-.92.28-1.489.28ZM83.079 45.144c-.59 0-1.081-.108-1.474-.325a2.25 2.25 0 0 1-.885-.884 2.526 2.526 0 0 1-.294-1.194c0-.51.127-.943.383-1.297.265-.364.634-.639 1.105-.825.472-.187 1.022-.28 1.651-.28h1.93c0-.502-.058-.92-.176-1.253-.118-.334-.31-.585-.575-.752-.265-.167-.619-.25-1.061-.25-.442 0-.82.113-1.135.339-.314.216-.51.54-.59.972h-1.267c.059-.51.23-.938.516-1.282a2.64 2.64 0 0 1 1.076-.796c.442-.187.909-.28 1.4-.28.698 0 1.272.128 1.724.383.453.246.787.595 1.003 1.047.216.442.324.968.324 1.577v4.923h-1.105l-.074-1.327a2.752 2.752 0 0 1-.383.59 2.465 2.465 0 0 1-.53.472 2.598 2.598 0 0 1-.708.324 2.9 2.9 0 0 1-.855.118Zm.177-1.047c.324 0 .623-.074.899-.22a2.27 2.27 0 0 0 .707-.59c.207-.256.364-.54.472-.855.108-.315.162-.644.162-.988v-.147h-1.828c-.462 0-.84.059-1.135.177-.285.118-.49.285-.619.5a1.317 1.317 0 0 0-.191.708c0 .285.059.536.177.752.117.206.29.368.515.486.236.118.516.177.84.177ZM72.488 44.967V34.649h3.316c.826 0 1.504.138 2.034.413.531.275.924.649 1.18 1.12.255.462.383.988.383 1.577 0 .58-.128 1.106-.383 1.577-.256.472-.649.845-1.18 1.12-.52.276-1.198.413-2.034.413h-2.078v4.098h-1.238Zm1.238-5.144h2.064c.864 0 1.469-.187 1.813-.56.353-.384.53-.885.53-1.504 0-.648-.177-1.154-.53-1.518-.344-.373-.949-.56-1.813-.56h-2.064v4.142Z"/></svg>
+  <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>
 `;
 
 export default PasswordManagerLogo;
diff --git a/libs/components/src/icon/logos/bitwarden/provider-portal.ts b/libs/components/src/icon/logos/bitwarden/provider-portal.ts
new file mode 100644
index 00000000000..b9c4d76b0e3
--- /dev/null
+++ b/libs/components/src/icon/logos/bitwarden/provider-portal.ts
@@ -0,0 +1,7 @@
+import { svgIcon } from "../../icon";
+
+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>
+`;
+
+export default ProviderPortalLogo;
diff --git a/libs/components/src/icon/logos/bitwarden/secrets-manager.ts b/libs/components/src/icon/logos/bitwarden/secrets-manager.ts
index bcba5f71d1a..45f3418b1e8 100644
--- a/libs/components/src/icon/logos/bitwarden/secrets-manager.ts
+++ b/libs/components/src/icon/logos/bitwarden/secrets-manager.ts
@@ -1,7 +1,7 @@
 import { svgIcon } from "../../icon";
 
 const SecretsManagerLogo = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 200 49"><path class="tw-fill-text-alt2" fill-rule="evenodd" d="M48.038 7.458c2.289 0 4.069.869 5.376 2.679 1.308 1.774 1.962 4.2 1.962 7.277 0 3.186-.654 5.647-1.998 7.385-1.344 1.774-3.16 2.607-5.449 2.607-2.288 0-4.032-.797-5.34-2.462h-.363l-.69 1.701a.672.672 0 0 1-.618.399h-2.906a.65.65 0 0 1-.654-.652V.942a.65.65 0 0 1 .654-.652h3.923a.65.65 0 0 1 .654.651v5.576c0 .796-.072 2.063-.218 3.8h.218c1.2-1.882 3.052-2.86 5.45-2.86Zm-1.67 4.236c-1.272 0-2.253.398-2.87 1.194-.582.797-.909 2.136-.909 3.946v.58c0 2.063.29 3.548.909 4.416.617.87 1.598 1.34 2.942 1.34 1.053 0 1.962-.507 2.579-1.52.617-.978.945-2.462.945-4.309 0-1.882-.328-3.294-.945-4.236-.654-.94-1.562-1.411-2.652-1.411ZM64.021 27.08h-3.924a.65.65 0 0 1-.654-.652V8.508a.65.65 0 0 1 .654-.652h3.924a.65.65 0 0 1 .653.652v17.884c.037.326-.29.688-.653.688Zm14.348-3.874c.763 0 1.671-.145 2.761-.434a.436.436 0 0 1 .545.434v3.005a.445.445 0 0 1-.254.398c-1.236.507-2.797.76-4.541.76-2.107 0-3.633-.506-4.577-1.592-.945-1.05-1.453-2.643-1.453-4.743v-9.232h-2.07a.419.419 0 0 1-.437-.434V9.666c0-.036.037-.072.037-.108l2.87-1.702 1.416-3.765c.073-.181.218-.29.4-.29h2.615c.254 0 .436.181.436.435v3.656h5.195c.109 0 .218.109.218.218v3.258a.419.419 0 0 1-.436.434h-4.94v9.196c0 .724.217 1.303.617 1.629.363.398.944.58 1.598.58Zm24.447 3.874c-.508 0-.908-.326-1.126-.796l-3.85-11.694c-.254-.833-.581-2.1-1.017-3.73h-.11l-.363 1.304-.762 2.462-3.96 11.694c-.145.47-.581.76-1.09.76-.508 0-.944-.326-1.09-.833L84.62 9.413c-.146-.507.254-1.05.835-1.05h.109a.85.85 0 0 1 .799.615l2.833 10.246c.69 2.679 1.163 4.634 1.38 5.937h.11c.653-2.679 1.162-4.453 1.489-5.358l3.669-10.716c.145-.434.545-.724 1.053-.724.473 0 .872.29 1.017.724l3.415 10.644c.836 2.715 1.344 4.453 1.526 5.358h.109c.109-.724.545-2.752 1.38-6.01l2.725-10.1a.85.85 0 0 1 .799-.616c.545 0 .944.507.799 1.05l-4.577 16.834c-.145.507-.581.833-1.126.833h-.146Zm21.578 0a.664.664 0 0 1-.654-.58l-.327-2.389h-.182c-.944 1.195-1.888 2.064-2.906 2.57-.98.508-2.179.725-3.523.725-1.853 0-3.269-.47-4.287-1.412-.908-.833-1.416-1.955-1.489-3.367-.145-1.883.654-3.693 2.18-4.743 1.562-1.013 3.741-1.629 6.684-1.629l3.559-.108v-1.231c0-1.81-.363-3.114-1.126-4.019-.762-.905-1.889-1.34-3.487-1.34-1.526 0-3.051.363-4.65 1.123a.799.799 0 0 1-1.053-.398c-.182-.399 0-.87.4-1.014 1.816-.724 3.596-1.122 5.412-1.122 2.071 0 3.596.543 4.65 1.629 1.017 1.05 1.525 2.751 1.525 4.96V26.5c-.036.217-.363.579-.726.579Zm-7.52-1.231c2.035 0 3.597-.58 4.723-1.701 1.162-1.123 1.743-2.752 1.743-4.743v-1.81l-3.269.145c-2.652.108-4.504.543-5.667 1.23-1.126.688-1.707 1.81-1.707 3.259 0 1.158.363 2.1 1.053 2.751.8.543 1.817.869 3.124.869ZM138.38 8.001c.545 0 1.09.036 1.708.109a.818.818 0 0 1 .69.94c-.073.435-.509.689-.945.616-.545-.072-1.089-.145-1.634-.145-1.599 0-2.906.688-3.923 2.028-1.018 1.34-1.526 3.077-1.526 5.104v9.486a.82.82 0 0 1-.836.832.82.82 0 0 1-.835-.832V9.123c0-.398.327-.724.726-.724.4 0 .727.29.727.688l.145 2.679h.109c.763-1.376 1.598-2.353 2.47-2.896.836-.58 1.889-.87 3.124-.87Zm12.787 0c1.344 0 2.543.253 3.524.724 1.017.47 1.889 1.34 2.651 2.534h.109a86.486 86.486 0 0 1-.109-4.236v-5.9c0-.471.364-.833.836-.833a.82.82 0 0 1 .835.832v25.306c0 .326-.254.58-.581.58a.589.589 0 0 1-.581-.543l-.363-2.354h-.146c-1.416 2.136-3.487 3.186-6.139 3.186-2.615 0-4.54-.796-5.957-2.425-1.344-1.63-2.071-3.947-2.071-7.024 0-3.222.654-5.684 2.035-7.421C146.59 8.87 148.552 8 151.167 8Zm0 1.557c-2.071 0-3.596.724-4.65 2.172-1.017 1.412-1.525 3.475-1.525 6.227 0 5.285 2.07 7.928 6.211 7.928 2.144 0 3.669-.615 4.65-1.846 1.017-1.231 1.489-3.258 1.489-6.082v-.29c0-2.896-.472-4.96-1.489-6.19-.944-1.304-2.506-1.92-4.686-1.92Zm21.759 17.848c-2.724 0-4.831-.833-6.393-2.534-1.526-1.666-2.289-4.019-2.289-7.024s.727-5.394 2.216-7.168c1.489-1.81 3.451-2.715 5.958-2.715 2.179 0 3.959.76 5.194 2.28 1.308 1.521 1.925 3.62 1.925 6.264v1.375h-13.513c.037 2.57.618 4.526 1.816 5.901 1.199 1.376 2.87 1.992 5.086 1.992 1.054 0 2.034-.073 2.834-.218a14.71 14.71 0 0 0 2.106-.579c.473-.18.981.181.981.688 0 .29-.181.58-.472.688-.872.362-1.707.58-2.47.724-.908.253-1.889.326-2.979.326Zm-.508-17.885c-1.817 0-3.27.58-4.36 1.774-1.089 1.159-1.707 2.897-1.925 5.105h11.624c0-2.136-.472-3.874-1.416-5.068-.945-1.195-2.252-1.81-3.923-1.81Zm26.299 17.559a.82.82 0 0 1-.835-.833V14.916c0-1.883-.4-3.259-1.163-4.091-.835-.833-2.034-1.304-3.705-1.304-2.252 0-3.887.543-4.904 1.702-1.017 1.122-1.598 2.969-1.598 5.467v9.485a.82.82 0 0 1-.836.832.82.82 0 0 1-.835-.832V9.123c0-.434.327-.76.763-.76.399 0 .69.29.763.652l.218 1.882h.109c1.235-1.955 3.378-2.932 6.502-2.932 4.25 0 6.393 2.28 6.393 6.842v11.368c-.036.507-.436.905-.872.905ZM62.097 0c-1.708 0-3.088 1.303-3.088 2.932v.29c0 1.593 1.416 2.933 3.087 2.933 1.671 0 3.088-1.34 3.088-2.933V2.97C65.184 1.303 63.767 0 62.096 0Z" clip-rule="evenodd"/><path class="tw-fill-text-alt2" d="M22.052 17.087V4.142h-9.08V27.14c1.608-.85 3.047-1.773 4.317-2.771 3.175-2.481 4.763-4.908 4.763-7.282Zm3.891-15.534v15.534c0 1.16-.226 2.31-.679 3.45a12.86 12.86 0 0 1-1.682 3.033 18.741 18.741 0 0 1-2.392 2.579c-.925.836-1.78 1.53-2.564 2.083a32.288 32.288 0 0 1-2.452 1.568c-.851.492-1.456.826-1.814 1.001-.358.175-.645.31-.861.405-.163.08-.338.12-.527.12-.19 0-.365-.04-.527-.12-.216-.095-.504-.23-.862-.405-.358-.175-.962-.509-1.814-1.001a32.279 32.279 0 0 1-2.452-1.568 27.823 27.823 0 0 1-2.564-2.083A18.74 18.74 0 0 1 2.36 23.57 12.857 12.857 0 0 1 .68 20.536 9.273 9.273 0 0 1 0 17.087V1.553C0 1.203.128.9.385.643S.945.26 1.297.26h23.35c.35 0 .655.128.911.384.257.256.385.56.385.91ZM195.682 44.967v-7.753h1.12l.088 1.415c.177-.354.408-.649.693-.884a2.853 2.853 0 0 1 1.032-.531 5.033 5.033 0 0 1 1.385-.177v1.297h-.766c-.295 0-.58.04-.855.118a2.183 2.183 0 0 0-.752.383 1.825 1.825 0 0 0-.516.722c-.128.305-.191.688-.191 1.15v4.26h-1.238ZM190.546 45.144c-.688 0-1.297-.167-1.827-.502-.531-.334-.949-.805-1.253-1.415-.295-.609-.442-1.321-.442-2.137 0-.815.147-1.528.442-2.137.304-.609.722-1.08 1.253-1.415.54-.334 1.159-.5 1.857-.5.747 0 1.371.166 1.872.5.501.334.879.781 1.135 1.342.255.56.383 1.174.383 1.842v.295c0 .098-.005.216-.015.353h-5.999v-.958h4.805c-.019-.756-.241-1.331-.663-1.724-.413-.403-.929-.604-1.548-.604a2.24 2.24 0 0 0-1.149.31 2.214 2.214 0 0 0-.84.884c-.217.392-.325.884-.325 1.473v.413c0 .649.108 1.194.325 1.636.216.433.496.757.84.973.353.216.737.324 1.149.324.551 0 .983-.103 1.297-.31.315-.215.546-.52.693-.913h1.223c-.117.432-.324.82-.619 1.164a2.941 2.941 0 0 1-1.09.81c-.433.197-.934.296-1.504.296ZM182.179 48.386c-.697 0-1.311-.088-1.842-.265-.521-.167-.929-.428-1.223-.781-.285-.354-.428-.791-.428-1.312 0-.246.044-.501.133-.767.098-.265.26-.52.486-.766.236-.245.565-.467.988-.663l.943.501c-.56.216-.924.467-1.091.752-.167.285-.25.56-.25.825 0 .324.093.595.28.81.196.217.467.379.81.487.344.108.742.162 1.194.162.443 0 .821-.059 1.135-.177.325-.108.57-.27.737-.486.177-.206.266-.452.266-.737 0-.413-.133-.737-.398-.973-.266-.226-.782-.358-1.548-.398a15 15 0 0 1-1.503-.162 6.95 6.95 0 0 1-1.003-.236 3.329 3.329 0 0 1-.648-.324 4.345 4.345 0 0 1-.457-.368v-.34l1.459-1.4 1.164.384-1.591 1.311.191-.56c.108.079.211.153.31.221.098.07.231.133.398.192.177.05.417.098.722.147.314.05.727.094 1.238.133.707.05 1.272.167 1.695.354.423.186.727.447.914.78.187.325.28.723.28 1.195 0 .413-.118.806-.354 1.179-.226.373-.589.678-1.091.914-.491.245-1.13.368-1.916.368Zm-.014-5.837c-.629 0-1.165-.117-1.607-.353a2.512 2.512 0 0 1-.987-.988 2.952 2.952 0 0 1-.339-1.415c0-.52.113-.987.339-1.4a2.605 2.605 0 0 1 1.002-.987c.442-.246.973-.369 1.592-.369.638 0 1.174.123 1.606.369.433.245.762.574.988.987.226.413.339.88.339 1.4 0 .521-.113.993-.339 1.415a2.508 2.508 0 0 1-.988.988c-.432.236-.968.354-1.606.354Zm0-1.017c.55 0 .977-.142 1.282-.427.305-.295.457-.732.457-1.312 0-.58-.152-1.012-.457-1.297-.305-.285-.732-.427-1.282-.427-.521 0-.949.142-1.283.427-.324.285-.486.718-.486 1.297 0 .58.157 1.017.472 1.312.324.285.756.428 1.297.428Zm1.297-3.271-.369-1.047h3.036v.928l-2.667.118ZM173.442 45.144c-.589 0-1.081-.108-1.474-.325a2.252 2.252 0 0 1-.884-.884 2.533 2.533 0 0 1-.295-1.194c0-.51.128-.943.384-1.297.265-.364.633-.639 1.105-.825.472-.187 1.022-.28 1.651-.28h1.931c0-.502-.059-.92-.177-1.253a1.407 1.407 0 0 0-.575-.752c-.265-.167-.619-.25-1.061-.25-.443 0-.821.113-1.135.339-.315.216-.511.54-.59.972h-1.267c.059-.51.231-.938.515-1.282.285-.354.644-.619 1.076-.796.443-.187.909-.28 1.401-.28.697 0 1.272.128 1.724.383.452.246.786.595 1.002 1.047.217.442.325.968.325 1.577v4.923h-1.106l-.073-1.327a2.752 2.752 0 0 1-.384.59 2.459 2.459 0 0 1-.53.472 2.6 2.6 0 0 1-.708.324c-.255.078-.54.118-.855.118Zm.177-1.047c.324 0 .624-.074.899-.22a2.28 2.28 0 0 0 .708-.59 2.8 2.8 0 0 0 .471-.855c.109-.315.163-.644.163-.988v-.147h-1.828c-.462 0-.84.059-1.135.177-.285.118-.491.285-.619.5a1.315 1.315 0 0 0-.192.708c0 .285.059.536.177.752.118.206.29.368.516.486.236.118.516.177.84.177ZM162.504 44.967v-7.753h1.12l.059 1.223c.226-.442.55-.786.973-1.031.432-.246.929-.369 1.489-.369.57 0 1.066.108 1.488.324.423.217.752.546.988.988.236.442.354 1.002.354 1.68v4.938h-1.239v-4.805c0-.688-.172-1.204-.515-1.548-.335-.344-.787-.516-1.356-.516-.384 0-.737.094-1.062.28a1.97 1.97 0 0 0-.781.796c-.187.354-.28.786-.28 1.297v4.496h-1.238ZM156.803 45.144c-.589 0-1.081-.108-1.474-.325a2.246 2.246 0 0 1-.884-.884 2.52 2.52 0 0 1-.295-1.194c0-.51.128-.943.383-1.297.266-.364.634-.639 1.106-.825.471-.187 1.022-.28 1.651-.28h1.93c0-.502-.059-.92-.176-1.253a1.407 1.407 0 0 0-.575-.752c-.266-.167-.619-.25-1.062-.25-.442 0-.82.113-1.134.339-.315.216-.511.54-.59.972h-1.268c.059-.51.231-.938.516-1.282.285-.354.644-.619 1.076-.796.442-.187.909-.28 1.4-.28.698 0 1.273.128 1.725.383.452.246.786.595 1.002 1.047.216.442.324.968.324 1.577v4.923h-1.105l-.074-1.327a2.747 2.747 0 0 1-.383.59 2.459 2.459 0 0 1-.53.472 2.614 2.614 0 0 1-.708.324c-.255.078-.54.118-.855.118Zm.177-1.047c.324 0 .624-.074.899-.22a2.28 2.28 0 0 0 .708-.59 2.8 2.8 0 0 0 .471-.855c.108-.315.162-.644.162-.988v-.147h-1.827c-.462 0-.84.059-1.135.177-.285.118-.491.285-.619.5a1.315 1.315 0 0 0-.192.708c0 .285.059.536.177.752.118.206.29.368.516.486.236.118.516.177.84.177ZM142.312 44.967V34.649h1.444l3.508 7.267 3.479-7.267h1.459v10.318h-1.238v-8.092l-3.243 6.736h-.929l-3.242-6.677v8.033h-1.238ZM133.566 45.144c-.697 0-1.277-.103-1.739-.31-.452-.216-.796-.51-1.032-.884a3.074 3.074 0 0 1-.427-1.327h1.268c.039.266.127.511.265.737.147.216.359.393.634.53.275.138.624.207 1.046.207.334 0 .619-.049.855-.147.236-.108.413-.256.531-.442.127-.187.191-.403.191-.649 0-.324-.073-.575-.221-.752-.137-.186-.344-.324-.619-.412a4.49 4.49 0 0 0-1.002-.221 6.701 6.701 0 0 1-1.15-.251 2.905 2.905 0 0 1-.855-.427 1.713 1.713 0 0 1-.516-.664 2.324 2.324 0 0 1-.176-.943c0-.422.113-.796.339-1.12.226-.324.545-.575.958-.752.422-.187.918-.28 1.488-.28.836 0 1.494.192 1.975.575.492.383.782.928.87 1.636h-1.223a1.214 1.214 0 0 0-.502-.855c-.284-.206-.663-.31-1.134-.31-.502 0-.88.094-1.135.28a.87.87 0 0 0-.384.738c0 .226.054.432.163.619.117.177.314.329.589.456.275.118.644.207 1.106.266.579.069 1.071.182 1.473.339.403.147.708.378.914.693.216.314.32.742.31 1.282 0 .51-.123.943-.369 1.297-.235.354-.57.624-1.002.81-.422.187-.919.28-1.489.28ZM127.785 44.967c-.442 0-.825-.07-1.15-.207a1.512 1.512 0 0 1-.751-.692c-.167-.334-.251-.782-.251-1.342V38.26h-1.356v-1.046h1.356l.162-1.93h1.076v1.93h2.196v1.046h-2.196v4.466c0 .462.094.777.28.944.187.157.516.236.988.236h.899v1.06h-1.253ZM119.888 45.144c-.688 0-1.297-.167-1.828-.502-.531-.334-.948-.805-1.253-1.415-.295-.609-.442-1.321-.442-2.137 0-.815.147-1.528.442-2.137.305-.609.722-1.08 1.253-1.415.54-.334 1.159-.5 1.857-.5.747 0 1.371.166 1.872.5.501.334.879.781 1.135 1.342.255.56.383 1.174.383 1.842v.295c0 .098-.005.216-.015.353h-5.998v-.958h4.805c-.02-.756-.241-1.331-.664-1.724-.412-.403-.928-.604-1.547-.604-.413 0-.796.103-1.15.31a2.214 2.214 0 0 0-.84.884c-.216.392-.324.884-.324 1.473v.413c0 .649.108 1.194.324 1.636.216.433.496.757.84.973.354.216.737.324 1.15.324.55 0 .982-.103 1.297-.31.314-.215.545-.52.692-.913h1.224c-.118.432-.324.82-.619 1.164a2.945 2.945 0 0 1-1.091.81c-.432.197-.933.296-1.503.296ZM111.205 44.967v-7.753h1.12l.089 1.415a2.68 2.68 0 0 1 .692-.884 2.853 2.853 0 0 1 1.032-.531 5.045 5.045 0 0 1 1.386-.177v1.297h-.767c-.295 0-.58.04-.855.118a2.178 2.178 0 0 0-.751.383 1.805 1.805 0 0 0-.516.722c-.128.305-.192.688-.192 1.15v4.26h-1.238ZM106.044 45.144c-.707 0-1.336-.167-1.887-.502a3.59 3.59 0 0 1-1.297-1.43c-.314-.608-.471-1.316-.471-2.122 0-.815.157-1.523.471-2.122.315-.61.747-1.08 1.297-1.415.551-.344 1.18-.516 1.887-.516.884 0 1.621.236 2.211.708.599.471.983 1.105 1.15 1.9h-1.268c-.108-.49-.359-.869-.752-1.134-.383-.275-.835-.413-1.356-.413a2.27 2.27 0 0 0-1.223.34c-.354.225-.634.56-.84 1.002-.206.442-.31.992-.31 1.65 0 .492.059.929.177 1.312.118.373.28.688.487.944.216.245.466.432.751.56.295.127.614.191.958.191.354 0 .673-.059.958-.177a1.95 1.95 0 0 0 .737-.545c.207-.236.344-.516.413-.84h1.268a3.123 3.123 0 0 1-1.15 1.886c-.599.482-1.336.723-2.211.723ZM97.563 45.144c-.688 0-1.297-.167-1.828-.502-.53-.334-.948-.805-1.252-1.415-.295-.609-.443-1.321-.443-2.137 0-.815.148-1.528.443-2.137.304-.609.722-1.08 1.252-1.415.54-.334 1.16-.5 1.858-.5.746 0 1.37.166 1.871.5.502.334.88.781 1.135 1.342a4.38 4.38 0 0 1 .384 1.842v.295c0 .098-.005.216-.015.353h-5.999v-.958h4.805c-.02-.756-.24-1.331-.663-1.724-.413-.403-.929-.604-1.548-.604-.413 0-.796.103-1.15.31a2.215 2.215 0 0 0-.84.884c-.216.392-.324.884-.324 1.473v.413c0 .649.108 1.194.324 1.636.216.433.497.757.84.973.354.216.737.324 1.15.324.55 0 .983-.103 1.297-.31a1.87 1.87 0 0 0 .693-.913h1.223c-.118.432-.324.82-.619 1.164a2.94 2.94 0 0 1-1.09.81c-.433.197-.934.296-1.504.296ZM89.104 45.144c-.757 0-1.415-.138-1.975-.413a3.084 3.084 0 0 1-1.297-1.15c-.305-.491-.457-1.06-.457-1.71h1.297c0 .403.093.777.28 1.12.186.335.457.605.81.811.364.197.811.295 1.342.295.462 0 .855-.074 1.179-.22.334-.158.585-.37.752-.635.177-.265.265-.565.265-.899 0-.373-.084-.683-.25-.928a1.755 1.755 0 0 0-.664-.62 5.43 5.43 0 0 0-.987-.442c-.374-.127-.777-.26-1.21-.398-.864-.275-1.493-.619-1.886-1.031-.383-.423-.575-.963-.575-1.622 0-.56.128-1.05.384-1.474a2.679 2.679 0 0 1 1.12-.987c.491-.246 1.07-.369 1.74-.369.657 0 1.227.123 1.709.369.491.246.874.585 1.15 1.017.275.423.412.914.412 1.474h-1.297a1.76 1.76 0 0 0-.22-.84 1.729 1.729 0 0 0-.679-.678c-.295-.187-.668-.28-1.12-.28a2.202 2.202 0 0 0-1.002.191c-.285.128-.511.315-.678.56-.158.246-.236.546-.236.9 0 .334.069.604.206.81.148.207.354.383.62.53.274.138.594.266.957.384.364.118.767.25 1.209.398.501.167.943.373 1.326.619.393.236.698.54.914.914.226.373.34.85.34 1.43 0 .49-.133.958-.399 1.4-.255.432-.638.786-1.15 1.061-.51.275-1.154.413-1.93.413Z"/></svg>
+  <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>
 `;
 
 export default SecretsManagerLogo;
diff --git a/libs/components/src/icon/logos/bitwarden/shield.ts b/libs/components/src/icon/logos/bitwarden/shield.ts
index b942715bb6d..d736a44ba3e 100644
--- a/libs/components/src/icon/logos/bitwarden/shield.ts
+++ b/libs/components/src/icon/logos/bitwarden/shield.ts
@@ -10,7 +10,7 @@ const AnonLayoutBitwardenShield = svgIcon`
 `;
 
 const BitwardenShield = svgIcon`
-  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 28 33"><path d="M26.696.403A1.274 1.274 0 0 0 25.764 0H1.83C1.467 0 1.16.137.898.403a1.294 1.294 0 0 0-.398.944v16.164c0 1.203.235 2.405.697 3.587.462 1.188 1.038 2.24 1.728 3.155.682.922 1.5 1.815 2.453 2.68a28.077 28.077 0 0 0 2.63 2.167 32.181 32.181 0 0 0 2.518 1.628c.875.511 1.493.857 1.863 1.045.37.18.661.324.882.417.163.087.348.13.54.13.192 0 .377-.043.54-.13.221-.1.52-.237.882-.417.37-.18.989-.534 1.863-1.045a34.4 34.4 0 0 0 2.517-1.628c.804-.576 1.679-1.296 2.631-2.168a20.206 20.206 0 0 0 2.454-2.68 13.599 13.599 0 0 0 1.72-3.154c.463-1.189.697-2.384.697-3.587V1.347a1.406 1.406 0 0 0-.42-.944ZM23.61 17.662c0 5.849-9.813 10.89-9.813 10.89V3.458h9.813v14.205Z" class="tw-fill-marketing-logo"/></svg>
+  <svg xmlns="http://www.w3.org/2000/svg" width="26" height="32" fill="none"><g clip-path="url(#a)"><path class="tw-fill-text-alt2" 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.256 9.256 0 0 1-.677 3.442 12.828 12.828 0 0 1-1.68 3.029 18.708 18.708 0 0 1-2.386 2.574 27.808 27.808 0 0 1-2.56 2.08 32.251 32.251 0 0 1-2.448 1.564c-.85.49-1.453.824-1.81.999-.357.175-.644.31-.86.404-.162.08-.337.12-.526.12s-.364-.04-.526-.12a22.99 22.99 0 0 1-.86-.404c-.357-.175-.96-.508-1.81-1a32.242 32.242 0 0 1-2.448-1.564 27.796 27.796 0 0 1-2.56-2.08 18.706 18.706 0 0 1-2.386-2.573 12.828 12.828 0 0 1-1.68-3.029A9.256 9.256 0 0 1 0 17.055V1.551C0 1.2.128.898.384.642.641.386.944.26 1.294.26H24.6c.35 0 .654.127.91.383s.384.559.384.909Z"/></g><defs><clipPath id="a"><path class="tw-fill-text-alt2" d="M0 0h26v32H0z"/></clipPath></defs></svg>
 `;
 
 export { AnonLayoutBitwardenShield, BitwardenShield };
diff --git a/libs/components/src/item/item-action.component.ts b/libs/components/src/item/item-action.component.ts
index c47ee8eea69..acbc805cf90 100644
--- a/libs/components/src/item/item-action.component.ts
+++ b/libs/components/src/item/item-action.component.ts
@@ -10,7 +10,7 @@ import { Component } from "@angular/core";
        * `top` and `bottom` units should be kept in sync with `item-content.component.ts`'s y-axis padding.
        * we want this `:after` element to be the same height as the `item-content`
        */
-      "[&>button]:tw-relative [&>button:not([bit-item-content])]:after:tw-content-[''] [&>button]:after:tw-absolute [&>button]:after:tw-block bit-compact:[&>button]:after:tw-top-[-0.7rem] bit-compact:[&>button]:after:tw-bottom-[-0.7rem] [&>button]:after:tw-top-[-0.8rem] [&>button]:after:tw-bottom-[-0.80rem] [&>button]:after:tw-right-[-0.25rem] [&>button]:after:tw-left-[-0.25rem]",
+      "[&>button]:tw-relative [&>button:not([bit-item-content])]:after:tw-content-[''] [&>button]:after:tw-absolute [&>button]:after:tw-block bit-compact:[&>button]:after:tw-top-[-0.7rem] bit-compact:[&>button]:after:tw-bottom-[-0.7rem] [&>button]:after:tw-top-[-0.8rem] [&>button]:after:tw-bottom-[-0.80rem] [&>button]:after:tw-right-0 [&>button]:after:tw-left-0",
   },
 })
 export class ItemActionComponent {}
diff --git a/libs/components/src/item/item.component.html b/libs/components/src/item/item.component.html
index 2863bb2891b..bdb8ee45d0a 100644
--- a/libs/components/src/item/item.component.html
+++ b/libs/components/src/item/item.component.html
@@ -4,7 +4,7 @@
 
 <div
   #endSlot
-  class="tw-p-2 tw-flex tw-gap-1 tw-items-center"
+  class="tw-px-2 tw-flex tw-items-center tw-gap-2 [&_button[biticonbutton]]:-tw-mx-1"
   [hidden]="endSlot.childElementCount === 0"
 >
   <ng-content select="[slot=end]"></ng-content>
diff --git a/libs/components/src/item/item.stories.ts b/libs/components/src/item/item.stories.ts
index d23caa63370..6187266c40c 100644
--- a/libs/components/src/item/item.stories.ts
+++ b/libs/components/src/item/item.stories.ts
@@ -397,7 +397,7 @@ export const VirtualScrolling: Story = {
       data: Array.from(Array(100000).keys()),
     },
     template: /*html*/ `
-      <cdk-virtual-scroll-viewport [itemSize]="59" class="tw-h-[500px]">
+      <cdk-virtual-scroll-viewport [itemSize]="54" class="tw-h-[500px]">
         <bit-item-group aria-label="Virtual Scrolling">
           <bit-item *cdkVirtualFor="let item of data">
             <button bit-item-content>
diff --git a/libs/components/src/navigation/nav-group.component.html b/libs/components/src/navigation/nav-group.component.html
index d63cf5d8814..f27dd5ba10e 100644
--- a/libs/components/src/navigation/nav-group.component.html
+++ b/libs/components/src/navigation/nav-group.component.html
@@ -15,7 +15,7 @@
         type="button"
         class="tw-ms-auto"
         [bitIconButton]="open() ? 'bwi-angle-up' : 'bwi-angle-down'"
-        [buttonType]="'light'"
+        [buttonType]="'nav-contrast'"
         (click)="toggle($event)"
         size="small"
         [title]="'toggleCollapse' | i18n"
diff --git a/libs/components/src/navigation/nav-item.component.html b/libs/components/src/navigation/nav-item.component.html
index f8e27dfc571..f7d55a33362 100644
--- a/libs/components/src/navigation/nav-item.component.html
+++ b/libs/components/src/navigation/nav-item.component.html
@@ -17,8 +17,8 @@
         <ng-template #anchorAndButtonContent>
           <div
             [title]="text()"
-            class="tw-gap-2 tw-items-center tw-font-bold tw-h-full tw-content-center"
-            [ngClass]="{ 'tw-text-center': !open, 'tw-flex': open }"
+            class="tw-gap-2 tw-flex tw-items-center tw-font-bold tw-h-full"
+            [ngClass]="{ 'tw-justify-center': !open }"
           >
             <i
               class="!tw-m-0 tw-w-4 tw-shrink-0 bwi bwi-fw tw-text-alt2 {{ icon() }}"
@@ -36,7 +36,7 @@
           <!-- The `data-fvw` attribute passes focus to `this.focusVisibleWithin$` -->
           <!-- The following `class` field should match the `#isButton` class field below -->
           <a
-            class="tw-size-full tw-px-3 tw-block tw-truncate tw-border-none tw-bg-transparent tw-text-start !tw-text-alt2 hover:tw-text-alt2 hover:tw-no-underline focus:tw-outline-none"
+            class="tw-size-full tw-px-4 tw-block tw-truncate tw-border-none tw-bg-transparent tw-text-start !tw-text-alt2 hover:tw-text-alt2 hover:tw-no-underline focus:tw-outline-none [&_i]:tw-leading-[1.5rem]"
             data-fvw
             [routerLink]="route()"
             [relativeTo]="relativeTo()"
@@ -56,7 +56,7 @@
           <!-- Class field should match `#isAnchor` class field above -->
           <button
             type="button"
-            class="tw-size-full tw-px-3 tw-truncate tw-border-none tw-bg-transparent tw-text-start !tw-text-alt2 hover:tw-text-alt2 hover:tw-no-underline focus:tw-outline-none"
+            class="tw-size-full tw-px-4 tw-pe-3 tw-truncate tw-border-none tw-bg-transparent tw-text-start !tw-text-alt2 hover:tw-text-alt2 hover:tw-no-underline focus:tw-outline-none [&_i]:tw-leading-[1.5rem]"
             data-fvw
             (click)="mainContentClicked.emit()"
           >
@@ -66,7 +66,7 @@
 
         @if (open) {
           <div
-            class="tw-flex tw-items-center tw-pe-1.5 tw-gap-1 [&>*:focus-visible::before]:!tw-ring-text-alt2 [&>*:hover]:!tw-border-text-alt2 [&>*]:tw-text-alt2 empty:tw-hidden"
+            class="tw-flex tw-items-center tw-pe-1 tw-gap-1 [&>*:focus-visible::before]:!tw-ring-text-alt2 [&>*:hover]:!tw-border-text-alt2 [&>*]:tw-text-alt2 empty:tw-hidden"
           >
             <ng-content select="[slot=end]"></ng-content>
           </div>
diff --git a/libs/components/src/navigation/nav-item.stories.ts b/libs/components/src/navigation/nav-item.stories.ts
index c51cffabb1d..94d7d33cea3 100644
--- a/libs/components/src/navigation/nav-item.stories.ts
+++ b/libs/components/src/navigation/nav-item.stories.ts
@@ -92,7 +92,7 @@ export const WithChildButtons: Story = {
           slot="end"
           class="tw-ms-auto"
           [bitIconButton]="'bwi-pencil-square'"
-          [buttonType]="'light'"
+          [buttonType]="'nav-contrast'"
           size="small"
           aria-label="option 2"
         ></button>
@@ -100,7 +100,7 @@ export const WithChildButtons: Story = {
           slot="end"
           class="tw-ms-auto"
           [bitIconButton]="'bwi-check'"
-          [buttonType]="'light'"
+          [buttonType]="'nav-contrast'"
           size="small"
           aria-label="option 3"
         ></button>
diff --git a/libs/components/src/navigation/nav-logo.component.html b/libs/components/src/navigation/nav-logo.component.html
index 86d983fa632..fa59724aad5 100644
--- a/libs/components/src/navigation/nav-logo.component.html
+++ b/libs/components/src/navigation/nav-logo.component.html
@@ -1,14 +1,18 @@
 <div
   [ngClass]="{
     'tw-sticky tw-top-0 tw-z-50 tw-pb-2': sideNavService.open,
-    'tw-pb-5': !sideNavService.open,
+    'tw-pb-[calc(theme(spacing.6)_+_2px)]': !sideNavService.open,
   }"
   class="tw-px-2 tw-pt-5"
 >
+  <!-- absolutely position the link svg to avoid shifting layout when sidenav is closed -->
   <a
     [routerLink]="route()"
-    class="tw-p-3 tw-block tw-rounded-md tw-bg-background-alt3 tw-outline-none focus-visible:tw-ring focus-visible:tw-ring-inset focus-visible:tw-ring-text-alt2 hover:tw-bg-hover-contrast [&_path]:tw-fill-text-alt2"
-    [ngClass]="{ '[&_svg]:tw-w-[1.687rem]': !sideNavService.open }"
+    class="tw-relative tw-p-3 tw-block tw-rounded-md tw-bg-background-alt3 tw-outline-none focus-visible:tw-ring focus-visible:tw-ring-inset focus-visible:tw-ring-text-alt2 hover:tw-bg-hover-contrast tw-h-[73px] [&_svg]:tw-absolute [&_svg]:tw-inset-[theme(spacing.3)] [&_svg]:tw-w-[calc(100%_-_theme(spacing.6))] [&_svg]:tw-transition-[inline-start-inset]"
+    [ngClass]="{
+      '!tw-h-[55px] [&_svg]:!tw-w-[26px] [&_svg]:tw-inset-y-[theme(spacing.3)]':
+        !sideNavService.open,
+    }"
     [attr.aria-label]="label()"
     [title]="label()"
     routerLinkActive
diff --git a/libs/components/src/navigation/side-nav.component.html b/libs/components/src/navigation/side-nav.component.html
index 46ccc13bc8a..a5866b5e42e 100644
--- a/libs/components/src/navigation/side-nav.component.html
+++ b/libs/components/src/navigation/side-nav.component.html
@@ -34,7 +34,7 @@
           type="button"
           class="tw-mx-auto tw-block tw-max-w-fit"
           [bitIconButton]="data.open ? 'bwi-angle-left' : 'bwi-angle-right'"
-          buttonType="light"
+          buttonType="nav-contrast"
           size="small"
           (click)="sideNavService.toggle()"
           [attr.aria-label]="'toggleSideNavigation' | i18n"
diff --git a/libs/components/src/popover/popover.component.html b/libs/components/src/popover/popover.component.html
index dfcf3ff5d01..03b6eaf77e3 100644
--- a/libs/components/src/popover/popover.component.html
+++ b/libs/components/src/popover/popover.component.html
@@ -4,8 +4,8 @@
       <div
         class="tw-relative tw-z-20 tw-w-72 tw-break-words tw-bg-background tw-pb-4 tw-pt-2 tw-text-main"
       >
-        <div class="tw-mb-1 tw-me-2 tw-flex tw-items-start tw-justify-between tw-gap-4 tw-ps-4">
-          <h2 bitTypography="h5" class="tw-mt-1 tw-font-semibold">
+        <div class="tw-me-2 tw-flex tw-items-start tw-justify-between tw-gap-4 tw-ps-4">
+          <h2 bitTypography="h5" class="tw-font-semibold tw-mt-1">
             {{ title() }}
           </h2>
           <button
@@ -15,7 +15,6 @@
             [attr.aria-label]="'close' | i18n"
             (click)="closed.emit()"
             size="small"
-            class="tw-mt-0.5"
           ></button>
         </div>
         <div bitTypography="body2" class="tw-px-4">
diff --git a/libs/components/src/popover/popover.stories.ts b/libs/components/src/popover/popover.stories.ts
index 100990decca..d1446f917f2 100644
--- a/libs/components/src/popover/popover.stories.ts
+++ b/libs/components/src/popover/popover.stories.ts
@@ -68,7 +68,7 @@ const popoverContent = /*html*/ `
       <li>Esse labore veniam tempora</li>
       <li>Adipisicing elit ipsum <a href="#" bitLink>iustolaborum</a></li>
     </ul>
-    <button bitButton class="tw-mt-3" (click)="triggerRef.closePopover()">Close</button>
+    <button bitButton class="tw-mt-4" (click)="triggerRef.closePopover()">Close</button>
   </bit-popover>
 `;
 
diff --git a/libs/components/src/search/search.component.html b/libs/components/src/search/search.component.html
index b1b92fb151a..a20b077e71d 100644
--- a/libs/components/src/search/search.component.html
+++ b/libs/components/src/search/search.component.html
@@ -2,7 +2,7 @@
   role="search"
   (mouseenter)="isFormHovered.set(true)"
   (mouseleave)="isFormHovered.set(false)"
-  class="tw-relative tw-flex tw-items-center tw-w-full"
+  class="tw-relative tw-flex tw-items-center tw-w-full tw-h-10"
 >
   <label class="tw-sr-only" [for]="id">{{ "search" | i18n }}</label>
   <label
@@ -18,7 +18,7 @@
     [type]="inputType"
     [id]="id"
     [placeholder]="placeholder() ?? ('search' | i18n)"
-    class="tw-ps-9"
+    class="tw-ps-9 tw-h-full"
     name="searchText"
     [ngModel]="searchText"
     (ngModelChange)="onChange($event)"
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 904b9e11c3a..9eb68d3f23f 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
@@ -19,7 +19,7 @@ import { TableDataSource, TableModule } from "../../../table";
     ScrollLayoutDirective,
   ],
   template: /*html*/ `<bit-section>
-    <cdk-virtual-scroll-viewport bitScrollLayout itemSize="63.5">
+    <cdk-virtual-scroll-viewport bitScrollLayout itemSize="49.5">
       <bit-table [dataSource]="dataSource">
         <ng-container header>
           <tr>
diff --git a/libs/components/src/table/cell.directive.ts b/libs/components/src/table/cell.directive.ts
index 61c75571063..7335804e635 100644
--- a/libs/components/src/table/cell.directive.ts
+++ b/libs/components/src/table/cell.directive.ts
@@ -5,6 +5,6 @@ import { Directive, HostBinding } from "@angular/core";
 })
 export class CellDirective {
   @HostBinding("class") get classList() {
-    return ["tw-p-3"];
+    return ["tw-p-3", "has-[[biticonbutton]]:tw-py-1"];
   }
 }
diff --git a/libs/components/src/toast/toast.component.html b/libs/components/src/toast/toast.component.html
index f969a3b4b50..a110336856e 100644
--- a/libs/components/src/toast/toast.component.html
+++ b/libs/components/src/toast/toast.component.html
@@ -23,6 +23,7 @@
       bitIconButton="bwi-close"
       buttonType="main"
       type="button"
+      size="small"
       (click)="this.onClose.emit()"
     ></button>
   </div>
diff --git a/libs/importer/src/importers/base-importer.ts b/libs/importer/src/importers/base-importer.ts
index 1a97bc5a325..4c25a01f965 100644
--- a/libs/importer/src/importers/base-importer.ts
+++ b/libs/importer/src/importers/base-importer.ts
@@ -9,6 +9,7 @@ import { normalizeExpiryYearFormat } from "@bitwarden/common/autofill/utils";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
+import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
@@ -20,7 +21,7 @@ import { SecureNoteView } from "@bitwarden/common/vault/models/view/secure-note.
 import { ImportResult } from "../models/import-result";
 
 export abstract class BaseImporter {
-  organizationId: string = null;
+  organizationId: OrganizationId = null;
 
   // FIXME: This should be replaced by injecting the log service.
   protected logService: LogService = new ConsoleLogService(false);
@@ -279,7 +280,7 @@ export abstract class BaseImporter {
     result.collections = result.folders.map((f) => {
       const collection = new CollectionView();
       collection.name = f.name;
-      collection.id = f.id ?? undefined; // folder id may be null, which is not suitable for collections.
+      collection.id = (f.id as CollectionId) ?? undefined; // folder id may be null, which is not suitable for collections.
       return collection;
     });
     result.folderRelationships = [];
diff --git a/libs/importer/src/importers/keeper/keeper-csv-importer.spec.ts b/libs/importer/src/importers/keeper/keeper-csv-importer.spec.ts
index 026c501cf5a..b326bc5d351 100644
--- a/libs/importer/src/importers/keeper/keeper-csv-importer.spec.ts
+++ b/libs/importer/src/importers/keeper/keeper-csv-importer.spec.ts
@@ -1,4 +1,5 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 
 import {
   testData as TestData,
@@ -103,7 +104,7 @@ describe("Keeper CSV Importer", () => {
   });
 
   it("should create collections, with subcollections and relationships", async () => {
-    importer.organizationId = Utils.newGuid();
+    importer.organizationId = Utils.newGuid() as OrganizationId;
     const result = await importer.parse(TestData);
     expect(result != null).toBe(true);
 
@@ -126,7 +127,7 @@ describe("Keeper CSV Importer", () => {
   });
 
   it("should create collections tree, with child collections and relationships", async () => {
-    importer.organizationId = Utils.newGuid();
+    importer.organizationId = Utils.newGuid() as OrganizationId;
     const result = await importer.parse(testDataMultiCollection);
     expect(result != null).toBe(true);
 
diff --git a/libs/importer/src/importers/keeper/keeper-json-importer.spec.ts b/libs/importer/src/importers/keeper/keeper-json-importer.spec.ts
index 22008f3b4c1..1141897a044 100644
--- a/libs/importer/src/importers/keeper/keeper-json-importer.spec.ts
+++ b/libs/importer/src/importers/keeper/keeper-json-importer.spec.ts
@@ -1,4 +1,5 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 
 import { testData as TestData } from "../spec-data/keeper-json/testdata.json";
 
@@ -93,7 +94,7 @@ describe("Keeper Json Importer", () => {
   });
 
   it("should create collections if part of an organization", async () => {
-    importer.organizationId = Utils.newGuid();
+    importer.organizationId = Utils.newGuid() as OrganizationId;
     const result = await importer.parse(testDataJson);
     expect(result != null).toBe(true);
 
diff --git a/libs/importer/src/importers/netwrix/netwrix-passwordsecure-csv-importer.spec.ts b/libs/importer/src/importers/netwrix/netwrix-passwordsecure-csv-importer.spec.ts
index 8736b3df0c8..b5479ce83cc 100644
--- a/libs/importer/src/importers/netwrix/netwrix-passwordsecure-csv-importer.spec.ts
+++ b/libs/importer/src/importers/netwrix/netwrix-passwordsecure-csv-importer.spec.ts
@@ -1,4 +1,5 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 
 import {
   credentialsData,
@@ -79,7 +80,7 @@ describe("Netwrix Password Secure CSV Importer", () => {
   });
 
   it("should parse an item and create a collection when importing into an organization", async () => {
-    importer.organizationId = Utils.newGuid();
+    importer.organizationId = Utils.newGuid() as OrganizationId;
     const result = await importer.parse(credentialsData);
 
     expect(result).not.toBeNull();
@@ -93,7 +94,7 @@ describe("Netwrix Password Secure CSV Importer", () => {
   });
 
   it("should parse multiple collections", async () => {
-    importer.organizationId = Utils.newGuid();
+    importer.organizationId = Utils.newGuid() as OrganizationId;
     const result = await importer.parse(credentialsDataWithFolders);
 
     expect(result).not.toBeNull();
diff --git a/libs/importer/src/importers/nordpass-csv-importer.spec.ts b/libs/importer/src/importers/nordpass-csv-importer.spec.ts
index cadc7bca28c..e633310e6ee 100644
--- a/libs/importer/src/importers/nordpass-csv-importer.spec.ts
+++ b/libs/importer/src/importers/nordpass-csv-importer.spec.ts
@@ -1,4 +1,5 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { SecureNoteType, CipherType, FieldType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view";
@@ -224,7 +225,7 @@ describe("NordPass CSV Importer", () => {
   });
 
   it("should parse an item and create a collection if organizationId is set", async () => {
-    importer.organizationId = Utils.newGuid();
+    importer.organizationId = Utils.newGuid() as OrganizationId;
     const result = await importer.parse(secureNoteData);
 
     expect(result).not.toBeNull();
diff --git a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.spec.ts b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.spec.ts
index d4976f7a198..1ca12a9ce69 100644
--- a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.spec.ts
+++ b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.spec.ts
@@ -1,4 +1,5 @@
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { FieldType, SecureNoteType, CipherType } from "@bitwarden/common/vault/enums";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
@@ -691,7 +692,7 @@ describe("1Password 1Pux Importer", () => {
 
   it("should create collections if part of an organization", async () => {
     const importer = new OnePassword1PuxImporter();
-    importer.organizationId = Utils.newGuid();
+    importer.organizationId = Utils.newGuid() as OrganizationId;
     const result = await importer.parse(SanitizedExportJson);
     expect(result != null).toBe(true);
 
diff --git a/libs/importer/src/importers/passsordxp/passwordxp-csv-importer.spec.ts b/libs/importer/src/importers/passsordxp/passwordxp-csv-importer.spec.ts
index 12cfbbe62bb..67d90ef966a 100644
--- a/libs/importer/src/importers/passsordxp/passwordxp-csv-importer.spec.ts
+++ b/libs/importer/src/importers/passsordxp/passwordxp-csv-importer.spec.ts
@@ -1,3 +1,4 @@
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { CipherType } from "@bitwarden/common/vault/enums";
 
 import { ImportResult } from "../../models/import-result";
@@ -146,7 +147,7 @@ describe("PasswordXPCsvImporter", () => {
   });
 
   it("should convert folders to collections when importing into an organization", async () => {
-    importer.organizationId = "someOrg";
+    importer.organizationId = "someOrg" as OrganizationId;
     const result: ImportResult = await importer.parse(withFolders);
     expect(result.success).toBe(true);
     expect(result.ciphers.length).toBe(5);
@@ -172,7 +173,7 @@ describe("PasswordXPCsvImporter", () => {
   });
 
   it("should convert multi-level folders to collections when importing into an organization", async () => {
-    importer.organizationId = "someOrg";
+    importer.organizationId = "someOrg" as OrganizationId;
     const result: ImportResult = await importer.parse(withMultipleFolders);
     expect(result.success).toBe(true);
     expect(result.ciphers.length).toBe(5);
diff --git a/libs/importer/src/importers/password-depot/password-depot-17-xml-importer.spec.ts b/libs/importer/src/importers/password-depot/password-depot-17-xml-importer.spec.ts
index ea84603aef4..dc438c0edee 100644
--- a/libs/importer/src/importers/password-depot/password-depot-17-xml-importer.spec.ts
+++ b/libs/importer/src/importers/password-depot/password-depot-17-xml-importer.spec.ts
@@ -1,6 +1,7 @@
 // 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 { CollectionView } from "@bitwarden/admin-console/common";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { FieldType, SecureNoteType } from "@bitwarden/common/vault/enums";
 import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { CipherType } from "@bitwarden/sdk-internal";
@@ -485,7 +486,7 @@ describe("Password Depot 17 Xml Importer", () => {
 
   it("should parse groups nodes into collections when importing into an organization", async () => {
     const importer = new PasswordDepot17XmlImporter();
-    importer.organizationId = "someOrgId";
+    importer.organizationId = "someOrgId" as OrganizationId;
     const collection = new CollectionView();
     collection.name = "tempDB";
     const actual = [collection];
diff --git a/libs/importer/src/importers/protonpass/protonpass-json-importer.spec.ts b/libs/importer/src/importers/protonpass/protonpass-json-importer.spec.ts
index b8550bcb191..a97239fbd10 100644
--- a/libs/importer/src/importers/protonpass/protonpass-json-importer.spec.ts
+++ b/libs/importer/src/importers/protonpass/protonpass-json-importer.spec.ts
@@ -2,6 +2,7 @@ import { MockProxy } from "jest-mock-extended";
 
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 
 import { testData } from "../spec-data/protonpass-json/protonpass.json";
@@ -90,7 +91,7 @@ describe("Protonpass Json Importer", () => {
 
   it("should create collections if part of an organization", async () => {
     const testDataJson = JSON.stringify(testData);
-    importer.organizationId = Utils.newGuid();
+    importer.organizationId = Utils.newGuid() as OrganizationId;
     const result = await importer.parse(testDataJson);
     expect(result != null).toBe(true);
 
diff --git a/libs/importer/src/importers/psono/psono-json-importer.spec.ts b/libs/importer/src/importers/psono/psono-json-importer.spec.ts
index 3b4fcf67a30..29e5a8fb4ab 100644
--- a/libs/importer/src/importers/psono/psono-json-importer.spec.ts
+++ b/libs/importer/src/importers/psono/psono-json-importer.spec.ts
@@ -1,3 +1,4 @@
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { FieldType, CipherType } from "@bitwarden/common/vault/enums";
 import { FieldView } from "@bitwarden/common/vault/models/view/field.view";
 
@@ -236,7 +237,7 @@ describe("PSONO JSON Importer", () => {
 
   it("should create collections if part of an organization", async () => {
     const importer = new PsonoJsonImporter();
-    importer.organizationId = "someOrg";
+    importer.organizationId = "someOrg" as OrganizationId;
     const result = await importer.parse(FoldersTestDataJson);
     expect(result != null).toBe(true);
 
diff --git a/libs/importer/src/importers/zohovault-csv-importer.spec.ts b/libs/importer/src/importers/zohovault-csv-importer.spec.ts
index e49b527cbbf..d3904fb521a 100644
--- a/libs/importer/src/importers/zohovault-csv-importer.spec.ts
+++ b/libs/importer/src/importers/zohovault-csv-importer.spec.ts
@@ -1,3 +1,4 @@
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import { LoginView } from "@bitwarden/common/vault/models/view/login.view";
@@ -73,7 +74,7 @@ describe("Zoho Vault CSV Importer", () => {
 
   it("should create collection and assign ciphers when importing into an organization", async () => {
     const importer = new ZohoVaultCsvImporter();
-    importer.organizationId = "someOrgId";
+    importer.organizationId = "someOrgId" as OrganizationId;
     const result = await importer.parse(samplezohovaultcsvdata);
     expect(result != null).toBe(true);
     expect(result.success).toBe(true);
diff --git a/libs/importer/src/services/import.service.spec.ts b/libs/importer/src/services/import.service.spec.ts
index 4245b770ce4..ac560ed6f7f 100644
--- a/libs/importer/src/services/import.service.spec.ts
+++ b/libs/importer/src/services/import.service.spec.ts
@@ -9,6 +9,7 @@ import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { MockSdkService } from "@bitwarden/common/platform/spec/mock-sdk.service";
+import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
@@ -67,7 +68,7 @@ describe("ImportService", () => {
   describe("getImporterInstance", () => {
     describe("Get bitPasswordProtected importer", () => {
       let importer: Importer;
-      const organizationId = Utils.newGuid();
+      const organizationId = Utils.newGuid() as OrganizationId;
       const password = Utils.newGuid();
       const promptForPassword_callback = async () => {
         return password;
@@ -98,7 +99,7 @@ describe("ImportService", () => {
   });
 
   describe("setImportTarget", () => {
-    const organizationId = Utils.newGuid();
+    const organizationId = Utils.newGuid() as OrganizationId;
 
     let importResult: ImportResult;
 
@@ -145,19 +146,19 @@ describe("ImportService", () => {
     });
 
     const mockImportTargetCollection = new CollectionView();
-    mockImportTargetCollection.id = "myImportTarget";
+    mockImportTargetCollection.id = "myImportTarget" as CollectionId;
     mockImportTargetCollection.name = "myImportTarget";
     mockImportTargetCollection.organizationId = organizationId;
 
     const mockCollection1 = new CollectionView();
-    mockCollection1.id = "collection1";
+    mockCollection1.id = "collection1" as CollectionId;
     mockCollection1.name = "collection1";
     mockCollection1.organizationId = organizationId;
 
     const mockCollection2 = new CollectionView();
-    mockCollection1.id = "collection2";
-    mockCollection1.name = "collection2";
-    mockCollection1.organizationId = organizationId;
+    mockCollection2.id = "collection2" as CollectionId;
+    mockCollection2.name = "collection2";
+    mockCollection2.organizationId = organizationId;
 
     it("passing importTarget adds it to collections", async () => {
       await importService["setImportTarget"](
diff --git a/libs/importer/src/services/import.service.ts b/libs/importer/src/services/import.service.ts
index 9acd4514b31..d3880f63bd5 100644
--- a/libs/importer/src/services/import.service.ts
+++ b/libs/importer/src/services/import.service.ts
@@ -19,6 +19,7 @@ import { ErrorResponse } from "@bitwarden/common/models/response/error.response"
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { OrganizationId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { CipherType, toCipherTypeName } from "@bitwarden/common/vault/enums";
@@ -130,7 +131,7 @@ export class ImportService implements ImportServiceAbstraction {
   async import(
     importer: Importer,
     fileContents: string,
-    organizationId: string = null,
+    organizationId: OrganizationId = null,
     selectedImportTarget: FolderView | CollectionView = null,
     canAccessImportExport: boolean,
   ): Promise<ImportResult> {
@@ -204,7 +205,7 @@ export class ImportService implements ImportServiceAbstraction {
   getImporter(
     format: ImportType | "bitwardenpasswordprotected",
     promptForPassword_callback: () => Promise<string>,
-    organizationId: string = null,
+    organizationId: OrganizationId = null,
   ): Importer {
     if (promptForPassword_callback == null) {
       return null;
@@ -393,7 +394,10 @@ export class ImportService implements ImportServiceAbstraction {
     return await this.importApiService.postImportCiphers(request);
   }
 
-  private async handleOrganizationalImport(importResult: ImportResult, organizationId: string) {
+  private async handleOrganizationalImport(
+    importResult: ImportResult,
+    organizationId: OrganizationId,
+  ) {
     const request = new ImportOrganizationCiphersRequest();
     const activeUserId = await firstValueFrom(
       this.accountService.activeAccount$.pipe(map((a) => a?.id)),
diff --git a/libs/key-management/src/abstractions/key.service.ts b/libs/key-management/src/abstractions/key.service.ts
index 12d0998a862..72a0ba2a038 100644
--- a/libs/key-management/src/abstractions/key.service.ts
+++ b/libs/key-management/src/abstractions/key.service.ts
@@ -294,16 +294,6 @@ export abstract class KeyService {
    * @param encPrivateKey An encrypted private key
    */
   abstract setPrivateKey(encPrivateKey: string, userId: UserId): Promise<void>;
-  /**
-   * Returns the private key from memory. If not available, decrypts it
-   * from storage and stores it in memory
-   * @returns The user's private key
-   *
-   * @throws Error when no active user
-   *
-   * @deprecated Use {@link userPrivateKey$} instead.
-   */
-  abstract getPrivateKey(): Promise<Uint8Array | null>;
 
   /**
    * Gets an observable stream of the given users decrypted private key, will emit null if the user
@@ -311,6 +301,8 @@ export abstract class KeyService {
    * encrypted private key at all.
    *
    * @param userId The user id of the user to get the data for.
+   * @returns An observable stream of the decrypted private key or null.
+   * @throws Error when decryption of the encrypted private key fails.
    */
   abstract userPrivateKey$(userId: UserId): Observable<UserPrivateKey | null>;
 
diff --git a/libs/key-management/src/key.service.spec.ts b/libs/key-management/src/key.service.spec.ts
index 1a76803a085..13cd1a1cde4 100644
--- a/libs/key-management/src/key.service.spec.ts
+++ b/libs/key-management/src/key.service.spec.ts
@@ -494,77 +494,79 @@ describe("keyService", () => {
   });
 
   describe("userPrivateKey$", () => {
-    type SetupKeysParams = {
-      makeMasterKey: boolean;
-      makeUserKey: boolean;
-    };
+    let mockUserKey: UserKey;
+    let mockUserPrivateKey: Uint8Array;
+    let mockEncryptedPrivateKey: EncryptedString;
 
-    function setupKeys({
-      makeMasterKey,
-      makeUserKey,
-    }: SetupKeysParams): [UserKey | null, MasterKey | null] {
-      const userKeyState = stateProvider.singleUser.getFake(mockUserId, USER_KEY);
-      const fakeMasterKey = makeMasterKey ? makeSymmetricCryptoKey<MasterKey>(64) : null;
-      masterPasswordService.masterKeySubject.next(fakeMasterKey);
-      userKeyState.nextState(null);
-      const fakeUserKey = makeUserKey ? makeSymmetricCryptoKey<UserKey>(64) : null;
-      userKeyState.nextState(fakeUserKey);
-      return [fakeUserKey, fakeMasterKey];
-    }
+    beforeEach(() => {
+      mockUserKey = makeSymmetricCryptoKey<UserKey>(64);
+      mockEncryptedPrivateKey = makeEncString("encryptedPrivateKey").encryptedString!;
+      mockUserPrivateKey = makeStaticByteArray(10, 1);
+      stateProvider.singleUser.getFake(mockUserId, USER_KEY).nextState(mockUserKey);
+      stateProvider.singleUser
+        .getFake(mockUserId, USER_ENCRYPTED_PRIVATE_KEY)
+        .nextState(mockEncryptedPrivateKey);
+      encryptService.unwrapDecapsulationKey.mockResolvedValue(mockUserPrivateKey);
+    });
 
-    it("will return users decrypted private key when user has a user key and encrypted private key set", async () => {
-      const [userKey] = setupKeys({
-        makeMasterKey: false,
-        makeUserKey: true,
+    it("returns the unwrapped user private key when user key and encrypted private key are set", async () => {
+      const result = await firstValueFrom(keyService.userPrivateKey$(mockUserId));
+
+      expect(result).toEqual(mockUserPrivateKey);
+      expect(encryptService.unwrapDecapsulationKey).toHaveBeenCalledWith(
+        new EncString(mockEncryptedPrivateKey),
+        mockUserKey,
+      );
+    });
+
+    it("throws an error if unwrapping encrypted private key fails", async () => {
+      encryptService.unwrapDecapsulationKey.mockImplementationOnce(() => {
+        throw new Error("Unwrapping failed");
       });
 
-      const userEncryptedPrivateKeyState = stateProvider.singleUser.getFake(
-        mockUserId,
-        USER_ENCRYPTED_PRIVATE_KEY,
+      await expect(firstValueFrom(keyService.userPrivateKey$(mockUserId))).rejects.toThrow(
+        "Unwrapping failed",
       );
-
-      const fakeEncryptedUserPrivateKey = makeEncString("1");
-
-      userEncryptedPrivateKeyState.nextState(fakeEncryptedUserPrivateKey.encryptedString!);
-
-      // Decryption of the user private key
-      const fakeDecryptedUserPrivateKey = makeStaticByteArray(10, 1);
-      encryptService.unwrapDecapsulationKey.mockResolvedValue(fakeDecryptedUserPrivateKey);
-
-      const fakeUserPublicKey = makeStaticByteArray(10, 2);
-      cryptoFunctionService.rsaExtractPublicKey.mockResolvedValue(fakeUserPublicKey);
-
-      const userPrivateKey = await firstValueFrom(keyService.userPrivateKey$(mockUserId));
-
-      expect(encryptService.unwrapDecapsulationKey).toHaveBeenCalledWith(
-        fakeEncryptedUserPrivateKey,
-        userKey,
-      );
-
-      expect(userPrivateKey).toBe(fakeDecryptedUserPrivateKey);
     });
 
-    it("returns null user private key when no user key is found", async () => {
-      setupKeys({ makeMasterKey: false, makeUserKey: false });
+    it("returns null if user key is not set", async () => {
+      stateProvider.singleUser.getFake(mockUserId, USER_KEY).nextState(null);
 
-      const userPrivateKey = await firstValueFrom(keyService.userPrivateKey$(mockUserId));
+      const result = await firstValueFrom(keyService.userPrivateKey$(mockUserId));
 
+      expect(result).toBeNull();
       expect(encryptService.unwrapDecapsulationKey).not.toHaveBeenCalled();
-
-      expect(userPrivateKey).toBeFalsy();
     });
 
-    it("returns null when user does not have a private key set", async () => {
-      setupKeys({ makeUserKey: true, makeMasterKey: false });
+    it("returns null if encrypted private key is not set", async () => {
+      stateProvider.singleUser.getFake(mockUserId, USER_ENCRYPTED_PRIVATE_KEY).nextState(null);
 
-      const encryptedUserPrivateKeyState = stateProvider.singleUser.getFake(
-        mockUserId,
-        USER_ENCRYPTED_PRIVATE_KEY,
-      );
-      encryptedUserPrivateKeyState.nextState(null);
+      const result = await firstValueFrom(keyService.userPrivateKey$(mockUserId));
 
-      const userPrivateKey = await firstValueFrom(keyService.userPrivateKey$(mockUserId));
-      expect(userPrivateKey).toBeFalsy();
+      expect(result).toBeNull();
+      expect(encryptService.unwrapDecapsulationKey).not.toHaveBeenCalled();
+    });
+
+    it("reacts to changes in user key or encrypted private key", async () => {
+      // Initial state: both set
+      let result = await firstValueFrom(keyService.userPrivateKey$(mockUserId));
+
+      expect(result).toEqual(mockUserPrivateKey);
+
+      // Change user key to null
+      stateProvider.singleUser.getFake(mockUserId, USER_KEY).nextState(null);
+
+      result = await firstValueFrom(keyService.userPrivateKey$(mockUserId));
+
+      expect(result).toBeNull();
+
+      // Restore user key, remove encrypted private key
+      stateProvider.singleUser.getFake(mockUserId, USER_KEY).nextState(mockUserKey);
+      stateProvider.singleUser.getFake(mockUserId, USER_ENCRYPTED_PRIVATE_KEY).nextState(null);
+
+      result = await firstValueFrom(keyService.userPrivateKey$(mockUserId));
+
+      expect(result).toBeNull();
     });
   });
 
@@ -1063,7 +1065,7 @@ describe("keyService", () => {
     });
   });
 
-  describe("userPrivateKey$", () => {
+  describe("userEncryptionKeyPair$", () => {
     type SetupKeysParams = {
       makeMasterKey: boolean;
       makeUserKey: boolean;
diff --git a/libs/key-management/src/key.service.ts b/libs/key-management/src/key.service.ts
index 27bc0515a8d..042fa70d9c0 100644
--- a/libs/key-management/src/key.service.ts
+++ b/libs/key-management/src/key.service.ts
@@ -501,16 +501,6 @@ export class DefaultKeyService implements KeyServiceAbstraction {
       .update(() => encPrivateKey);
   }
 
-  async getPrivateKey(): Promise<Uint8Array | null> {
-    const activeUserId = await firstValueFrom(this.stateProvider.activeUserId$);
-
-    if (activeUserId == null) {
-      throw new Error("User must be active while attempting to retrieve private key.");
-    }
-
-    return await firstValueFrom(this.userPrivateKey$(activeUserId));
-  }
-
   // TODO: Make public key required
   async getFingerprint(fingerprintMaterial: string, publicKey?: Uint8Array): Promise<string[]> {
     if (publicKey == null) {
diff --git a/libs/nx-plugin/README.md b/libs/nx-plugin/README.md
index 580a7eb72ca..df32b106131 100644
--- a/libs/nx-plugin/README.md
+++ b/libs/nx-plugin/README.md
@@ -1,5 +1,83 @@
-# nx-plugin
+# @bitwarden/nx-plugin
 
-Owned by: Platform
+The `@bitwarden/nx-plugin` library is a custom Nx plugin developed specifically for Bitwarden projects. It
+provides generators tailored to Bitwarden's architecture and coding standards.
 
-Custom Nx tools like generators and executors for Bitwarden projects
+## Overview
+
+This plugin extends Nx's capabilities with Bitwarden-specific **nx generators** that help maintain
+consistency across the codebase.
+
+### What are Nx Generators?
+
+Nx generators are code generation tools that follow templates to create or
+modify files in your project. They can:
+
+- Create new files from templates
+- Modify existing files
+- Update configuration files
+- Ensure consistent project structure
+- Automate repetitive tasks
+
+If you're familiar with the code generation tools of say, the angular CLI, then you can just think of =nx= generators as that but on a larger scale. Generators can be run using the Nx CLI with the `nx generate` command (or the shorthand `nx g`).
+
+### When to Use Generators
+
+Use generators when:
+
+- Creating new libraries, components, or features that follow a standard pattern
+- You want to ensure consistency across similar parts of your application
+- You need to automate repetitive setup tasks
+- You want to reduce the chance of human error in project setup
+
+## How `@bitwarden/nx-plugin` Fits Into the Project Architecture
+
+`@bitwarden/nx-plugin` is designed to:
+
+1. Enforce Bitwarden's architectural decisions and code organization
+2. Streamline the creation of new libraries and components
+3. Ensure consistent configuration across the project
+4. Automate updates to project metadata and configuration files
+5. Reduce the learning curve for new contributors
+
+By using this plugin, we maintain a consistent approach to code organization and structure across
+the entire project.
+
+## Installation and Setup
+
+The plugin is included as a development dependency in the project. If you're working with a fresh
+clone of the repository, it will be installed when you run:
+
+```bash
+npm install
+```
+
+No additional setup is required to use the generators provided by the plugin.
+
+## Available Generators
+
+The plugin currently includes the following generators:
+
+- `basic-lib`: Creates a new library with standard configuration and structure. Specific documentation for the `basic-lib` generator can be found [here](./docs/using-the-basic-lib-generator.md)
+
+Additional generators may be added in the future to support other common patterns in the Bitwarden
+codebase.
+
+## Creating A Nx Generator
+
+This library is maintained by platform, but anyone from any team can add a
+generator if there is any amount of value added. If you need to create a new
+generator please do so by running
+
+```bash
+npx nx generate @nx/plugin:generator libs/nx-plugin/src/generators/your-generator-name-here}
+```
+
+This will create a basic generator structure for you to get started with.
+
+## Further Learning
+
+To learn more about Nx plugins and how they work:
+
+- [Nx Plugin Development](https://nx.dev/extending-nx/creating-nx-plugins)
+- [Nx Plugins Overview](https://nx.dev/extending-nx/intro)
diff --git a/libs/nx-plugin/docs/using-the-basic-lib-generator.md b/libs/nx-plugin/docs/using-the-basic-lib-generator.md
new file mode 100644
index 00000000000..34834f9544f
--- /dev/null
+++ b/libs/nx-plugin/docs/using-the-basic-lib-generator.md
@@ -0,0 +1,237 @@
+# Using the basic-lib Generator
+
+The `basic-lib` generator creates a new library with Bitwarden's standard configuration and
+structure. It sets up all the necessary files, configurations, and hooks with global configuration
+files.
+
+## Command Syntax
+
+You can use the basic lib generator by running this command:
+
+```bash
+npx nx g @bitwarden/nx-plugin:basic-lib
+```
+
+## Available Options
+
+All fields are required, but do not need to be supplied as CLI flags. Generator users will be asked
+interactively for each of these if they are not supplied as CLI flags.
+
+| Option          | Description                                     | Required | Default |
+| --------------- | ----------------------------------------------- | -------- | ------- |
+| `--name`        | The name of the library                         | Yes      | -       |
+| `--description` | A brief description of the library              | Yes      | none    |
+| `--team`        | The team responsible for the library            | Yes      | none    |
+| `--directory`   | The directory where the library will be created | Yes      | "libs"  |
+
+## Step-by-Step Example
+
+Let's create a new utility library called "password-insulter":
+
+1. Open your terminal and navigate to the root of the Bitwarden clients repository
+2. Run the generator command:
+   ```bash
+   nx g @bitwarden/nx-plugin:basic-lib --name=password-insulter --description="Like the password strength meter, but more judgemental" --team=tools
+   ```
+3. The generator will create the library structure and update necessary configuration files
+4. The new library is now ready to use
+
+## What Gets Generated
+
+The generator creates the following:
+
+- **Library Structure**:
+  - `libs/password-insulter/`
+    - `src/`
+      - `index.ts` - Main entry point
+    - `README.md` - With the provided description
+    - `package.json` - Very minimal
+    - `tsconfig.json` - TypeScript configuration
+    - `tsconfig.lib.json` - Library-specific TypeScript configuration
+    - `tsconfig.spec.json` - Test-specific TypeScript configuration
+    - `jest.config.js` - Test configuration
+    - `.eslintrc.json` - Linting rules
+
+- **Configuration Updates**:
+
+The generator then updates `tsconfig.base.json` to reference your new library, updates CODEOWNERS to
+assign the team to the new folder, and runs `npm i` to link everything up.
+
+## Post-Generation Next Steps
+
+After generating your library:
+
+1. Review the generated README.md and update it with more detailed information if needed
+2. Implement your library code in the `src/` directory, using whatever subfolder structure you
+   prefer
+3. Export public APIs through the `src/index.ts` file
+4. Write tests for your library
+5. Build your library with `npx nx build password-insulter`
+6. Lint your library with `npx nx lint password-insulter`
+7. Test your library with `npx nx test password-insulter`
+
+## Troubleshooting Common Issues
+
+### Issue: Generator fails with path errors
+
+**Solution**: Ensure you're running the command from the root of the repository.
+
+### Issue: TypeScript path mapping not working
+
+**Solution**: Run `nx reset` to clear the Nx cache, then try importing from your library again.
+
+## Extending the Generated Code
+
+The generated library provides a basic structure that you can extend:
+
+- Add additional directories for specific features
+- Create subdirectories in `src/` for better organization
+- Modify the Jest configuration for specialized testing needs
+
+## Designing a Library
+
+There are a few ways you and your team may want to design a library, there are a lot of factors to
+take into account like clean organization, ease of onboarding new members, simplicity of moving
+ownership to a new team, and optimizing for module size. Below are a few ways you might want to
+design a library.
+
+### Option 1: Feature-based libraries
+
+One strategy to employ is a feature-scoped library.
+
+The import for such a library would be `@bitwarden/[feature]`. For example the `global-state`
+feature would be imported with `@bitwarden/global-state`.
+
+If the feature has both a UI component and needs to be used in the CLI it would probably result in a
+`@bitwarden/[feature]-ui` or `@bitwarden/[feature]-angular` library as well.
+
+> [!NOTE]
+> With more things being added to the SDK and the CLI eventually being written directly in Rust there
+> will become less and less need to have a package with an Angular dependency and without it.
+
+Pros
+
+- You'll have smaller libraries that have minimal dependencies, making them easier for another team
+  to depend on without a circular reference.
+- If your team is ever split or a feature you own is moved to another team this can likely be done
+  with just an update to the GitHub `CODEOWNERS` file.
+- You'll have a clearer dependency graph.
+- Your modules will be smaller.
+
+Cons
+
+- YOu have to spend the time to think about and define what a feature is.
+- You have to create libraries somewhat often.
+- You MAY need "glue" libraries still.
+- It is not as clear who owns what feature from looking at library names.
+
+> [!NOTE]
+> A "Glue" library is a library that might not exist other than the need for two teams to collaborate
+> on a cross cutting feature. The glue library might exist to hold an interface that team B is
+> expected to implement but team A will be responsible for consuming. This helps glue 2 features
+> together while still allowing for team A to consume other things that exist in team B's library but
+> still avoid a circular dependency.
+
+### Option 2: Team-based libraries
+
+Another strategy would be to have a library for the vast majority of your teams code in a single
+package.
+
+There are many ways you may choose to design the library, but if it's one library you will need to
+be dependent on everything that makes all your features tick.
+
+**If all teams go this route it will be impossible to only have these team libraries**. Why? Because
+the team grouping is very likely to result in circular dependencies. For example, if team A depends
+on team B's library then team B cannot depend on anything in team A's library. If team B did need
+something they would need to request that team A move it "downstream". Team A would need to move
+their code and come up with a name for it. If they don't want to also re-export those pieces of code
+they will need to update the import for every other place that code of used. You may also have to
+deal with the code now being separated from similar code or you may decide to move that code too.
+
+Pros
+
+- You have fewer libraries to maintain.
+- All your team’s code is in one place.
+
+Cons
+
+- You'll need to move code ad-hoc more often to make glue libraries, and each time try to think
+  about how to design the package abstraction.
+- If your team splits you will need to move a lot more code.
+- You’ll have larger modules.
+
+### Option 3: Type-based libraries
+
+You can also split libraries based on the primary kind of file that it holds. For example, you could
+have a library holding all `type`’s, one for `abstractions`, and on more `services`. Since one
+library for all type’s would be mean having a library that has multiple owners it would be highly
+discouraged and therefore this would likely be split by team as well, resulting in packages like
+`@bitwarden/platform-types`; this library strategy is really a subset of the team-based one.
+
+Pros
+
+- You’ll be less likely to have circular dependencies within your team’s code, since generally Types
+  < Abstractions < Services where < means lower level.
+- It’s most similar to the organization strategy we’ve had for a while.
+
+Cons
+
+- There is no guarantee that all the types for a given team are lower level than all the types of
+  another team that they need to depend on. Circular dependencies can still happen amongst teams.
+- It’s also possible for a type to need to depend on an abstraction,
+- We are generally discouraging teams from making abstractions unless needed (link).
+
+### Option 4: Feature/type hybrid
+
+Another strategy could be to split libraries by the kind of item in feature-scoped libraries.
+
+Pros
+
+- Lowest chance of circular dependencies showing up later.
+- Pretty easy to move ownership.
+
+Cons
+
+- The most libraries to maintain.
+- Consumers will likely have to import multiple modules in order to use your feature.
+
+### Platform Recommendation
+
+Given the options available with Nx and the pros and cons of each, Platform is planning on using
+[feature-based libraries](#option-1-feature-based-libraries) and we recommend other teams do as
+well.
+
+We understand that we might have a domain that is a little easier to split into features, but we
+believe that the work is worthwhile for teams to do.
+
+There will be some instances that our libraries may only contain abstractions and very simple types
+which would then resemble the type-based approach. We will be forced to do this because we have some
+things like storage where it’s only really useful which the implementations made in the individual
+apps.
+
+Example Platform feature libraries (all of these would be imported like `@bitwarden/[feature]`:
+
+- `storage-core`
+- `user-state`
+- `global-state`
+- `state` (will have its own code but also a meta package re-exporting `user-state` and
+  `global-state`)
+- `clipboard`
+- `messaging`
+- `ipc`
+- `config`
+- `http`
+- `i18n`
+- `environments`
+- `server-notifications`
+- `sync`
+
+Hopefully these will give you some ideas for how to split up your own features.
+
+## Further Learning
+
+For more information about Nx libraries and generators:
+
+- [Nx Library Generation](https://nx.dev/plugin-features/create-libraries)
+- [Nx Library Types](https://nx.dev/more-concepts/library-types)
+- [Nx Project Configuration](https://nx.dev/reference/project-configuration)
diff --git a/libs/tools/generator/components/src/credential-generator.component.html b/libs/tools/generator/components/src/credential-generator.component.html
index 559554b7ddb..3f9813f4384 100644
--- a/libs/tools/generator/components/src/credential-generator.component.html
+++ b/libs/tools/generator/components/src/credential-generator.component.html
@@ -14,7 +14,7 @@
 <nudge-generator-spotlight></nudge-generator-spotlight>
 
 <bit-card class="tw-flex tw-justify-between tw-mb-4">
-  <div class="tw-grow tw-flex tw-items-center">
+  <div class="tw-grow tw-flex tw-items-center tw-min-w-0">
     <bit-color-password class="tw-font-mono" [password]="value$ | async"></bit-color-password>
   </div>
   <div class="tw-flex tw-items-center tw-space-x-1">
diff --git a/libs/tools/generator/components/src/password-generator.component.html b/libs/tools/generator/components/src/password-generator.component.html
index cc5bdba6062..ce0768fe128 100644
--- a/libs/tools/generator/components/src/password-generator.component.html
+++ b/libs/tools/generator/components/src/password-generator.component.html
@@ -11,7 +11,7 @@
   </bit-toggle>
 </bit-toggle-group>
 <bit-card class="tw-flex tw-justify-between tw-mb-4">
-  <div class="tw-grow tw-flex tw-items-center">
+  <div class="tw-grow tw-flex tw-items-center tw-min-w-0">
     <bit-color-password class="tw-font-mono" [password]="value$ | async"></bit-color-password>
   </div>
   <div class="tw-flex tw-items-center tw-space-x-1">
diff --git a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.spec.ts b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.spec.ts
index 3c513a2f067..1f2aaa8904b 100644
--- a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.spec.ts
+++ b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.spec.ts
@@ -14,6 +14,7 @@ import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { CollectionId, OrganizationId } from "@bitwarden/common/types/guid";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { SelectComponent } from "@bitwarden/components";
 
@@ -33,9 +34,9 @@ const createMockCollection = (
   canEdit = true,
 ): CollectionView => {
   return {
-    id,
+    id: id as CollectionId,
     name,
-    organizationId,
+    organizationId: organizationId as OrganizationId,
     externalId: "",
     readOnly,
     hidePasswords: false,
diff --git a/package-lock.json b/package-lock.json
index 264e51de1a0..3bf9db97ddb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -282,7 +282,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2025.7.0",
+      "version": "2025.8.0",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },